Sam Hemelryk [Wed, 23 Apr 2014 23:03:15 +0000 (11:03 +1200)]
Merge branch 'MDL-45124-master' of git://github.com/andrewnicols/moodle
Sam Hemelryk [Wed, 23 Apr 2014 23:01:33 +0000 (11:01 +1200)]
Merge branch 'MDL-45186-master' of git://github.com/FMCorz/moodle
Dan Poltawski [Wed, 23 Apr 2014 08:40:22 +0000 (16:40 +0800)]
Merge branch 'MDL-45172_block' of https://github.com/andyjdavis/moodle
Dan Poltawski [Wed, 23 Apr 2014 08:13:08 +0000 (16:13 +0800)]
Merge branch 'MDL-45075-master' of git://github.com/andrewnicols/moodle
Andrew Nicols [Wed, 23 Apr 2014 06:45:54 +0000 (14:45 +0800)]
MDL-45075 mod_forum: Add unit tests for forum subscription on forum creation
Marina Glancy [Wed, 23 Apr 2014 07:25:01 +0000 (15:25 +0800)]
Merge branch 'w17_MDL-45219_m27_addtolog' of git://github.com/skodak/moodle
Marina Glancy [Wed, 23 Apr 2014 06:45:59 +0000 (14:45 +0800)]
Merge branch 'MDL-45134-master' of git://github.com/FMCorz/moodle
Marina Glancy [Wed, 23 Apr 2014 06:33:51 +0000 (14:33 +0800)]
Merge branch 'MDL-45008-master' of git://github.com/andrewnicols/moodle
Marina Glancy [Wed, 23 Apr 2014 06:33:12 +0000 (14:33 +0800)]
Merge branch 'wip-MDL-45218-master' of git://github.com/abgreeve/moodle
Dan Poltawski [Wed, 23 Apr 2014 06:22:17 +0000 (14:22 +0800)]
Merge branch 'wip-MDL-45148-master' of https://github.com/mackensen/moodle
Dan Poltawski [Wed, 23 Apr 2014 05:29:20 +0000 (13:29 +0800)]
Merge branch 'MDL-45194-master' of git://github.com/FMCorz/moodle
Marina Glancy [Wed, 23 Apr 2014 05:24:54 +0000 (13:24 +0800)]
Merge branch 'MDL-44991-master' of git://github.com/sammarshallou/moodle
Marina Glancy [Wed, 23 Apr 2014 05:23:46 +0000 (13:23 +0800)]
Merge branch 'MDL-45109_master' of git://github.com/nadavkav/moodle
Marina Glancy [Wed, 23 Apr 2014 05:12:25 +0000 (13:12 +0800)]
Merge branch 'MDL-44855-master' of git://github.com/andrewnicols/moodle
Marina Glancy [Wed, 23 Apr 2014 05:11:23 +0000 (13:11 +0800)]
Merge branch 'MDL-44950-master' of git://github.com/ankitagarwal/moodle
Frederic Massart [Wed, 23 Apr 2014 04:33:56 +0000 (12:33 +0800)]
MDL-45134 adminlib: No more validation error when a config file is not set
When the destination draft area existed and the user draft area has not
been used, and thus does not exist, an error was displayed to the user
saying that they could not save the setting.
This was intended to handle the cases where the draft area disappears
and would overwrite the content of the destination area, deleting
all its content. But now we do not prompt with an error when
overwriting empty with empty.
Adrian Greeve [Tue, 22 Apr 2014 10:56:07 +0000 (18:56 +0800)]
MDL-45218 events: Unit tests and fixtures for new static methods in base event class.
Petr Skoda [Wed, 23 Apr 2014 03:26:52 +0000 (11:26 +0800)]
MDL-45219 add course recent_activity_viewed event
Petr Skoda [Wed, 23 Apr 2014 03:04:31 +0000 (11:04 +0800)]
MDL-45219 add report_viewed event to report_questioninstances
Petr Skoda [Wed, 23 Apr 2014 02:48:45 +0000 (10:48 +0800)]
MDL-45219 add report_viewed event to tool_capability
Petr Skoda [Wed, 23 Apr 2014 02:29:06 +0000 (10:29 +0800)]
MDL-45219 add \mod\chat\course_module_viewed event
Petr Skoda [Wed, 23 Apr 2014 02:04:07 +0000 (10:04 +0800)]
MDL-45219 remove old assignment course instance list
Adrian Greeve [Tue, 22 Apr 2014 10:55:01 +0000 (18:55 +0800)]
MDL-45218 events: New static methods for getting general event information.
New methods are get_static_info() and get_explanation().
Adrian Greeve [Tue, 22 Apr 2014 05:44:36 +0000 (13:44 +0800)]
MDL-45216 events: Unit tests for core/event/manager.
This includes unit tests for the new method get_all_observers
and updates to other methods that have been updated.
Adrian Greeve [Tue, 22 Apr 2014 05:43:48 +0000 (13:43 +0800)]
MDL-45216 events: Update to core/event/manager to return observer information.
Andrew Davis [Tue, 22 Apr 2014 03:51:40 +0000 (11:51 +0800)]
MDL-45172 block_completionstatus: added a check for an empty string before appending
Dan Poltawski [Wed, 23 Apr 2014 02:44:10 +0000 (10:44 +0800)]
Merge branch 'w17_MDL-45203_m27_loginlog' of https://github.com/skodak/moodle
Dan Poltawski [Wed, 23 Apr 2014 02:39:26 +0000 (10:39 +0800)]
Merge branch 'MDL-45226-master' of git://github.com/andrewnicols/moodle
Petr Skoda [Tue, 22 Apr 2014 04:41:13 +0000 (12:41 +0800)]
MDL-45203 implement new event user_password_updated
Andrew Nicols [Tue, 22 Apr 2014 15:25:26 +0000 (23:25 +0800)]
MDL-45226 AJAX: Backport upstream bug fixes from YUI
This backports the following two patches:
* https://github.com/yui/yui3/issues/1757
* https://github.com/yui/yui3/issues/1778
Eloy Lafuente (stronk7) [Tue, 22 Apr 2014 10:31:22 +0000 (12:31 +0200)]
on-demand release 2.7beta+
Andrew Nicols [Tue, 22 Apr 2014 08:48:02 +0000 (16:48 +0800)]
MDL-44855 AJAX: Arrays and Objects should be defined in the initializer
JavaScript is a prototypal language and complex types should be defined as
null in the prototype, and set up in the initializer instead.
Andrew Nicols [Tue, 22 Apr 2014 08:07:29 +0000 (16:07 +0800)]
MDL-45124 dndupload: Lowercase types when comparing
IE helpfull uses a mixed-case version of 'Text' which fails the string
comparison. All other browsers use lowercase for their mime-types.
Frederic Massart [Tue, 22 Apr 2014 07:32:25 +0000 (15:32 +0800)]
MDL-45194 assign_feedback: Cache was never set and used in is_enabled
Dan Poltawski [Tue, 22 Apr 2014 07:18:59 +0000 (15:18 +0800)]
Merge branch 'MDL-40716-master' of https://github.com/andrewnicols/moodle
Dan Poltawski [Tue, 22 Apr 2014 07:10:52 +0000 (15:10 +0800)]
bump version for new events
Andrew Nicols [Tue, 22 Apr 2014 07:06:23 +0000 (15:06 +0800)]
MDL-40716 report_completion: Set RTL
Andrew Nicols [Wed, 9 Apr 2014 04:53:06 +0000 (12:53 +0800)]
MDL-45008 atto_link: Standardise unlinking for non-selections
When placing the cursor within a link, but not making a selection, we
should unlink the whole link.
Dan Poltawski [Tue, 22 Apr 2014 04:35:10 +0000 (12:35 +0800)]
Merge branch 'wip-MDL-45154-master' of git://github.com/marinaglancy/moodle
Frederic Massart [Tue, 22 Apr 2014 04:27:34 +0000 (12:27 +0800)]
MDL-45186 mod_quiz: Some RTL improvements on quiz edit page
Marina Glancy [Tue, 22 Apr 2014 04:27:13 +0000 (12:27 +0800)]
Merge branch 'MDL-43673' of git://github.com/stronk7/moodle
Marina Glancy [Tue, 22 Apr 2014 04:26:24 +0000 (12:26 +0800)]
Merge branch 'w17_MDL-41185_m27_courselog' of git://github.com/skodak/moodle
Petr Skoda [Tue, 22 Apr 2014 02:36:56 +0000 (10:36 +0800)]
MDL-41185 fix url in course_viewed event after course deleted
Includes a minor fix for course invalidation after deleting of course,
this improvement should not affect normal execution, that is why
it was not backported.
Andrew Nicols [Tue, 22 Apr 2014 02:36:45 +0000 (10:36 +0800)]
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.
Ankit Agarwal [Fri, 4 Apr 2014 05:31:02 +0000 (13:31 +0800)]
MDL-44950 logstore_database: Make all settings positive for usability
Marina Glancy [Tue, 22 Apr 2014 02:37:27 +0000 (10:37 +0800)]
MDL-45154 user profiles: category name duplication error
Sam Hemelryk [Mon, 21 Apr 2014 22:46:51 +0000 (10:46 +1200)]
Merge branch 'wip-MDL-45045_master' of git://github.com/gjb2048/moodle
Conflicts:
lib/yui/build/moodle-core-blocks/moodle-core-blocks-min.js
Sam Hemelryk [Mon, 21 Apr 2014 22:39:09 +0000 (10:39 +1200)]
Merge branch 'MDL-43145-master' of git://github.com/andrewnicols/moodle
Sam Hemelryk [Mon, 21 Apr 2014 22:10:04 +0000 (10:10 +1200)]
Merge branch 'mdl45012-master' of https://github.com/tlock/moodle
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.
Petr Skoda [Mon, 21 Apr 2014 10:12:53 +0000 (18:12 +0800)]
MDL-41185 cleanup course viewed events
Thanks Marina for spotting some of the issues.
Adrian Greeve [Thu, 3 Apr 2014 06:21:00 +0000 (14:21 +0800)]
MDL-41185 events: Added events for different course view pages
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
Nadav Kavalerchik [Sun, 20 Apr 2014 14:03:03 +0000 (17:03 +0300)]
MDL-45109 - theme/bootstrapbase - Fix Unordered and Ordered lists in RTL mode
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
