Tony Butler
5047b0ea8f
MDL-49075 mod_assign: Add assertions to marking workflow unit test
...
Make sure grades aren't pushed to gradebook for marking workflow
states other than 'released'.
2015-02-26 11:52:46 +00:00
Tony Butler
251d85c013
MDL-49075 mod_assign: Keep unreleased assign grades out of gradebook
2015-02-26 11:52:46 +00:00
Dan Poltawski
86e5b0a707
Merge branch 'MDL-49220-master' of https://github.com/lucisgit/moodle
2015-02-24 16:54:58 +00:00
Dan Poltawski
4a3b900698
Merge branch 'MDL-49241-master-enfix' of git://github.com/mudrd8mz/moodle
2015-02-24 16:50:12 +00:00
Tony Butler
f1399fb8e7
MDL-49220 mod_choice: Add behat scenario to test choice preview option
2015-02-24 16:25:18 +00:00
Dan Poltawski
73d8a50d73
Merge branch 'master-18177' of https://github.com/timpricecatalyst/moodle-1
2015-02-24 11:18:37 +00:00
Dan Poltawski
6856894efe
Merge branch 'wip_MDL-49184_m29_choice' of https://github.com/skodak/moodle
2015-02-24 10:43:15 +00:00
Helen Foster
428330da1c
MDL-49241 lang: Merge English strings from the en_fix language pack
2015-02-24 11:15:15 +01:00
Dan Poltawski
e09bd104b9
Merge branch 'MDL-49216-master' of git://github.com/andrewnicols/moodle
2015-02-24 08:31:53 +00:00
David Monllao
fdc30bd7c5
Merge branch 'MDL-49183_m29v5' of git://github.com/sbourget/moodle
2015-02-24 16:07:18 +08:00
Andrew Nicols
78f26c076c
Merge branch 'MDL-34375_m29v2' of https://github.com/sbourget/moodle
2015-02-24 11:40:27 +08:00
Andrew Nicols
ad80b121ad
Merge branch 'master_MDL-46408' of https://github.com/danmarsden/moodle
2015-02-24 11:34:27 +08:00
Andrew Nicols
38ec3fb080
MDL-49216 mod_forum: Move subquery to outer component
...
It is not possible to order sub-query results with some RDBMs, and the
subquery is not necessary anyway.
2015-02-24 08:29:43 +08:00
Andrew Nicols
94802d3518
MDL-49216 mod_forum: Add tests for discussion reply count
2015-02-24 08:29:43 +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
Tony Butler
c30dbd69e7
MDL-49220 mod_choice: Add option to allow students to preview choices
2015-02-20 14:27:55 +00:00
Stephen Bourget
1cf8ca343f
MDL-49183 Lesson: Add additional events
2015-02-19 21:16:26 -05: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
Tim Price
e1de40f7f7
MDL-18177 backup: adding PHPdocs blocks
2015-02-20 11:45:23 +11:00
Tim Price
d7891c83dd
MDL-18177 backup: addressing coding standards
2015-02-20 11:45:23 +11:00
Matt Sammarco
868b086c4a
MDL-18177 backup: Add backup option to include groups and groupings
2015-02-20 11:45:22 +11: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
Petr Skoda
5fb2315a8b
MDL-49184 choice: fix block actions
...
The problems was that blocks editing breaks if you redirect
after if (data_submitted()) - all form actions must make sure
it is really their form, otherwise they may hijack the post from
block actions.
Note that this is not a problem for mforms, only legacy forms
are affected.
# Conflicts:
# mod/choice/view.php
2015-02-17 17:00:15 +13: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
Stephen Bourget
c04b66a564
MDL-34375 Choice: Display choice on 'my home'
2015-02-13 14:19:55 -05: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
