67849 Commits

Author SHA1 Message Date
Dan Poltawski
a94b4c6e55 Merge branch 'MDL-45071_master' of https://github.com/markn86/moodle 2014-04-18 10:47:04 +08:00
Dan Poltawski
166dfd56b8 Merge branch 'MDL-45059-master' of https://github.com/sammarshallou/moodle 2014-04-18 10:30:12 +08:00
Dan Poltawski
2e6b251de2 Merge branch 'MDL-44990-master' of git://github.com/lameze/moodle 2014-04-18 10:26:38 +08:00
Dan Poltawski
af80f7b4a5 Merge branch 'MDL-45027-master' of https://github.com/sammarshallou/moodle
Conflicts:
	availability/yui/build/moodle-core_availability-form/moodle-core_availability-form-min.js
2014-04-18 10:23:45 +08:00
Dan Poltawski
b8d2340bb7 Merge branch 'MDL-41975-master' of git://github.com/FMCorz/moodle 2014-04-18 10:05:26 +08:00
Dan Poltawski
b67362cf98 Merge branch 'wip-MDL-45154-master' of git://github.com/marinaglancy/moodle 2014-04-18 09:57:21 +08:00
Eloy Lafuente (stronk7)
a0461340ff on-demand release 2.7beta+ 2014-04-17 15:49:54 +02: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
Simey Lameze
da223c11a5 MDL-44990 logging: Capabilites removed from legacy and standard log. 2014-04-17 15:50:59 +08:00
Petr Skoda
c95f956851 MDL-45144 describe mod_book events changes 2014-04-17 15:35:03 +08:00
Marina Glancy
5bbc92e19c Merge branch 'MDL-44658' of git://github.com/danielneis/moodle 2014-04-17 15:06:09 +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
Marina Glancy
3e5ee8073b MDL-45154 user profiles: avoid redirection warnings 2014-04-17 14:25:52 +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
Andrew Nicols
5344148b34 MDL-45119 ajax: Correct use of COUNT in exception dialogue 2014-04-17 11:43:51 +08:00
Andrew Nicols
10d7d8f2b7 MDL-45119 ajax: AJAX exceptions need a String in the Link 2014-04-17 11:43:51 +08:00
Marina Glancy
43a7ac723d MDL-45087 report_log: do not show anonymous actions, use indexes 2014-04-17 11:40:50 +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
127daca011 Merge branch 'wip-mdl-45143' of git://github.com/rajeshtaneja/moodle 2014-04-17 11:04:26 +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
Marina Glancy
354aca95f4 Merge branch 'MDL-44992-master' of git://github.com/sammarshallou/moodle 2014-04-17 11:01:16 +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
Mark Nelson
e65221c27b MDL-41101 mod_assign: replaced 'view submit assignment form' add_to_log call with an event 2014-04-17 09:51:09 +08:00
Mark Nelson
7eda466cb9 MDL-41101 mod_assign: replaced 'view submission grading table' add_to_log call with an event 2014-04-17 09:51:09 +08:00
Mark Nelson
1045b6e333 MDL-41101 mod_assign: replaced 'view grading form' add_to_log call with an event 2014-04-17 09:51:09 +08:00
Mark Nelson
3290c01dc5 MDL-41101 mod_assign: replaced 'view feedback' add_to_log call with an event 2014-04-17 09:51:08 +08:00
Mark Nelson
1be7aef2b1 MDL-41101 mod_assign: replaced 'view submission' add_to_log call with an event 2014-04-17 09:51:08 +08:00
Mark Nelson
749658b7e3 MDL-41101 mod_assign: replaced 'view all' add_to_log call with an event 2014-04-17 09:51:08 +08:00