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
Mark Nelson
c17e70e5b2
MDL-41101 mod_assign: introduced event base class
...
Also performed the following -
1) Deprecated the assignment's add_to_log function (part of it's functionality exists in the base class to set the legacy log data).
2) Edited existing events to use the new base class.
3) Renamed event_test.php to events_test.php to match the rest of core.
4) Moved the event tests from locallib_test.php to events_test.php.
5) When setting legacy data use lang_string, rather than get_string, as we may not be using them if legacy log is disabled.
2014-04-17 09:51:07 +08:00
Mark Nelson
6f8f3044b1
MDL-41101 mod_assign: removed underscores from event string keys
...
AMOS BEGIN
MOV [event_all_submissions_downloaded, mod_assign],[eventallsubmissionsdownloaded, mod_assign]
MOV [event_assessable_submitted, mod_assign],[eventassessablesubmitted, mod_assign]
MOV [event_extension_granted, mod_assign],[eventextensiongranted, mod_assign]
MOV [event_identities_revealed, mod_assign],[eventidentitiesrevealed, mod_assign]
MOV [event_marker_updated, mod_assign],[eventmarkerupdated, mod_assign]
MOV [event_statement_accepted, mod_assign],[eventstatementaccepted, mod_assign]
MOV [event_submission_duplicated, mod_assign],[eventsubmissionduplicated, mod_assign]
MOV [event_submission_graded, mod_assign],[eventsubmissiongraded, mod_assign]
MOV [event_submission_locked, mod_assign],[eventsubmissionlocked, mod_assign]
MOV [event_submission_status_updated, mod_assign],[eventsubmissionstatusupdated, mod_assign]
MOV [event_submission_unlocked, mod_assign],[eventsubmissionunlocked, mod_assign]
MOV [event_workflow_state_updated, mod_assign],[eventworkflowstateupdated, mod_assign]
AMOS END
2014-04-17 09:51:07 +08:00
Rajesh Taneja
cb115024a8
MDL-45142 report_partcipation: Fixed behat feature file name
2014-04-17 08:47:57 +08:00
Sam Hemelryk
6f9ab86591
Merge branch 'MDL-44616_master' of git://github.com/dmonllao/moodle
2014-04-17 08:52:07 +12:00
Sam Hemelryk
0ed1514cc6
Merge branch 'wip-MDL-45116_master' of https://github.com/kwiliarty/moodle
2014-04-17 08:39:34 +12:00
Sam Hemelryk
1891dba68f
Merge branch 'MDL-45061' of git://github.com/jleyva/moodle
2014-04-17 08:37:26 +12:00
Eloy Lafuente (stronk7)
1011d70413
Merge branch 'MDL-45132-master' of git://github.com/FMCorz/moodle
2014-04-16 16:22:28 +02:00
Frederic Massart
218d751d07
MDL-45132 curl: Unit Tests for file uploads
2014-04-16 17:29:22 +08:00
Dan Poltawski
287fc6ce68
Merge branch 'MDL-44798-master' of git://github.com/andrewnicols/moodle
2014-04-16 15:21:08 +08:00
Dan Poltawski
4916184896
Merge branch 'MDL-44349-master' of https://github.com/lucisgit/moodle
2014-04-16 15:11:27 +08:00
Marina Glancy
09e1805072
Merge branch 'MDL-44951-master' of git://github.com/jethac/moodle
...
Conflicts:
theme/bootstrapbase/style/moodle.css
2014-04-16 14:44:04 +08:00
Marina Glancy
8b611b8e86
Merge branch 'MDL-41286_master' of git://github.com/markn86/moodle
2014-04-16 14:42:40 +08:00
Marina Glancy
2522b260e6
Merge branch 'MDL-44758-master' of git://github.com/jethac/moodle
2014-04-16 14:42:15 +08:00
Dan Poltawski
36b5096e59
Merge branch 'wip-mdl-44977' of https://github.com/rajeshtaneja/moodle
2014-04-16 14:34:58 +08:00
Damyon Wiese
4b6e01cd76
Merge branch 'MDL-44629-B' of https://github.com/bostelm/moodle
2014-04-16 14:23:07 +08:00
Dan Poltawski
c312e59e7d
Merge branch 'wip-mdl-44979' of https://github.com/rajeshtaneja/moodle
2014-04-16 13:56:37 +08:00
Mark Nelson
70279746ec
MDL-41286 report_outline: updated report to use logging api
...
AMOS START
MOV [neverseen, mod_folder],[neverseen, report_outline]
MOV [neverseen, mod_page],[neverseen, report_outline]
MOV [neverseen, mod_resource],[neverseen, report_outline]
MOV [neverseen, mod_url],[neverseen, report_outline]
AMOS END
2014-04-15 22:42:59 -07:00
Dan Poltawski
63eb19cbdf
Merge branch 'MDL-45089_chat' of https://github.com/andyjdavis/moodle
2014-04-16 13:00:46 +08:00
Andrew Nicols
234ead3461
MDL-44798 editor_atto: Backport a fix for HTML5Shiv
...
This is a backport of the Rangy workaround for a bug in HTML5Shiv, which
breaks document.createElement by returning nodes which have parent nodes.
HTML5Shiv refuses to fix this bug so Rangy has had to work around it.
For more information see:
* https://code.google.com/p/rangy/issues/detail?id=104 ; and
* https://github.com/aFarkas/html5shiv/issues/64 .
2014-04-16 12:14:28 +08:00
Marina Glancy
8662cd767e
Merge branch 'MDL-45081-master' of git://github.com/FMCorz/moodle
2014-04-16 11:51:57 +08:00