Sam Hemelryk [Mon, 21 Apr 2014 21:59:01 +0000 (09:59 +1200)]
Merge branch 'wip-MDL-45037-master' of git://github.com/abgreeve/moodle
Sam Hemelryk [Mon, 21 Apr 2014 21:18:20 +0000 (09:18 +1200)]
Merge branch 'MDL-44270' of git://github.com/jonof/moodle
Sam Hemelryk [Mon, 21 Apr 2014 21:15:55 +0000 (09:15 +1200)]
Merge branch 'MDL-45118-shibboleth-login-warning' of https://github.com/mpetrowi/moodle
Sam Hemelryk [Mon, 21 Apr 2014 20:57:25 +0000 (08:57 +1200)]
Merge branch 'MDL-42761-master' of git://github.com/FMCorz/moodle
Sam Hemelryk [Mon, 21 Apr 2014 20:29:38 +0000 (08:29 +1200)]
Merge branch 'MDL-45138-master' of https://github.com/sammarshallou/moodle
Conflicts:
availability/yui/build/moodle-core_availability-form/moodle-core_availability-form-min.js
Eloy Lafuente (stronk7) [Mon, 21 Apr 2014 13:26:37 +0000 (15:26 +0200)]
Merge branch 'MDL-45205-master-option2' of git://github.com/danpoltawski/moodle
Dan Poltawski [Mon, 21 Apr 2014 12:17:15 +0000 (20:17 +0800)]
MDL-45205 backup: avoid oracle incompatible query
Instead of aliasing column name with sql, use the backup API.
Dan Poltawski [Mon, 21 Apr 2014 06:45:10 +0000 (14:45 +0800)]
Merge branch 'MDL-45114-master' of git://github.com/jamiepratt/moodle
Dan Poltawski [Mon, 21 Apr 2014 06:41:23 +0000 (14:41 +0800)]
Merge branch 'w16_MDL-45049_m27_debugging' of https://github.com/skodak/moodle
Dan Poltawski [Mon, 21 Apr 2014 02:51:38 +0000 (10:51 +0800)]
Merge branch 'MDL-45145_master' of https://github.com/markn86/moodle
Dan Poltawski [Mon, 21 Apr 2014 02:12:34 +0000 (10:12 +0800)]
Merge branch 'MDL-45171' of git://github.com/stronk7/moodle
James Pratt [Sat, 19 Apr 2014 08:04:16 +0000 (15:04 +0700)]
MDL-45114 quiz simulate report : multi-choice multi qtype response data
fixing download.
Eloy Lafuente (stronk7) [Fri, 18 Apr 2014 15:34:06 +0000 (17:34 +0200)]
MDL-45171 log reports: fix sql for cross support
Rules for cross-db support are:
- Always use the 'AS' keyword for columns.
- Never use the 'AS' keyword for tables/views.
Dan Poltawski [Fri, 18 Apr 2014 07:27:41 +0000 (15:27 +0800)]
Merge branch 'MDL-44468_master' of git://github.com/ds125v/moodle
Dan Poltawski [Fri, 18 Apr 2014 07:12:21 +0000 (15:12 +0800)]
Merge branch 'MDL-40716_master' of https://github.com/nadavkav/moodle
Dan Poltawski [Fri, 18 Apr 2014 06:54:54 +0000 (14:54 +0800)]
Merge branch 'MDL-45010-master' of git://github.com/FMCorz/moodle
Dan Poltawski [Fri, 18 Apr 2014 06:16:23 +0000 (14:16 +0800)]
Merge branch '45147-27' of git://github.com/samhemelryk/moodle
Dan Poltawski [Fri, 18 Apr 2014 06:07:53 +0000 (14:07 +0800)]
Merge branch 'MDL-44778_atto_border' of https://github.com/andyjdavis/moodle
Dan Poltawski [Fri, 18 Apr 2014 05:47:10 +0000 (13:47 +0800)]
Merge branch 'MDL-45023-master' of git://github.com/jamiepratt/moodle
Dan Poltawski [Fri, 18 Apr 2014 04:03:23 +0000 (12:03 +0800)]
Merge branch 'MDL-45110-master' of git://github.com/jamiepratt/moodle
Dan Poltawski [Fri, 18 Apr 2014 03:54:48 +0000 (11:54 +0800)]
Merge branch '45123-27' of git://github.com/samhemelryk/moodle
Dan Poltawski [Fri, 18 Apr 2014 03:49:39 +0000 (11:49 +0800)]
Merge branch 'MDL-44674-master' of git://github.com/andrewnicols/moodle
Conflicts:
lib/editor/atto/yui/build/moodle-editor_atto-plugin/moodle-editor_atto-plugin-min.js
Dan Poltawski [Fri, 18 Apr 2014 03:42:36 +0000 (11:42 +0800)]
Merge branch 'MDL-44906-master' of git://github.com/andrewnicols/moodle
Dan Poltawski [Fri, 18 Apr 2014 03:10:39 +0000 (11:10 +0800)]
Merge branch 'MDL-39607-master' of git://github.com/FMCorz/moodle
Rajeev S [Wed, 9 Apr 2014 05:15:29 +0000 (10:45 +0530)]
MDL-43789: coursename disallows spaces in user bulk actions filter
Spaces and other non alphanumeric characters are disallowed in
coursename filter for user bulk actions.This prevents filtering
based upon courserole if the coursename contains spaces or other non
alphanumeric characters.
Dan Poltawski [Fri, 18 Apr 2014 02:52:45 +0000 (10:52 +0800)]
Merge branch 'wip-MDL-43626-master' of git://github.com/abgreeve/moodle
Dan Poltawski [Fri, 18 Apr 2014 02:50:06 +0000 (10:50 +0800)]
Merge branch 'wip-MDL-45036-master' of git://github.com/abgreeve/moodle
Dan Poltawski [Fri, 18 Apr 2014 02:47:04 +0000 (10:47 +0800)]
Merge branch 'MDL-45071_master' of https://github.com/markn86/moodle
Dan Poltawski [Fri, 18 Apr 2014 02:30:12 +0000 (10:30 +0800)]
Merge branch 'MDL-45059-master' of https://github.com/sammarshallou/moodle
Dan Poltawski [Fri, 18 Apr 2014 02:26:38 +0000 (10:26 +0800)]
Merge branch 'MDL-44990-master' of git://github.com/lameze/moodle
Dan Poltawski [Fri, 18 Apr 2014 02:23:45 +0000 (10:23 +0800)]
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
Dan Poltawski [Fri, 18 Apr 2014 02:05:26 +0000 (10:05 +0800)]
Merge branch 'MDL-41975-master' of git://github.com/FMCorz/moodle
Dan Poltawski [Fri, 18 Apr 2014 01:57:21 +0000 (09:57 +0800)]
Merge branch 'wip-MDL-45154-master' of git://github.com/marinaglancy/moodle
Mark Nelson [Fri, 18 Apr 2014 01:34:47 +0000 (18:34 -0700)]
MDL-45145 mod_quiz: ensure quiz cmid is set before triggering the 'attempt_deleted' event
Eloy Lafuente (stronk7) [Thu, 17 Apr 2014 13:49:54 +0000 (15:49 +0200)]
on-demand release 2.7beta+
sam marshall [Thu, 17 Apr 2014 09:47:06 +0000 (10:47 +0100)]
MDL-45138 Conditional availability: toggling AND/OR affects nested groups
Dan Poltawski [Thu, 17 Apr 2014 09:02:04 +0000 (17:02 +0800)]
Merge branch 'MDL-44619_master' of git://github.com/dmonllao/moodle
Damyon Wiese [Thu, 17 Apr 2014 08:17:12 +0000 (16:17 +0800)]
Merge branch 'MDL-45119-master' of git://github.com/andrewnicols/moodle
Marina Glancy [Thu, 17 Apr 2014 07:57:03 +0000 (15:57 +0800)]
Merge branch 'w16_MDL-45144_m27_booklog' of git://github.com/skodak/moodle
Simey Lameze [Thu, 17 Apr 2014 03:46:25 +0000 (11:46 +0800)]
MDL-44990 logging: Capabilites removed from legacy and standard log.
Petr Skoda [Thu, 17 Apr 2014 07:33:30 +0000 (15:33 +0800)]
MDL-45144 describe mod_book events changes
Marina Glancy [Thu, 17 Apr 2014 07:06:09 +0000 (15:06 +0800)]
Merge branch 'MDL-44658' of git://github.com/danielneis/moodle
Damyon Wiese [Thu, 17 Apr 2014 05:25:45 +0000 (13:25 +0800)]
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.
Frederic Massart [Thu, 17 Apr 2014 06:33:39 +0000 (14:33 +0800)]
MDL-39607 theme: Update Moodle logo
Petr Skoda [Thu, 17 Apr 2014 06:15:27 +0000 (14:15 +0800)]
MDL-45144 convert book events to create_from_xxx() helpers
Marina Glancy [Thu, 17 Apr 2014 06:24:58 +0000 (14:24 +0800)]
MDL-45154 user profiles: avoid redirection warnings
Petr Skoda [Thu, 17 Apr 2014 05:30:30 +0000 (13:30 +0800)]
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.
Frederic Massart [Thu, 17 Apr 2014 04:46:07 +0000 (12:46 +0800)]
MDL-42761 badges: Remove H2s from help popup
Andrew Nicols [Wed, 16 Apr 2014 07:22:54 +0000 (15:22 +0800)]
MDL-45119 editpdf: Do not load quick comments in read-only mode
Andrew Nicols [Wed, 16 Apr 2014 07:12:44 +0000 (15:12 +0800)]
MDL-45119 ajax: Correct use of COUNT in exception dialogue
Andrew Nicols [Wed, 16 Apr 2014 07:11:44 +0000 (15:11 +0800)]
MDL-45119 ajax: AJAX exceptions need a String in the Link
Marina Glancy [Thu, 17 Apr 2014 03:39:18 +0000 (11:39 +0800)]
MDL-45087 report_log: do not show anonymous actions, use indexes
Sam Hemelryk [Thu, 17 Apr 2014 03:16:06 +0000 (15:16 +1200)]
MDL-45147 my: automate testing of block restriction
Marina Glancy [Thu, 17 Apr 2014 03:20:51 +0000 (11:20 +0800)]
Merge branch 'w16_MDL-41101_m27_assign' of git://github.com/skodak/moodle
Marina Glancy [Thu, 17 Apr 2014 03:04:26 +0000 (11:04 +0800)]
Merge branch 'wip-mdl-45143' of git://github.com/rajeshtaneja/moodle
Marina Glancy [Thu, 17 Apr 2014 03:04:10 +0000 (11:04 +0800)]
Merge branch 'MDL-44621_master' of git://github.com/dmonllao/moodle
Marina Glancy [Thu, 17 Apr 2014 03:03:52 +0000 (11:03 +0800)]
Merge branch 'MDL-44618_master' of git://github.com/dmonllao/moodle
Marina Glancy [Thu, 17 Apr 2014 03:03:25 +0000 (11:03 +0800)]
Merge branch 'MDL-44617_master' of git://github.com/dmonllao/moodle
Petr Skoda [Thu, 17 Apr 2014 03:01:18 +0000 (11:01 +0800)]
MDL-41101 verify contextlevel in all assign events
Marina Glancy [Thu, 17 Apr 2014 03:01:16 +0000 (11:01 +0800)]
Merge branch 'MDL-44992-master' of git://github.com/sammarshallou/moodle
Damyon Wiese [Thu, 17 Apr 2014 02:27:07 +0000 (10:27 +0800)]
MDL-35373 mod_assign: Add a behat test for word count limit.
Petr Škoda [Wed, 16 Apr 2014 15:39:35 +0000 (23:39 +0800)]
MDL-41101 use snapshots for submissions and grades in assign events
Tony Butler [Mon, 3 Feb 2014 14:07:39 +0000 (14:07 +0000)]
MDL-35373 mod_assign Add functionality to enforce onlinetext word limit
Signed-off-by: Tony Butler <tonyjbutler@gmail.com>
Tony Butler [Thu, 30 Jan 2014 17:27:56 +0000 (17:27 +0000)]
MDL-35373 mod_assign Add form elements for assignsubmission_onlinetext word limit
Signed-off-by: Tony Butler <tonyjbutler@gmail.com>
Petr Škoda [Wed, 16 Apr 2014 12:20:23 +0000 (20:20 +0800)]
MDL-41101 move assign property to the assign event base class
Petr Škoda [Wed, 16 Apr 2014 11:53:52 +0000 (19:53 +0800)]
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.
Petr Škoda [Wed, 16 Apr 2014 09:03:35 +0000 (17:03 +0800)]
MDL-41101 tidy up the phpdocs in new assign events
Petr Škoda [Wed, 16 Apr 2014 05:45:07 +0000 (13:45 +0800)]
MDL-41101 convert assign event triggers to new create_from_xxx helpers
Mark Nelson [Thu, 3 Apr 2014 05:17:38 +0000 (22:17 -0700)]
MDL-41101 mod_assign: replaced 'save grading feedback' add_to_log call with an event
Mark Nelson [Thu, 3 Apr 2014 04:25:06 +0000 (21:25 -0700)]
MDL-41101 mod_assign: replaced 'grade submission' add_to_log call with an event
Mark Nelson [Fri, 28 Mar 2014 04:16:42 +0000 (21:16 -0700)]
MDL-41101 mod_assign: replaced 'view batch set marker allocation' add_to_log call with an event
Mark Nelson [Fri, 28 Mar 2014 02:16:13 +0000 (19:16 -0700)]
MDL-41101 mod_assign: replaced 'view batch set marking workflow state' add_to_log call with an event
Mark Nelson [Fri, 28 Mar 2014 00:54:04 +0000 (17:54 -0700)]
MDL-41101 mod_assign: replaced 'view' add_to_log call for the submission status page with an event
Mark Nelson [Thu, 27 Mar 2014 23:50:47 +0000 (16:50 -0700)]
MDL-41101 mod_assign: replaced 'view confirm submit assignment form' add_to_log call with an event
Mark Nelson [Thu, 27 Mar 2014 01:39:56 +0000 (18:39 -0700)]
MDL-41101 mod_assign: replaced 'submission statement accepted' add_to_log call with an event
Mark Nelson [Thu, 27 Mar 2014 02:09:36 +0000 (19:09 -0700)]
MDL-41101 mod_assign: replaced 'view' add_to_log call for the reveal identities confirmation page with an event
Mark Nelson [Tue, 25 Mar 2014 02:32:22 +0000 (19:32 -0700)]
MDL-41101 mod_assign: replaced 'view submit assignment form' add_to_log call with an event
Mark Nelson [Tue, 25 Mar 2014 02:00:35 +0000 (19:00 -0700)]
MDL-41101 mod_assign: replaced 'view submission grading table' add_to_log call with an event
Mark Nelson [Tue, 25 Mar 2014 00:52:00 +0000 (17:52 -0700)]
MDL-41101 mod_assign: replaced 'view grading form' add_to_log call with an event
Mark Nelson [Mon, 24 Mar 2014 05:10:34 +0000 (22:10 -0700)]
MDL-41101 mod_assign: replaced 'view feedback' add_to_log call with an event
Mark Nelson [Sun, 23 Mar 2014 00:27:52 +0000 (17:27 -0700)]
MDL-41101 mod_assign: replaced 'view submission' add_to_log call with an event
Mark Nelson [Thu, 20 Mar 2014 02:27:36 +0000 (19:27 -0700)]
MDL-41101 mod_assign: replaced 'view all' add_to_log call with an event
Mark Nelson [Sun, 23 Mar 2014 00:21:38 +0000 (17:21 -0700)]
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.
Mark Nelson [Thu, 20 Mar 2014 02:44:15 +0000 (19:44 -0700)]
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
Andrew Davis [Fri, 11 Apr 2014 02:43:59 +0000 (10:43 +0800)]
MDL-44778 core_theme: added the well and well-small class to Base
Rajesh Taneja [Thu, 17 Apr 2014 00:47:57 +0000 (08:47 +0800)]
MDL-45142 report_partcipation: Fixed behat feature file name
Andrew Davis [Thu, 27 Mar 2014 06:11:27 +0000 (14:11 +0800)]
MDL-44778 editor_atto: added a border around the equation preview
Sam Hemelryk [Wed, 16 Apr 2014 20:52:07 +0000 (08:52 +1200)]
Merge branch 'MDL-44616_master' of git://github.com/dmonllao/moodle
Sam Hemelryk [Wed, 16 Apr 2014 20:39:34 +0000 (08:39 +1200)]
Merge branch 'wip-MDL-45116_master' of https://github.com/kwiliarty/moodle
Sam Hemelryk [Wed, 16 Apr 2014 20:37:26 +0000 (08:37 +1200)]
Merge branch 'MDL-45061' of git://github.com/jleyva/moodle
Eloy Lafuente (stronk7) [Wed, 16 Apr 2014 14:22:28 +0000 (16:22 +0200)]
Merge branch 'MDL-45132-master' of git://github.com/FMCorz/moodle
Frederic Massart [Wed, 16 Apr 2014 09:29:22 +0000 (17:29 +0800)]
MDL-45132 curl: Unit Tests for file uploads
Dan Poltawski [Wed, 16 Apr 2014 07:21:08 +0000 (15:21 +0800)]
Merge branch 'MDL-44798-master' of git://github.com/andrewnicols/moodle
Dan Poltawski [Wed, 16 Apr 2014 07:11:27 +0000 (15:11 +0800)]
Merge branch 'MDL-44349-master' of https://github.com/lucisgit/moodle
Marina Glancy [Wed, 16 Apr 2014 06:44:04 +0000 (14:44 +0800)]
Merge branch 'MDL-44951-master' of git://github.com/jethac/moodle
Conflicts:
theme/bootstrapbase/style/moodle.css
Marina Glancy [Wed, 16 Apr 2014 06:42:40 +0000 (14:42 +0800)]
Merge branch 'MDL-41286_master' of git://github.com/markn86/moodle
Marina Glancy [Wed, 16 Apr 2014 06:42:15 +0000 (14:42 +0800)]
Merge branch 'MDL-44758-master' of git://github.com/jethac/moodle
Dan Poltawski [Wed, 16 Apr 2014 06:34:58 +0000 (14:34 +0800)]
Merge branch 'wip-mdl-44977' of https://github.com/rajeshtaneja/moodle
Damyon Wiese [Wed, 16 Apr 2014 06:23:07 +0000 (14:23 +0800)]
Merge branch 'MDL-44629-B' of https://github.com/bostelm/moodle
Dan Poltawski [Wed, 16 Apr 2014 05:56:37 +0000 (13:56 +0800)]
Merge branch 'wip-mdl-44979' of https://github.com/rajeshtaneja/moodle