mirror_php/moodle
1
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-03-19 15:10:05 +01:00
Code Issues Projects Releases Wiki Activity
72,333 Commits 36 Branches 527 Tags
Commit Graph

16466 Commits

Author SHA1 Message Date
Andrew Nicols
ad80b121ad Merge branch 'master_MDL-46408' of https://github.com/danmarsden/moodle 2015-02-24 11:34:27 +08:00
Zachary Durber
3547f186a8 MDL-35392 mod_assign: Push feedback to gradebook when releasing grades 
When bulk changing workflow status a mismatch in variable
names meant that feedback wasn't being sent to the gradebook.
 2015-02-23 09:14:05 +08:00
Dan Marsden
a544661398 MDL-46408 mod_scorm: check param is set before using. 
The default org is only set if it exists in the imsmanifest.xml
 2015-02-20 14:41:07 +13:00
David Monllao
c1d1c435f7 MDL-48883 mod_lesson: Updating mod_lesson version 
Updating it to today's date instead of using
stable branches version convention.
 2015-02-18 12:30:15 +08:00
David Monllao
caaeabd0f4 Merge branch 'MDL-48883_m29v5' of git://github.com/sbourget/moodle 2015-02-18 12:26:40 +08:00
Rajesh Taneja
6628ea3f0c MDL-47172 print_overview: Fixed behat for overview changes 2015-02-18 11:37:50 +08:00
Eloy Lafuente (stronk7)
40156b3bec Merge branch 'MDL-49178_m29v2' of https://github.com/sbourget/moodle 2015-02-17 21:14:50 +01:00
Eloy Lafuente (stronk7)
2d4d68073d Merge branch 'MDL-48221-master' of git://github.com/andrewnicols/moodle 2015-02-17 15:51:59 +01:00
David Monllao
02838257f3 Merge branch 'MDL-48884_master' of git://github.com/markn86/moodle 2015-02-17 14:43:49 +08:00
Andrew Nicols
719f7345ee Merge branch 'MDL-18553_master' of git://github.com/dmonllao/moodle 2015-02-17 14:35:38 +08:00
David Monllao
57ff8d92f9 Merge branch 'MDL-48709' of git://github.com/jmvedrine/moodle 2015-02-17 09:17:10 +08:00
David Monllao
608132d7e4 MDL-47172 print_overview: Fixing indentation 2015-02-16 09:38:05 +08:00
Jean-Michel Vedrine
fc16a1acba MDL-48709 mod_lesson: subclusters are not working 2015-02-14 18:26:03 +01:00
Ankit Agarwal
81251186e7 MDL-47172 print_overview: Add more unit tests 2015-02-13 11:12:13 +05:30
Ankit Agarwal
a7366bc858 MDL-47172 print_overview: Show assignments only when needed 
The intended behaviour is not to display this notification when:-
1) The assignment is closed.
2) User is a student and has a valid submission in place.
3) User is a teacher and there is nothing to grade.

Beisdes the above changes the patch also includes minor other fixes such as:-
1) Fixed phpdocs
2) Fixed inconsistent return value.
3) Fixed unit tests that had arguments in wrong order.
 2015-02-13 11:12:12 +05:30
David Monllao
667ef02858 MDL-18553 mod_lesson: Requiring just the grade constants 2015-02-13 10:40:47 +08:00
Jean-Michel Vedrine
49aaac3e6f MDL-18553 Lesson: No gradeinfo display if lesson grade is zero 2015-02-13 10:28:00 +08:00
Stephen Bourget
6f5d9a9350 MDL-49178 Lesson: Add question pages to generators 2015-02-11 21:03:36 -05:00
Stephen Bourget
eaa717bbe1 MDL-48883 Lesson: Improve unit tests 2015-02-11 10:53:35 -05:00
David Monllao
0e8182e8f8 Merge branch 'MDL-48822-master' of git://github.com/andrewnicols/moodle 2015-02-10 14:10:28 +08:00
David Monllao
04b732ede7 Merge branch 'master_MDL-48803' of git://github.com/greg-or/moodle-mod_assign 2015-02-10 10:00:23 +08:00
David Monllao
f01845c2a6 Merge branch 'MDL-48212-master' of git://github.com/ankitagarwal/moodle 2015-02-10 08:54:13 +08:00
Eloy Lafuente (stronk7)
b7164a5c21 Merge branch 'MDL-48964' of git://github.com/jmvedrine/moodle 2015-02-10 01:09:38 +01:00
Eloy Lafuente (stronk7)
e7b63ac788 Merge branch 'MDL-49006' of git://github.com/timhunt/moodle 2015-02-09 19:32:40 +01:00
Dan Poltawski
4dae1afb58 Merge branch 'MDL-33648' of git://github.com/jmvedrine/moodle 2015-02-09 15:03:58 +00:00
Dan Poltawski
720931fd0e Merge branch 'wip-MDL-47558-master' of git://github.com/marinaglancy/moodle 2015-02-09 14:49:03 +00:00
Andrew Nicols
be773fd65b MDL-48221 mod_forum: Improve discussion subscription on post 
If the user has posted in the forum before, follow their previous
discussion preference.

If the user has not posted before, but is subscribed to the forum, follow
their forum preference.

Otherwise, follow their user-preference.

This has the result that if a user has unsubscribed from a forum and writes
their first response; the user preference will be followed. This may
override the forum subscription.

This commit also changes from a dropdown to a checkbox in the post form.
 2015-02-09 15:17:09 +08:00
Gregory Faller
fdc790fc94 MDL-48803 mod/lesson: add group support 2015-02-09 11:56:05 +10:30
Stephen Bourget
29732ee498 MDL-48883 Lesson: Unit Tests 2015-02-08 20:19:42 -05:00
Stephen Bourget
8101328a69 MDL-48883 Lesson: Add question viewed and answered events 2015-02-08 20:18:23 -05:00
Stephen Bourget
28c36dd085 MDL-48883 Lesson: Add event for content page viewed 2015-02-08 20:17:41 -05:00
Marina Glancy
e2b8f37da5 MDL-47558 resource: allow to edit module without being redirected 
Thanks to Nathan Lewis for the code suggestion
 2015-02-06 13:10:26 +08:00
John Okely
e7bcd2764a MDL-44520 behat: Change behat features to use new section selectors 2015-02-06 10:34:54 +08:00
Jean-Michel Vedrine
0f1935fa70 MDL-33648 mod_lesson: Essay Graded message provider string is ambiguous 2015-02-05 13:27:41 +01:00
Jean-Michel Vedrine
4966123edc MDL-48964 mod_lesson: Errors when updating matching questions 2015-02-05 13:19:38 +01:00
Andrew Nicols
bfa7beceee MDL-48822 mod_forum: Add lastpost class to final post in discussion 
Thanks to Lior Gil for the basis of the suggested fix.
 2015-02-05 13:09:42 +08:00
Dan Poltawski
40582c75e0 Merge branch 'MDL-48901_master' of git://github.com/dmonllao/moodle 
Conflicts:
	mod/lesson/upgrade.txt
 2015-02-03 23:27:15 +00:00
David Monllao
39fb968132 MDL-48901 mod_lesson: Deprecating unused functions 2015-02-04 07:23:41 +08:00
Dan Poltawski
32a34ed24f Merge branch 'MDL-48942_survey' of https://github.com/andyjdavis/moodle 2015-02-03 15:55:21 +00:00
Dan Poltawski
8a5f6a0f9a Merge branch 'wip-mdl-49002' of https://github.com/rajeshtaneja/moodle 2015-02-03 13:16:52 +00:00
Dan Poltawski
2b3ecd45c0 Merge branch 'MDL-48963_m29v5' of https://github.com/sbourget/moodle 2015-02-03 12:53:29 +00:00
Eloy Lafuente (stronk7)
7172903fcf Merge branch 'MDL-41851-master' of git://github.com/andrewnicols/moodle 2015-02-03 12:36:00 +01:00
Dan Poltawski
cb4748b67d Merge branch 'wip-mdl-48624-m' of https://github.com/rajeshtaneja/moodle 2015-02-03 11:01:05 +00:00
Eloy Lafuente (stronk7)
3cafe67502 Merge branch 'wip-mdl-48403' of https://github.com/rajeshtaneja/moodle 2015-02-03 11:57:27 +01:00
Eloy Lafuente (stronk7)
7eb4e0397b Merge branch 'wip-mdl-49015' of https://github.com/rajeshtaneja/moodle 2015-02-03 11:52:03 +01:00
Mark Nelson
0b1df17129 MDL-48884 mod_assign: prevented setting gradebook feedback unnecessarily 2015-02-02 23:34:54 -08:00
Andrew Nicols
6ef9a63bcd Merge branch 'MDL-48608_master' of git://github.com/markn86/moodle 2015-02-03 12:30:29 +08:00
Mark Nelson
d838640e4c MDL-48608 mod_assign: correctly display grades for group assignments 2015-02-02 20:13:24 -08:00
Eloy Lafuente (stronk7)
f4160a8e52 Merge branch 'MDL-43387' of git://github.com/jmvedrine/moodle 2015-02-03 01:17:03 +01:00
Jean-Michel Vedrine
ebf5ad4fa2 MDL-43387 mod_lesson: add an editor for essay grading comments 2015-02-01 19:01:40 +01:00