eaa717bbe1
MDL-48883 Lesson: Improve unit tests
2015-02-11 10:53:35 -05:00
0e8182e8f8
Merge branch 'MDL-48822-master' of git://github.com/andrewnicols/moodle
2015-02-10 14:10:28 +08:00
04b732ede7
Merge branch 'master_MDL-48803' of git://github.com/greg-or/moodle-mod_assign
2015-02-10 10:00:23 +08:00
f01845c2a6
Merge branch 'MDL-48212-master' of git://github.com/ankitagarwal/moodle
2015-02-10 08:54:13 +08:00
b7164a5c21
Merge branch 'MDL-48964' of git://github.com/jmvedrine/moodle
2015-02-10 01:09:38 +01:00
e7b63ac788
Merge branch 'MDL-49006' of git://github.com/timhunt/moodle
2015-02-09 19:32:40 +01:00
4dae1afb58
Merge branch 'MDL-33648' of git://github.com/jmvedrine/moodle
2015-02-09 15:03:58 +00:00
720931fd0e
Merge branch 'wip-MDL-47558-master' of git://github.com/marinaglancy/moodle
2015-02-09 14:49:03 +00:00
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
fdc790fc94
MDL-48803 mod/lesson: add group support
2015-02-09 11:56:05 +10:30
29732ee498
MDL-48883 Lesson: Unit Tests
2015-02-08 20:19:42 -05:00
8101328a69
MDL-48883 Lesson: Add question viewed and answered events
2015-02-08 20:18:23 -05:00
28c36dd085
MDL-48883 Lesson: Add event for content page viewed
2015-02-08 20:17:41 -05:00
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
e7bcd2764a
MDL-44520 behat: Change behat features to use new section selectors
2015-02-06 10:34:54 +08:00
0f1935fa70
MDL-33648 mod_lesson: Essay Graded message provider string is ambiguous
2015-02-05 13:27:41 +01:00
4966123edc
MDL-48964 mod_lesson: Errors when updating matching questions
2015-02-05 13:19:38 +01:00
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
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
39fb968132
MDL-48901 mod_lesson: Deprecating unused functions
2015-02-04 07:23:41 +08:00
32a34ed24f
Merge branch 'MDL-48942_survey' of https://github.com/andyjdavis/moodle
2015-02-03 15:55:21 +00:00
8a5f6a0f9a
Merge branch 'wip-mdl-49002' of https://github.com/rajeshtaneja/moodle
2015-02-03 13:16:52 +00:00
2b3ecd45c0
Merge branch 'MDL-48963_m29v5' of https://github.com/sbourget/moodle
2015-02-03 12:53:29 +00:00
7172903fcf
Merge branch 'MDL-41851-master' of git://github.com/andrewnicols/moodle
2015-02-03 12:36:00 +01:00
cb4748b67d
Merge branch 'wip-mdl-48624-m' of https://github.com/rajeshtaneja/moodle
2015-02-03 11:01:05 +00:00
3cafe67502
Merge branch 'wip-mdl-48403' of https://github.com/rajeshtaneja/moodle
2015-02-03 11:57:27 +01:00
7eb4e0397b
Merge branch 'wip-mdl-49015' of https://github.com/rajeshtaneja/moodle
2015-02-03 11:52:03 +01:00
0b1df17129
MDL-48884 mod_assign: prevented setting gradebook feedback unnecessarily
2015-02-02 23:34:54 -08:00
6ef9a63bcd
Merge branch 'MDL-48608_master' of git://github.com/markn86/moodle
2015-02-03 12:30:29 +08:00
d838640e4c
MDL-48608 mod_assign: correctly display grades for group assignments
2015-02-02 20:13:24 -08:00
f4160a8e52
Merge branch 'MDL-43387' of git://github.com/jmvedrine/moodle
2015-02-03 01:17:03 +01:00
ebf5ad4fa2
MDL-43387 mod_lesson: add an editor for essay grading comments
2015-02-01 19:01:40 +01:00
a1556aaf86
MDL-48963 Lesson: File support to true/false answers
2015-02-01 09:32:52 -05:00
75d08f0291
MDL-31036 mod_assign: Don't strip quickgrading feedback of special chars
2015-01-30 14:43:35 +08:00
dec3a05cb3
MDL-48403 behat: Select text in atto editor before inserting image
2015-01-30 10:02:57 +08:00
2b44d328c3
MDL-49002 behat: Added @_file_upload tag to avoid random fails
2015-01-30 09:00:36 +08:00
15aacd0454
MDL-49105 mod_lesson: Removed unused image insert step in behat
2015-01-30 08:57:50 +08:00
d0c36ce621
MDL-49015 mod_lesson: Don't rely on external links in behat
2015-01-30 08:57:49 +08:00
8fe8df4a8b
MDL-48624 behat: Added page load check in workshop step
...
i_allocate_submissions_in_workshop_as step sometimes
fails because of server speed. Added page load check
with extended timout.
2015-01-30 08:54:11 +08:00
6738ad643b
MDL-8626 mod_data: Only show select/delete options when entries present
2015-01-29 10:26:44 +08:00
5310179939
Merge branch 'MDL-36877' of https://github.com/jmvedrine/moodle
2015-01-29 09:08:53 +08:00
a6099a7a13
MDL-49006 admin: activity descriptions shouldn't be required by default
2015-01-28 21:52:58 +00:00
59d7a9dc75
MDL-36877 mod_lesson: Fix while MDL-38578 is not solved
2015-01-28 20:54:38 +01:00
941ea6b2ff
Merge branch 'MDL-48898' of git://github.com/timhunt/moodle
2015-01-28 12:27:07 +01:00
5cb440f936
MDL-8626 database: Move search and sort controls to top of page
...
Credit to Andrew Walbran for the patch.
2015-01-28 09:06:30 +08:00
8181ab5865
Merge branch 'MDL-48620-master' of git://github.com/andrewnicols/moodle
...
Conflicts:
lib/editor/atto/plugins/undo/yui/build/moodle-atto_undo-button/moodle-atto_undo-button-min.js
2015-01-28 01:02:54 +01:00
f271b113a6
Merge branch 'MDL-40285_master' of git://github.com/markn86/moodle
2015-01-27 12:09:58 +01:00
d2e1c5f5fc
MDL-40285 mod_assign: added extra group submissions behat scenario
...
Thanks a lot to Jody Steele for providing the basis for the scenario.
2015-01-27 00:36:49 -08:00
e43f1d514c
MDL-40285 mod_assign: show details for all default group members
2015-01-27 00:36:49 -08:00
65d2f8e3f9
Merge branch 'wip-MDL-48325-master' of git://github.com/abgreeve/moodle
2015-01-27 00:22:36 +01:00
Stephen Bourget