Commit graph

67793 commits

Author SHA1 Message Date
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
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
Dan Poltawski
0dda3b10ea Merge branch 'MDL-44295' of https://github.com/scyrma/moodle 2014-04-16 11:33:14 +08:00
Damyon Wiese
cc29e5d4dd Merge branch 'MDL-43277-master' of git://github.com/andrewnicols/moodle 2014-04-16 11:12:36 +08:00
Damyon Wiese
37477af87a Merge branch 'MDL-45062' of git://github.com/jleyva/moodle 2014-04-16 10:57:46 +08:00
Damyon Wiese
63c61733f0 MDL-45062 webservices: fix unit test for update_grades
This fixes the broken unit test (which exposes a fail) and
the next patch from Juan fixes the fail.
2014-04-16 10:55:58 +08:00
Damyon Wiese
0cbd1f913d Merge branch 'MDL-45055-master' of git://github.com/ankitagarwal/moodle 2014-04-16 10:41:17 +08:00
Dan Poltawski
21f2bad26c Merge branch 'MDL-44941-master' of git://github.com/FMCorz/moodle 2014-04-16 10:30:47 +08:00
Dan Poltawski
30a3b12f88 Merge branch 'MDL-45076-master' of git://github.com/FMCorz/moodle
Conflicts:
	theme/bootstrapbase/style/moodle.css
2014-04-16 09:10:28 +08:00
Sam Hemelryk
c87a54102e Merge branch 'w16_MDL-45100_m27_coursecontext' of https://github.com/skodak/moodle 2014-04-16 11:43:48 +12:00
Sam Hemelryk
37358ac5c0 Merge branch 'wip-MDL-45083-master' of git://github.com/marinaglancy/moodle 2014-04-16 09:52:05 +12:00
Sam Hemelryk
d4449f2f17 Merge branch 'wip-MDL-44998-master' of git://github.com/marinaglancy/moodle 2014-04-16 09:46:54 +12:00
Sam Hemelryk
d668060fdc Merge branch 'MDL-45034-master' of git://github.com/damyon/moodle
Conflicts:
	lib/editor/atto/plugins/image/yui/build/moodle-atto_image-button/moodle-atto_image-button-min.js
2014-04-16 09:23:30 +12:00
Kevin Wiliarty
5a87760dd6 MDL-45116: Workshop submission title displays behind author picture 2014-04-15 13:50:52 -04:00
Eloy Lafuente (stronk7)
11310954ea on-demand release 2.7beta+ 2014-04-15 16:33:14 +02:00
Juan Leyva
5f0283046e MDL-45061 airnotifier: Changed default port value to 443 2014-04-15 12:12:22 +02:00
Marina Glancy
4ba9490813 MDL-44826 atto: re-shifted js 2014-04-15 18:07:10 +08:00
Juan Leyva
ccc165fd8e MDL-45062 web services: Description of method result value for update_grades_return is invalid 2014-04-15 11:59:44 +02:00
Marina Glancy
2e68bf6136 Merge branch 'MDL-44826-master' of git://github.com/damyon/moodle 2014-04-15 17:55:30 +08:00
Frederic Massart
f0031a7c15 MDL-44941 core: Removing irrelevant assertion causing failures
The timemodified property is not called when the user logs in, and
so we should not be checking if its value matches the current time.
2014-04-15 17:25:47 +08:00
Rajesh Taneja
9ddb683a59 MDL-45073 report_log: Fixed behat 2014-04-15 17:16:43 +08:00
Rajesh Taneja
6636050115 MDL-41283 report_participation: Fixed behat 2014-04-15 17:15:51 +08:00
Marina Glancy
cf051cc46e Revert "MDL-41283 report_participation: Fixed legacy actions returned from api's"
This reverts commit 7b7bb92d42.
2014-04-15 17:14:57 +08:00