moodle/moodle
3
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-08-06 09:26:35 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
100729 commits 37 branches 540 tags 1.3 GiB
Commit graph

2392 commits

Author SHA1 Message Date
Damyon Wiese
d9a88f427d MDL-33773: Make view/grade all submissions a link in assignment module 2012-06-19 22:08:21 +08:00
Damyon Wiese
5382eabbec MDL-33843: Remove custom dirty form handling and use default behaviour in assignment 2012-06-19 15:18:07 +08:00
Dan Poltawski
3248a1e1e4 Merge branch 'MDL-33794' of git://github.com/stronk7/moodle 
Conflicts:
	mod/assign/version.php
 2012-06-18 16:08:39 +08:00
Dan Poltawski
2b5f4dbbca Merge branch 'MDL-33699' of git://github.com/netspotau/moodle-mod_assign 2012-06-18 13:49:16 +08:00
Dan Poltawski
53db3251da Merge branch 'MDL-33793' of git://github.com/netspotau/moodle-mod_assign 2012-06-18 13:28:07 +08:00
Dan Poltawski
728aee9767 Merge branch 'MDL-33697' of git://github.com/netspotau/moodle-mod_assign 2012-06-18 13:12:56 +08:00
Eloy Lafuente (stronk7)
c5e783e512 MDL-33794 version.php: Bump all versions, requires and dependencies to 2012061700 2012-06-18 02:37:00 +02:00
Eloy Lafuente (stronk7)
798c9100d8 MDL-33794 assign: fix some incorrect function names 2012-06-18 02:17:03 +02:00
Eloy Lafuente (stronk7)
130aed6e7e MDL-33794 version.php: Fix some missing bits before bump. 2012-06-17 19:29:44 +02:00
Damyon Wiese
8b2cfdc1c6 MDL-33793: Add conditions to the assignment upgrade code to prevent overwriting grade items. 2012-06-17 22:41:59 +08:00
Damyon Wiese
a13edd499d MDL-33699: Allow grades of 0 in assignment quickgrading 2012-06-15 15:13:26 +08:00
Damyon Wiese
787ad88143 MDL-33499: Display final grade on the grading form with a link to the grader report 
AMOS BEGIN
 CPY [currentgrade,mod_assignment],[currentgrade,mod_assign]
AMOS END
 2012-06-15 14:09:38 +08:00
Damyon Wiese
f750cf712c MDL-33697: Merge the 2 assignment notification types 
This is the best solution until Moodle supports capabilities on module message providers.

Unfortunately we already changed the mod_assignment language string so I can't put an AMOS
command to copy the new string.
 2012-06-14 15:31:23 +08:00
Damyon Wiese
a1e54f4d6c MDL-33327: Layout changes for the assignment grading table 
Move the grading actions to a single drop down list above the header
Move the grading options below the grading table (although that is inconsistent)

Conflicts:

	mod/assign/gradingtable.php
	mod/assign/locallib.php
 2012-06-14 15:22:42 +08:00
Damyon Wiese
d9eb908d74 MDL-33718: Help text change for assignment module. 2012-06-14 11:23:27 +08:00
Damyon Wiese
07a4677eb1 MDL-33464: Do not create a grade item on upgrade (mod_assign) because we already reassigned the old one 2012-06-14 09:14:40 +08:00
Sam Hemelryk
78338b8b0e Merge branch 'MDL-33645-master' of git://github.com/ankitagarwal/moodle 2012-06-14 11:31:46 +12:00
Dan Poltawski
2333058eb0 Merge branch 'MDL-33691' of git://github.com/netspotau/moodle-mod_assign 2012-06-13 15:24:42 +08:00
Ankit Agarwal
09b46f0e13 MDL-33645 assign: Teachers should not be allowed to change grades if it is overridden in the gradebook 2012-06-13 13:20:54 +08:00
Dan Poltawski
9379a9190d Merge branch 'MDL-33576-2' of git://github.com/netspotau/moodle-mod_assign 2012-06-13 11:28:39 +08:00
Damyon Wiese
571cc0b7d2 MDL-33691: The grading table is showing "graded" for assignments with a NULL grade 2012-06-13 11:01:37 +08:00
Damyon Wiese
e7ade405eb MDL-33576: If grade set to "No grade" in mod_assign hide inputs for quickgrading 2012-06-13 08:55:02 +08:00
Andrew Robert Nicols
8635302e54 MDL-33675 Add updated help texts for modules to appear in activity chooser 2012-06-12 13:38:17 +01:00
Dan Poltawski
82fc6ae6e3 Merge branch 'MDL-33598-master-integration' of git://github.com/FMCorz/moodle 2012-06-12 15:57:58 +08:00
Dan Poltawski
760c063bc0 Merge branch 'wip-MDL-33446-master' of git://github.com/marinaglancy/moodle 2012-06-12 13:45:10 +08:00
Dan Poltawski
502be9a069 MDL-33572 - assign: fixed syntax probblem found immediately after integration 
Grr. shouldn't have escaped our review.
 2012-06-12 13:41:54 +08:00
Dan Poltawski
08f5648de3 Merge branch 'MDL-33572' of git://github.com/netspotau/moodle-mod_assign 2012-06-12 13:38:34 +08:00
Frederic Massart
db48ed64c7 MDL-33598 Messaging: students can change their assignment notification preferences 2012-06-12 13:10:43 +08:00
Dan Poltawski
555099c666 Merge branch 'MDL-33400' of git://github.com/nebgor/moodle 2012-06-12 13:03:42 +08:00
Marina Glancy
c469b3963b MDL-33446 Editor form field can filter return types 
- Added possibility for editor form field to specify return_types (default FILE_INTERNAL | FILE_EXTERNAL | FILE_REFERENCE)
- For assignment, workshop, quiz essay submissions and form posts do not allow FILE_REFERENCE
- Fixed mod_resource return_types, reset them to default, because filemanager does not know how to work with FILE_EXTERNAL links
 2012-06-12 11:03:43 +08:00
Aparup Banerjee
6b8b0b2e68 MDL-34400 Libraries : maintained naming rule by removing stray mod_ function and class prefixes from activity modules. 
This rule @ http://docs.moodle.org/dev/Activity_modules still stands for now.
 2012-06-11 13:34:47 +08:00
Dan Poltawski
c9d7e6fa16 Merge branch 'MDL-33498' of git://github.com/netspotau/moodle-mod_assign 2012-06-08 13:39:17 +08:00
Dan Poltawski
644495114e Merge branch 'MDL-33475' of git://github.com/netspotau/moodle-mod_assign 2012-06-07 17:33:39 +08:00
Dan Poltawski
c9978ce67b Merge branch 'w23_MDL-33555_m23_assignfk' of git://github.com/skodak/moodle 2012-06-07 14:29:08 +08:00
Damyon Wiese
eba009ea63 MDL-33475: Fix javascript error when advanced grading is used in mod_assign 2012-06-07 10:52:05 +08:00
Damyon Wiese
2d8a9ce96c MDL-33572: Make the display of the "graded" status consistent in mod_assign 
Do not display "graded" when the grade is set to -1.
 2012-06-07 10:22:46 +08:00
Damyon Wiese
4913af936f MDL-33498: Correct use of unformat_float for mod_assign decimal grades 
This was affecting locales that use , instead of . in floating point numbers.
 2012-06-07 09:27:59 +08:00
Petr Skoda
3269c859bf MDL-33555 fix invalid FK in mod_assign 
There is no need to upgrade DB because we create only indexes now.
 2012-06-06 10:54:40 +02:00
Dan Poltawski
de6a0dfd3d Merge branch 'MDL-33547' of git://github.com/netspotau/moodle-mod_assign 2012-06-06 16:09:15 +08:00
Damyon Wiese
509e59ca38 MDL-33547: Fix for mod_assign portfolio export for a list of files. 
This will fix any submission or feedback plugin using render_area_files
to show a list of files.
 2012-06-06 15:49:37 +08:00
Dan Poltawski
a16757ed9c Merge branch 'MDL-33042-master-1' of git://git.luns.net.uk/moodle 2012-06-05 12:52:39 +08:00
Dan Poltawski
ac0ad29c6f Merge branch 'MDL-33319' of git://github.com/netspotau/moodle-mod_assign 2012-06-05 12:03:56 +08:00
Dan Poltawski
2605112e0b Merge branch 'MDL-33045-master-2' of git://git.luns.net.uk/moodle 2012-05-30 14:14:50 +08:00
Dan Poltawski
d88f1a51fc Merge branch 'MDL-33414' of git://github.com/netspotau/moodle-mod_assign 2012-05-30 11:45:32 +08:00
Damyon Wiese
0047693f09 MDL-33385: Assignment plugin settings not visible in admin tree. 
* Also fixes a regression where file_submissions were not set to default for new installs.
 2012-05-30 09:01:11 +08:00
Damyon Wiese
7ee1548acb MDL-33414: The setting $showviewlink needs to be passed by reference 
This was preventing the view full submission/feedback link from appearing
everywhere in the assignment when the submission/feedback content had been
truncated in the summary because it was too long (or too many files)
 2012-05-30 08:37:56 +08:00
Ruslan Kabalin
c1d09c6fa3 MDL-33042: Assign: get rid of email statements in messaging functions 2012-05-28 11:48:18 +01:00
Ruslan Kabalin
599f7a279c MDL-33045: Assign: remove references to old assignment in URLs 2012-05-28 10:53:40 +01:00
Ruslan Kabalin
f5b32abe57 MDL-33045: Assign: Make get_module_name() return something 2012-05-28 10:52:11 +01:00
Damyon Wiese
2c6a3dbfca MDL-33319: Support quickgrading in feedback plugins 2012-05-28 11:10:09 +08:00