Eloy Lafuente (stronk7) [Wed, 8 Jan 2014 01:15:03 +0000 (02:15 +0100)]
Merge branch 'MDL-40119-master' of git://github.com/andrewnicols/moodle
Eloy Lafuente (stronk7) [Wed, 8 Jan 2014 01:09:55 +0000 (02:09 +0100)]
Merge branch 'w01_MDL-42797_m27_admin' of https://github.com/skodak/moodle
Eloy Lafuente (stronk7) [Wed, 8 Jan 2014 01:02:29 +0000 (02:02 +0100)]
Merge branch 'MDL-43423_master' of git://github.com/dmonllao/moodle
Eloy Lafuente (stronk7) [Wed, 8 Jan 2014 00:59:21 +0000 (01:59 +0100)]
Merge branch 'MDL-43330_master' of git://github.com/dmonllao/moodle
Eloy Lafuente (stronk7) [Wed, 8 Jan 2014 00:32:28 +0000 (01:32 +0100)]
Merge branch 'wip-MDL-42310-master' of git://github.com/abgreeve/moodle
Dan Poltawski [Wed, 8 Jan 2014 00:21:06 +0000 (08:21 +0800)]
Merge branch 'MDL-43173_master' of git://github.com/dmonllao/moodle
Eloy Lafuente (stronk7) [Tue, 7 Jan 2014 23:45:51 +0000 (00:45 +0100)]
Merge branch 'm27_MDL-43508_Invalid_String_Identifier' of https://github.com/scara/moodle
Eloy Lafuente (stronk7) [Tue, 7 Jan 2014 23:39:15 +0000 (00:39 +0100)]
Merge branch 'MDL-42607_rss' of https://github.com/andyjdavis/moodle
Eloy Lafuente (stronk7) [Tue, 7 Jan 2014 23:23:40 +0000 (00:23 +0100)]
Merge branch 'MDL-42392-master' of git://github.com/andrewnicols/moodle
Eloy Lafuente (stronk7) [Tue, 7 Jan 2014 23:13:28 +0000 (00:13 +0100)]
Merge branch 'w01_MDL-43515_m27_phpunitdocs' of https://github.com/skodak/moodle
Eloy Lafuente (stronk7) [Tue, 7 Jan 2014 22:42:55 +0000 (23:42 +0100)]
Merge branch '23837-27' of git://github.com/samhemelryk/moodle
Eloy Lafuente (stronk7) [Tue, 7 Jan 2014 22:40:51 +0000 (23:40 +0100)]
Merge branch 'w01_MDL-43503_m27_pagedldap' of https://github.com/skodak/moodle
Eloy Lafuente (stronk7) [Tue, 7 Jan 2014 22:32:38 +0000 (23:32 +0100)]
Merge branch 'MDL-43451-master' of git://github.com/andrewnicols/moodle
Dan Poltawski [Tue, 7 Jan 2014 09:28:15 +0000 (17:28 +0800)]
Merge branch 'w01_MDL-43510_m27_test404' of https://github.com/skodak/moodle
Dan Poltawski [Tue, 7 Jan 2014 09:23:07 +0000 (17:23 +0800)]
Merge branch 'MDL-43270-master' of git://github.com/andrewnicols/moodle
Dan Poltawski [Tue, 7 Jan 2014 09:20:44 +0000 (17:20 +0800)]
Merge branch 'm27_MDL-43482_Lot_Of_Passed_By_Reference_Messages' of https://github.com/scara/moodle
Damyon Wiese [Tue, 7 Jan 2014 08:57:49 +0000 (16:57 +0800)]
Merge branch 'MDL-34356-master' of git://github.com/andrewnicols/moodle
Damyon Wiese [Tue, 7 Jan 2014 08:16:48 +0000 (16:16 +0800)]
Merge branch 'MDL-43273-master' of git://github.com/andrewnicols/moodle
Damyon Wiese [Tue, 7 Jan 2014 08:15:16 +0000 (16:15 +0800)]
Merge branch 'MDL-43271-master' of git://github.com/andrewnicols/moodle
Damyon Wiese [Tue, 7 Jan 2014 08:11:27 +0000 (16:11 +0800)]
MDL-36334 JS: Only print deprecation notices for developers
Damyon Wiese [Tue, 7 Jan 2014 08:10:05 +0000 (16:10 +0800)]
Merge branch 'MDL-36334-master' of https://github.com/andrewnicols/moodle
Dan Poltawski [Tue, 7 Jan 2014 07:48:06 +0000 (15:48 +0800)]
MDL-43481 lib: minor cleanups to commands
And remove unused strings - thanks to Simon Coggins!
Dan Poltawski [Tue, 7 Jan 2014 07:46:59 +0000 (15:46 +0800)]
Merge branch 'w01_MDL-43481_m27_passwords' of https://github.com/skodak/moodle
Damyon Wiese [Tue, 7 Jan 2014 06:10:40 +0000 (14:10 +0800)]
Merge branch 'MDL-43307-master' of git://github.com/andrewnicols/moodle
Dan Poltawski [Tue, 7 Jan 2014 05:48:49 +0000 (13:48 +0800)]
Merge branch 'MDL-43489-master' of git://github.com/andrewnicols/moodle
Damyon Wiese [Tue, 7 Jan 2014 05:30:24 +0000 (13:30 +0800)]
Merge branch 'w01_MDL-43585_m27_userlib' of https://github.com/skodak/moodle
Andrew Nicols [Tue, 7 Jan 2014 05:12:49 +0000 (16:12 +1100)]
MDL-36334 JS: Deprecate YUI galleryversion in enrol
Damyon Wiese [Tue, 7 Jan 2014 04:53:07 +0000 (12:53 +0800)]
Merge branch 'MDL-43411-master' of git://github.com/andrewnicols/moodle
Dan Poltawski [Tue, 7 Jan 2014 04:42:33 +0000 (12:42 +0800)]
Merge branch 'm27_MDL-40379_Prevent_Some_Mobile_Network_Providers_From_Modifying_Content' of https://github.com/scara/moodle
Damyon Wiese [Tue, 7 Jan 2014 04:29:45 +0000 (12:29 +0800)]
Merge branch 'w01_MDL-43402_m27_zlib' of https://github.com/skodak/moodle
Damyon Wiese [Tue, 7 Jan 2014 04:26:01 +0000 (12:26 +0800)]
Merge branch 'MDL-43490-master' of git://github.com/andrewnicols/moodle
Damyon Wiese [Tue, 7 Jan 2014 04:22:49 +0000 (12:22 +0800)]
Merge branch 'wip-mdl-43293' of https://github.com/rajeshtaneja/moodle
Petr Škoda [Tue, 7 Jan 2014 04:16:02 +0000 (12:16 +0800)]
MDL-43585 remove incorrect user/lib.php include
David Monllao [Tue, 17 Dec 2013 10:21:18 +0000 (18:21 +0800)]
MDL-43423 behat: Running hooks before and after each step of a chained step
Sam Hemelryk [Mon, 6 Jan 2014 21:26:48 +0000 (10:26 +1300)]
MDL-43526 category: added restore course link to admin structure
Sam Hemelryk [Wed, 1 Jan 2014 23:33:23 +0000 (12:33 +1300)]
MDL-43526 course: links to restore from management and admin structure.
Dan Poltawski [Tue, 7 Jan 2014 03:51:15 +0000 (11:51 +0800)]
Merge branch 'MDL-42995-master-3rd' of git://github.com/FMCorz/moodle
Sam Hemelryk [Wed, 1 Jan 2014 20:43:19 +0000 (09:43 +1300)]
MDL-43349 cache: is_ready now checks are_requirements_met by default
(Fixes the fixed forwarded static call bug reverted in
a5581c7)
Dan Poltawski [Tue, 7 Jan 2014 03:08:23 +0000 (11:08 +0800)]
Merge branch 'wip-mdl-43521' of https://github.com/rajeshtaneja/moodle
Rajesh Taneja [Mon, 18 Nov 2013 09:12:09 +0000 (17:12 +0800)]
MDL-42643 course: Member in same group should only loginas
If course groupmode is set to SEPARATEGROUPS, and user doesn't have
site:accessallgroups capability than only allow user to loginas if
current user is in same group as loginas user
Dan Poltawski [Tue, 7 Jan 2014 02:59:40 +0000 (10:59 +0800)]
Merge branch 'MDL-43394a' of https://github.com/srynot4sale/moodle
Dan Poltawski [Tue, 7 Jan 2014 02:55:20 +0000 (10:55 +0800)]
Merge branch 'MDL-42585-master' of git://github.com/damyon/moodle
Conflicts:
mod/assign/version.php
Dan Poltawski [Tue, 7 Jan 2014 02:43:39 +0000 (10:43 +0800)]
Merge branch 'MDL-43373-master' of https://github.com/tonyjbutler/moodle
Dan Poltawski [Tue, 7 Jan 2014 02:34:40 +0000 (10:34 +0800)]
Merge branch 'MDL-43323-master' of git://github.com/andrewnicols/moodle
Damyon Wiese [Tue, 7 Jan 2014 01:22:27 +0000 (09:22 +0800)]
Merge branch 'MDL-43448' of git://github.com/timhunt/moodle
Frederic Massart [Mon, 6 Jan 2014 09:20:23 +0000 (10:20 +0100)]
MDL-42995 mod_assign: Extended tests for update_calendar method
David Monllao [Mon, 16 Dec 2013 08:04:01 +0000 (16:04 +0800)]
MDL-43330 behat: behat-extension version changed
Frederic Massart [Thu, 19 Dec 2013 10:43:03 +0000 (11:43 +0100)]
MDL-42995 mod_assign: Remove files from calendar event description
Frederic Massart [Thu, 19 Dec 2013 09:20:32 +0000 (10:20 +0100)]
MDL-42995 mod_assign: Use new global function to strip content
Frederic Massart [Thu, 19 Dec 2013 09:19:42 +0000 (10:19 +0100)]
MDL-42995 libraries: Global function to strip pluginfile content
Damyon Wiese [Mon, 6 Jan 2014 08:13:44 +0000 (16:13 +0800)]
Merge branch 'MDL-43399-master' of git://github.com/mouneyrac/moodle
Damyon Wiese [Mon, 6 Jan 2014 07:51:25 +0000 (15:51 +0800)]
Merge branch 'MDL-43454-master' of git://github.com/FMCorz/moodle
Damyon Wiese [Mon, 6 Jan 2014 07:48:31 +0000 (15:48 +0800)]
Merge branch 'MDL-41690-master' of git://github.com/danpoltawski/moodle
Conflicts:
course/dnduploadlib.php
Dan Poltawski [Mon, 6 Jan 2014 07:11:23 +0000 (15:11 +0800)]
Merge branch 'MDL-40922_master' of https://github.com/markn86/moodle
Damyon Wiese [Mon, 6 Jan 2014 06:52:56 +0000 (14:52 +0800)]
Merge branch 'w01_MDL-36721_m27_passlog' of https://github.com/skodak/moodle
Dan Poltawski [Mon, 6 Jan 2014 06:47:12 +0000 (14:47 +0800)]
Revert "MDL-43349 cache: is_ready now checks are_requirements_met by default"
This reverts commit
2201c02d73ff2998b5019ab1173349ebbee7a5e6.
Dan Poltawski [Mon, 6 Jan 2014 06:21:44 +0000 (14:21 +0800)]
Merge branch '43349-27' of git://github.com/samhemelryk/moodle
Rajesh Taneja [Thu, 14 Nov 2013 02:43:18 +0000 (10:43 +0800)]
MDL-42883 Administration: Check sessionkey before taking action on user profile fields
Dan Poltawski [Tue, 17 Dec 2013 09:13:53 +0000 (17:13 +0800)]
MDL-41690 course: remove use of deprecated functions
Dan Poltawski [Tue, 17 Dec 2013 08:42:18 +0000 (16:42 +0800)]
MDL-41690 cm_info: deprecate various properties
Dan Poltawski [Mon, 6 Jan 2014 02:06:11 +0000 (10:06 +0800)]
Merge branch 'MDL-43408-master' of https://github.com/tonyjbutler/moodle
Sam Hemelryk [Mon, 6 Jan 2014 01:46:31 +0000 (14:46 +1300)]
Merge branch 'w01_MDL-43527_m27_safemode' of https://github.com/skodak/moodle
Sam Hemelryk [Mon, 6 Jan 2014 01:19:11 +0000 (14:19 +1300)]
Merge branch 'w01_MDL-43528_m27_magic' of https://github.com/skodak/moodle
Sam Hemelryk [Mon, 6 Jan 2014 01:16:26 +0000 (14:16 +1300)]
Merge branch 'MDL-31050_rss' of https://github.com/andyjdavis/moodle
Sam Hemelryk [Mon, 6 Jan 2014 00:09:42 +0000 (13:09 +1300)]
Merge branch 'wip-mdl-18770' of https://github.com/rajeshtaneja/moodle
Sam Hemelryk [Sun, 5 Jan 2014 23:01:54 +0000 (12:01 +1300)]
Merge branch 'MDL-40054_master' of https://github.com/markn86/moodle
Sam Hemelryk [Sun, 5 Jan 2014 23:00:11 +0000 (12:00 +1300)]
Merge branch 'MDL-40551_master' of https://github.com/totara/openbadges
Conflicts:
badges/upgrade.txt
Sam Hemelryk [Sun, 5 Jan 2014 22:28:34 +0000 (11:28 +1300)]
Merge branch 'MDL-35973_redirect' of https://github.com/andyjdavis/moodle
Sam Hemelryk [Sun, 5 Jan 2014 22:22:29 +0000 (11:22 +1300)]
Merge branch 'MDL-43281-master' of git://github.com/andrewnicols/moodle
Sam Hemelryk [Sun, 5 Jan 2014 21:30:31 +0000 (10:30 +1300)]
Merge branch 'MDL-42212-master' of git://github.com/FMCorz/moodle
Sam Hemelryk [Sun, 5 Jan 2014 21:19:20 +0000 (10:19 +1300)]
Merge branch 'MDL-42801-master' of git://github.com/andrewnicols/moodle
Sam Hemelryk [Sun, 5 Jan 2014 20:53:15 +0000 (09:53 +1300)]
Merge branch 'MDL-36334-master' of git://github.com/andrewnicols/moodle
Sam Hemelryk [Sun, 5 Jan 2014 20:51:38 +0000 (09:51 +1300)]
MDL-43238 mod_assign: removed incorrect validation
Sam Hemelryk [Sun, 5 Jan 2014 20:11:32 +0000 (09:11 +1300)]
Merge branch 'w01_MDL-43196_m27_signupfiles' of https://github.com/skodak/moodle
Rajesh Taneja [Mon, 23 Dec 2013 06:49:04 +0000 (14:49 +0800)]
MDL-18770 mod_assign: Set gradetype to GRADE_TYPE_NONE if feedback not enabled
Rajesh Taneja [Fri, 3 Jan 2014 07:03:48 +0000 (15:03 +0800)]
MDL-43238 events: Added event other information in event php doc block
Mark Nelson [Tue, 24 Dec 2013 05:31:25 +0000 (21:31 -0800)]
MDL-40054 mod_lesson: removed 'update email essay grade' add_to_log call
The add_to_log call was triggered whenever a grade was sent via the messaging
API. We should not be firing an event here, it should be fired via the
messaging API.
Mark Nelson [Thu, 17 Oct 2013 10:48:16 +0000 (18:48 +0800)]
MDL-40054 mod_lesson: replaced 'end' add_to_log call with an event
Mark Nelson [Thu, 17 Oct 2013 10:43:29 +0000 (18:43 +0800)]
MDL-40054 mod_lesson: replaced 'start' add_to_log call with an event
Mark Nelson [Thu, 17 Oct 2013 08:32:48 +0000 (16:32 +0800)]
MDL-40054 mod_lesson: replaced 'view highscores' add_to_log call with an event
Mark Nelson [Thu, 17 Oct 2013 10:18:02 +0000 (18:18 +0800)]
MDL-40054 mod_lesson: replaced 'update highscores' add_to_log call with an event
Mark Nelson [Thu, 17 Oct 2013 07:40:37 +0000 (15:40 +0800)]
MDL-40054 mod_lesson: replaced 'grade view' add_to_log call with an event
Mark Nelson [Wed, 16 Oct 2013 04:48:11 +0000 (12:48 +0800)]
MDL-40054 mod_lesson: replaced 'view all' add_to_log call with an event
Mark Nelson [Thu, 17 Oct 2013 10:19:56 +0000 (18:19 +0800)]
MDL-40054 mod_lesson: replaced 'view' add_to_log call with an event
David Monllao [Fri, 20 Dec 2013 04:51:23 +0000 (12:51 +0800)]
MDL-43173 behat: Thowing an exception if the JS is not ready
Rajesh Taneja [Fri, 3 Jan 2014 02:39:50 +0000 (10:39 +0800)]
MDL-43521 block_admin_bookmarks: Site admin node is of type TYPE_SITE_ADMIN
Since 2.6 Site admin node is of type TYPE_SITE_ADMIN, previously it was TYPE_SETTING
Michael Milette [Tue, 24 Dec 2013 17:00:44 +0000 (12:00 -0500)]
MDL-42310 feedback mod - Enable filtering of multichoice and multichoice rated controls
Conflicts:
mod/feedback/item/multichoice/lib.php
mod/feedback/item/multichoicerated/lib.php
Signed-off-by: Michael Milette <michael.milette@instruxmedia.com>
Tony Butler [Fri, 13 Dec 2013 15:03:27 +0000 (15:03 +0000)]
MDL-43373 core_enrol: Display enrolments dimmed if outside of start or end times
Tony Butler [Mon, 16 Dec 2013 15:30:56 +0000 (15:30 +0000)]
MDL-43408 gradereport_grader: Display users with expired enrolments as inactive in grader report
Andrew Davis [Wed, 1 Jan 2014 02:44:34 +0000 (10:44 +0800)]
MDL-31050 rss: removed some unused function parameters and removed some low value comments
Petr Škoda [Thu, 2 Jan 2014 01:35:50 +0000 (09:35 +0800)]
MDL-43528 remove all traces of magic quotes hacking from moodle core
Petr Škoda [Thu, 2 Jan 2014 01:23:15 +0000 (09:23 +0800)]
MDL-43527 eliminate last references to safe_mode
Safe mode is not availabel in PHP 5.4 any more...
Petr Škoda [Thu, 2 Jan 2014 01:17:16 +0000 (09:17 +0800)]
MDL-42797 require real user login on upgrade settings page
Sam Hemelryk [Wed, 1 Jan 2014 22:39:53 +0000 (11:39 +1300)]
MDL-23837 enrol: restyled the role and group controls
Sam Hemelryk [Wed, 1 Jan 2014 20:43:19 +0000 (09:43 +1300)]
MDL-43349 cache: is_ready now checks are_requirements_met by default
Sam Hemelryk [Wed, 11 Dec 2013 21:51:33 +0000 (10:51 +1300)]
MDL-43349 cache: init now checks store requirements are met
Petr Škoda [Wed, 1 Jan 2014 07:19:02 +0000 (15:19 +0800)]
MDL-42797 require real user login on admin page
Mark Nelson [Tue, 19 Nov 2013 02:37:03 +0000 (18:37 -0800)]
MDL-40922 mod_folder: replaced the 'edit' add_to_log call with an event
Mark Nelson [Sun, 17 Nov 2013 02:37:17 +0000 (18:37 -0800)]
MDL-40922 mod_folder: replaced the 'view' and 'view all' add_to_log calls with events
Petr Škoda [Tue, 31 Dec 2013 06:34:20 +0000 (14:34 +0800)]
MDL-43503 do not check presence of ldap paging functions, we require PHP 5.4 now
