15415 Commits

Author SHA1 Message Date
Sam Hemelryk
5852a965ca Merge branch 'MDL-44928-master' of git://github.com/xow/moodle 2014-04-24 11:37:34 +12:00
Sam Hemelryk
a544822bd8 Merge branch 'MDL-45186-master' of git://github.com/FMCorz/moodle 2014-04-24 11:01:33 +12:00
Dan Poltawski
54de59e70a Merge branch 'MDL-45075-master' of git://github.com/andrewnicols/moodle 2014-04-23 16:13:08 +08:00
Andrew Nicols
7bb7de44cf MDL-45075 mod_forum: Add unit tests for forum subscription on forum creation 2014-04-23 16:07:50 +08:00
John Okely
f548bc4de5 MDL-44928 mod_forum: Add unit tests for urls in mod_forum events 2014-04-23 15:59:26 +08:00
John Okely
2b7781d662 MDL-44928 mod_forum: Fix urls in log entries for forum events 2014-04-23 15:54:15 +08:00
Marina Glancy
3ebfb87878 Merge branch 'w17_MDL-45219_m27_addtolog' of git://github.com/skodak/moodle 2014-04-23 15:25:01 +08:00
Dan Poltawski
0a4fa71345 Merge branch 'MDL-45194-master' of git://github.com/FMCorz/moodle 2014-04-23 13:29:20 +08:00
Petr Skoda
a991a1dd23 MDL-45219 add \mod\chat\course_module_viewed event 2014-04-23 11:53:35 +08:00
Petr Skoda
2f3c20b245 MDL-45219 remove old assignment course instance list 2014-04-23 11:53:35 +08:00
Frederic Massart
5730debbb9 MDL-45194 assign_feedback: Cache was never set and used in is_enabled 2014-04-22 15:32:25 +08:00
Frederic Massart
90f9e30b3b MDL-45186 mod_quiz: Some RTL improvements on quiz edit page 2014-04-22 12:27:34 +08:00
Marina Glancy
04b0ce956d Merge branch 'MDL-43673' of git://github.com/stronk7/moodle 2014-04-22 12:27:13 +08:00
Andrew Nicols
8e6775d8f9 MDL-45075 mod_forum: Move user subscription to an observer
The forum subscription function is called in some cases on forum creation
(specifically the case of an automatically subscribed forum).

Since the forum subscription requires both the course_module instance, and
the context these must both be present when subscribing users to the forum,
however these are not fully set up until after the forum has been created.

By moving the subscription to a subscriber, we are able to hook into the
module creation event after the course_module and context have been linked
to the forum instance.
2014-04-22 11:50:52 +08:00
Dan Poltawski
eec3795270 Merge branch 'MDL-45145_master' of https://github.com/markn86/moodle 2014-04-21 10:51:38 +08:00
Dan Poltawski
3497702ae5 Merge branch 'MDL-45010-master' of git://github.com/FMCorz/moodle 2014-04-18 14:54:54 +08:00
Dan Poltawski
ac13361b77 Merge branch 'MDL-45023-master' of git://github.com/jamiepratt/moodle 2014-04-18 13:47:10 +08:00
Dan Poltawski
f658717108 Merge branch 'MDL-45110-master' of git://github.com/jamiepratt/moodle 2014-04-18 12:03:23 +08:00
Dan Poltawski
a6d4ba1d97 Merge branch 'wip-MDL-43626-master' of git://github.com/abgreeve/moodle 2014-04-18 10:52:45 +08:00
Dan Poltawski
a94b4c6e55 Merge branch 'MDL-45071_master' of https://github.com/markn86/moodle 2014-04-18 10:47:04 +08:00
Mark Nelson
a97a7585ff MDL-45145 mod_quiz: ensure quiz cmid is set before triggering the 'attempt_deleted' event 2014-04-17 18:44:58 -07:00
Dan Poltawski
63476b0f6f Merge branch 'MDL-44619_master' of git://github.com/dmonllao/moodle 2014-04-17 17:02:04 +08:00
Damyon Wiese
186f092ee8 Merge branch 'MDL-45119-master' of git://github.com/andrewnicols/moodle 2014-04-17 16:17:12 +08:00
Marina Glancy
c18c7869fa Merge branch 'w16_MDL-45144_m27_booklog' of git://github.com/skodak/moodle 2014-04-17 15:57:03 +08:00
Petr Skoda
c95f956851 MDL-45144 describe mod_book events changes 2014-04-17 15:35:03 +08:00
Damyon Wiese
5cfa441ba7 MDL-41101 assign: Add relateduserid to some events
When events are acting on another users submission, it makes
sense to put the submission->userid in the relateduserid field.
2014-04-17 15:05:24 +08:00
Petr Skoda
ef2a9ece71 MDL-45144 convert book events to create_from_xxx() helpers 2014-04-17 14:29:31 +08:00
Petr Skoda
98cb244de1 MDL-45144 delete duplicated legacy log entries in mod_book
The general agreement is we should trigger one event
per simple action.

This partially resolves MDL-39963.
2014-04-17 13:30:30 +08:00
Andrew Nicols
8ae76e1388 MDL-45119 editpdf: Do not load quick comments in read-only mode 2014-04-17 11:43:51 +08:00
Marina Glancy
0b10dfce9d Merge branch 'w16_MDL-41101_m27_assign' of git://github.com/skodak/moodle 2014-04-17 11:20:51 +08:00
Marina Glancy
2d6221b2ae Merge branch 'MDL-44621_master' of git://github.com/dmonllao/moodle 2014-04-17 11:04:10 +08:00
Marina Glancy
8416d55261 Merge branch 'MDL-44618_master' of git://github.com/dmonllao/moodle 2014-04-17 11:03:52 +08:00
Marina Glancy
c5b027629f Merge branch 'MDL-44617_master' of git://github.com/dmonllao/moodle 2014-04-17 11:03:25 +08:00
Petr Skoda
0202d43dd4 MDL-41101 verify contextlevel in all assign events 2014-04-17 11:01:18 +08:00
Damyon Wiese
7c9b2aafeb MDL-35373 mod_assign: Add a behat test for word count limit. 2014-04-17 10:27:07 +08:00
Petr Škoda
4781ff2e5f MDL-41101 use snapshots for submissions and grades in assign events 2014-04-17 09:59:09 +08:00
Tony Butler
651b7f179a MDL-35373 mod_assign Add functionality to enforce onlinetext word limit
Signed-off-by: Tony Butler <tonyjbutler@gmail.com>
2014-04-17 09:58:20 +08:00
Tony Butler
dc66404bf6 MDL-35373 mod_assign Add form elements for assignsubmission_onlinetext word limit
Signed-off-by: Tony Butler <tonyjbutler@gmail.com>
2014-04-17 09:58:12 +08:00
Petr Škoda
bf5b441327 MDL-41101 move assign property to the assign event base class 2014-04-17 09:51:13 +08:00
Petr Škoda
31904cca34 MDL-41101 use record snapshots for user data in assign events
The problem is that event->get_user() would be very confusing
because it is mostly related user.
2014-04-17 09:51:12 +08:00
Petr Škoda
0e5deb2018 MDL-41101 tidy up the phpdocs in new assign events 2014-04-17 09:51:12 +08:00
Petr Škoda
1b90858f23 MDL-41101 convert assign event triggers to new create_from_xxx helpers 2014-04-17 09:51:12 +08:00
Mark Nelson
b7656ff069 MDL-41101 mod_assign: replaced 'save grading feedback' add_to_log call with an event 2014-04-17 09:51:11 +08:00
Mark Nelson
9147c4e07f MDL-41101 mod_assign: replaced 'grade submission' add_to_log call with an event 2014-04-17 09:51:11 +08:00
Mark Nelson
81f92c220b MDL-41101 mod_assign: replaced 'view batch set marker allocation' add_to_log call with an event 2014-04-17 09:51:11 +08:00
Mark Nelson
eef4d5946a MDL-41101 mod_assign: replaced 'view batch set marking workflow state' add_to_log call with an event 2014-04-17 09:51:11 +08:00
Mark Nelson
cf2d7bfb49 MDL-41101 mod_assign: replaced 'view' add_to_log call for the submission status page with an event 2014-04-17 09:51:10 +08:00
Mark Nelson
47349e4eb0 MDL-41101 mod_assign: replaced 'view confirm submit assignment form' add_to_log call with an event 2014-04-17 09:51:10 +08:00
Mark Nelson
c24aaa389a MDL-41101 mod_assign: replaced 'submission statement accepted' add_to_log call with an event 2014-04-17 09:51:10 +08:00
Mark Nelson
b06decdd59 MDL-41101 mod_assign: replaced 'view' add_to_log call for the reveal identities confirmation page with an event 2014-04-17 09:51:09 +08:00