moodle.git
7 years agoMerge branch 'm27_MDL-40379_Prevent_Some_Mobile_Network_Providers_From_Modifying_Cont...
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

7 years agoMerge branch 'w01_MDL-43402_m27_zlib' of https://github.com/skodak/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

7 years agoMerge branch 'MDL-43490-master' of git://github.com/andrewnicols/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

7 years agoMerge branch 'wip-mdl-43293' of https://github.com/rajeshtaneja/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

7 years agoMDL-43526 category: added restore course link to admin structure
Sam Hemelryk [Mon, 6 Jan 2014 21:26:48 +0000 (10:26 +1300)]
MDL-43526 category: added restore course link to admin structure

7 years agoMDL-43526 course: links to restore from management and 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.

7 years agoMerge branch 'MDL-42995-master-3rd' of git://github.com/FMCorz/moodle
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

7 years agoMDL-43349 cache: is_ready now checks are_requirements_met by default
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)

7 years agoMerge branch 'wip-mdl-43521' of https://github.com/rajeshtaneja/moodle
Dan Poltawski [Tue, 7 Jan 2014 03:08:23 +0000 (11:08 +0800)]
Merge branch 'wip-mdl-43521' of https://github.com/rajeshtaneja/moodle

7 years agoMDL-42643 course: Member in same group should only loginas
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

7 years agoMerge branch 'MDL-43394a' of https://github.com/srynot4sale/moodle
Dan Poltawski [Tue, 7 Jan 2014 02:59:40 +0000 (10:59 +0800)]
Merge branch 'MDL-43394a' of https://github.com/srynot4sale/moodle

7 years agoMerge branch 'MDL-42585-master' of git://github.com/damyon/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

7 years agoMerge branch 'MDL-43373-master' of https://github.com/tonyjbutler/moodle
Dan Poltawski [Tue, 7 Jan 2014 02:43:39 +0000 (10:43 +0800)]
Merge branch 'MDL-43373-master' of https://github.com/tonyjbutler/moodle

7 years agoMerge branch 'MDL-43323-master' of git://github.com/andrewnicols/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

7 years agoMerge branch 'MDL-43448' of git://github.com/timhunt/moodle
Damyon Wiese [Tue, 7 Jan 2014 01:22:27 +0000 (09:22 +0800)]
Merge branch 'MDL-43448' of git://github.com/timhunt/moodle

7 years agoMDL-42995 mod_assign: Extended tests for update_calendar method
Frederic Massart [Mon, 6 Jan 2014 09:20:23 +0000 (10:20 +0100)]
MDL-42995 mod_assign: Extended tests for update_calendar method

7 years agoMDL-42995 mod_assign: Remove files from calendar event description
Frederic Massart [Thu, 19 Dec 2013 10:43:03 +0000 (11:43 +0100)]
MDL-42995 mod_assign: Remove files from calendar event description

7 years agoMDL-42995 mod_assign: Use new global function to strip content
Frederic Massart [Thu, 19 Dec 2013 09:20:32 +0000 (10:20 +0100)]
MDL-42995 mod_assign: Use new global function to strip content

7 years agoMDL-42995 libraries: Global function to strip pluginfile content
Frederic Massart [Thu, 19 Dec 2013 09:19:42 +0000 (10:19 +0100)]
MDL-42995 libraries: Global function to strip pluginfile content

7 years agoMerge branch 'MDL-43399-master' of git://github.com/mouneyrac/moodle
Damyon Wiese [Mon, 6 Jan 2014 08:13:44 +0000 (16:13 +0800)]
Merge branch 'MDL-43399-master' of git://github.com/mouneyrac/moodle

7 years agoMerge branch 'MDL-43454-master' of git://github.com/FMCorz/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

7 years agoMerge branch 'MDL-41690-master' of git://github.com/danpoltawski/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

7 years agoMerge branch 'MDL-40922_master' of https://github.com/markn86/moodle
Dan Poltawski [Mon, 6 Jan 2014 07:11:23 +0000 (15:11 +0800)]
Merge branch 'MDL-40922_master' of https://github.com/markn86/moodle

7 years agoMerge branch 'w01_MDL-36721_m27_passlog' of https://github.com/skodak/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

7 years agoRevert "MDL-43349 cache: is_ready now checks are_requirements_met by default"
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.

7 years agoMerge branch '43349-27' of git://github.com/samhemelryk/moodle
Dan Poltawski [Mon, 6 Jan 2014 06:21:44 +0000 (14:21 +0800)]
Merge branch '43349-27' of git://github.com/samhemelryk/moodle

7 years agoMDL-42883 Administration: Check sessionkey before taking action on user profile fields
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

7 years agoMDL-41690 course: remove use of deprecated functions
Dan Poltawski [Tue, 17 Dec 2013 09:13:53 +0000 (17:13 +0800)]
MDL-41690 course: remove use of deprecated functions

7 years agoMDL-41690 cm_info: deprecate various properties
Dan Poltawski [Tue, 17 Dec 2013 08:42:18 +0000 (16:42 +0800)]
MDL-41690 cm_info: deprecate various properties

7 years agoMerge branch 'MDL-43408-master' of https://github.com/tonyjbutler/moodle
Dan Poltawski [Mon, 6 Jan 2014 02:06:11 +0000 (10:06 +0800)]
Merge branch 'MDL-43408-master' of https://github.com/tonyjbutler/moodle

7 years agoMerge branch 'w01_MDL-43527_m27_safemode' of https://github.com/skodak/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

7 years agoMerge branch 'w01_MDL-43528_m27_magic' 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

7 years agoMerge branch 'MDL-31050_rss' of https://github.com/andyjdavis/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

7 years agoMerge branch 'wip-mdl-18770' of https://github.com/rajeshtaneja/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

7 years agoMerge branch 'MDL-40054_master' of https://github.com/markn86/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

7 years agoMerge branch 'MDL-40551_master' of https://github.com/totara/openbadges
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

7 years agoMerge branch 'MDL-35973_redirect' of https://github.com/andyjdavis/moodle
Sam Hemelryk [Sun, 5 Jan 2014 22:28:34 +0000 (11:28 +1300)]
Merge branch 'MDL-35973_redirect' of https://github.com/andyjdavis/moodle

7 years agoMerge branch 'MDL-43281-master' of git://github.com/andrewnicols/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

7 years agoMerge branch 'MDL-42212-master' of git://github.com/FMCorz/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

7 years agoMerge branch 'MDL-42801-master' of git://github.com/andrewnicols/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

7 years agoMerge branch 'MDL-36334-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

7 years agoMDL-43238 mod_assign: removed incorrect validation
Sam Hemelryk [Sun, 5 Jan 2014 20:51:38 +0000 (09:51 +1300)]
MDL-43238 mod_assign: removed incorrect validation

7 years agoMerge branch 'w01_MDL-43196_m27_signupfiles' of https://github.com/skodak/moodle
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

7 years agoMDL-18770 mod_assign: Set gradetype to GRADE_TYPE_NONE if feedback not enabled
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

7 years agoMDL-43238 events: Added event other information in event php doc block
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

7 years agoMDL-40054 mod_lesson: removed 'update email essay grade' add_to_log call
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.

7 years agoMDL-40054 mod_lesson: replaced 'end' add_to_log call with an event
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

7 years agoMDL-40054 mod_lesson: replaced 'start' 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

7 years agoMDL-40054 mod_lesson: replaced 'view highscores' 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

7 years agoMDL-40054 mod_lesson: replaced 'update 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

7 years agoMDL-40054 mod_lesson: replaced 'grade view' 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

7 years agoMDL-40054 mod_lesson: replaced 'view all' 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

7 years agoMDL-40054 mod_lesson: replaced 'view' 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

7 years agoMDL-43521 block_admin_bookmarks: Site admin node is of type TYPE_SITE_ADMIN
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

7 years agoMDL-43373 core_enrol: Display enrolments dimmed if outside of start or end times
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

7 years agoMDL-43408 gradereport_grader: Display users with expired enrolments as inactive in...
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

7 years agoMDL-31050 rss: removed some unused function parameters and removed some low value...
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

7 years agoMDL-43528 remove all traces of magic quotes hacking from moodle core
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

7 years agoMDL-43527 eliminate last references to safe_mode
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...

7 years agoMDL-43349 cache: is_ready now checks are_requirements_met by default
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

7 years agoMDL-43349 cache: init now checks store requirements are met
Sam Hemelryk [Wed, 11 Dec 2013 21:51:33 +0000 (10:51 +1300)]
MDL-43349 cache: init now checks store requirements are met

7 years agoMDL-40922 mod_folder: replaced the 'edit' add_to_log call with an event
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

7 years agoMDL-40922 mod_folder: replaced the 'view' and 'view all' add_to_log calls with events
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

7 years agoMDL-36334 mod_scorm: Remove gallery-sm-treeview
Andrew Nicols [Mon, 30 Dec 2013 02:47:55 +0000 (10:47 +0800)]
MDL-36334 mod_scorm: Remove gallery-sm-treeview

This has now been incorporated into core.

7 years agoMDL-36334 Libraries: Add version gallery-2013.10.02-20-26 of specified gallery modules
Andrew Nicols [Mon, 30 Dec 2013 02:43:48 +0000 (10:43 +0800)]
MDL-36334 Libraries: Add version gallery-2013.10.02-20-26 of specified gallery modules

We currently only include:
* gallery-sm-treeview*

7 years agoMDL-36334 JavaScript: Enable access to the gallery
Andrew Nicols [Mon, 30 Dec 2013 02:44:16 +0000 (10:44 +0800)]
MDL-36334 JavaScript: Enable access to the gallery

7 years agoMDL-35973 lib: added a page title to redirect() and added 2 seconds to the page redir...
Andrew Davis [Mon, 30 Dec 2013 10:26:24 +0000 (18:26 +0800)]
MDL-35973 lib: added a page title to redirect() and added 2 seconds to the page redirection when posting in a forum

7 years agoMDL-43281 Blocks: Retrieve a newly created block after creating it
Andrew Nicols [Mon, 30 Dec 2013 06:09:37 +0000 (14:09 +0800)]
MDL-43281 Blocks: Retrieve a newly created block after creating it

Although we were previously creating the DOM markup for a block region if
it did not exist, we were not making use of it.

This change ensures that we make use of that block region as part of the
blocks code.

7 years agoMDL-40379 Files Prevent mobile network providers from modifying content.
Matteo Scaramuccia [Sat, 28 Dec 2013 11:00:18 +0000 (12:00 +0100)]
MDL-40379 Files Prevent mobile network providers from modifying content.

7 years agoMDL-42801 JavaScript: Fix dndupload to match actual style
Andrew Nicols [Wed, 6 Nov 2013 15:52:04 +0000 (23:52 +0800)]
MDL-42801 JavaScript: Fix dndupload to match actual style

7 years agoMDL-36721 do not store passwords in config logs
Petr Škoda [Mon, 9 Dec 2013 01:11:02 +0000 (09:11 +0800)]
MDL-36721 do not store passwords in config logs

7 years agoMDL-43196 do not load file management for guests and when not managing files
Petr Škoda [Mon, 23 Dec 2013 07:24:34 +0000 (15:24 +0800)]
MDL-43196 do not load file management for guests and when not managing files

7 years agoMDL-43402 let's try to remove @ silencing from gzip related code
Petr Škoda [Mon, 23 Dec 2013 01:50:04 +0000 (09:50 +0800)]
MDL-43402 let's try to remove @ silencing from gzip related code

If anything goes wrong on multiple production sites we can just
revert this commit, that is why it is separete from the rest
of zlib stuff.

7 years agoMDL-43402 remove all zlib detection code
Petr Škoda [Sun, 22 Dec 2013 09:19:57 +0000 (17:19 +0800)]
MDL-43402 remove all zlib detection code

Zlib extension is now required.

7 years agoweekly release 2.7dev
Sam Hemelryk [Tue, 24 Dec 2013 04:17:29 +0000 (17:17 +1300)]
weekly release 2.7dev

7 years agoMerge branch 'install_master' of git://git.moodle.org/moodle-install
Sam Hemelryk [Tue, 24 Dec 2013 04:17:26 +0000 (17:17 +1300)]
Merge branch 'install_master' of git://git.moodle.org/moodle-install

7 years agoMerge branch 'wip-MDL-41788_master_3' of git://github.com/gjb2048/moodle
Sam Hemelryk [Mon, 23 Dec 2013 23:52:22 +0000 (12:52 +1300)]
Merge branch 'wip-MDL-41788_master_3' of git://github.com/gjb2048/moodle

7 years agoMerge branch 'w52_MDL-43314_m27_floats' of https://github.com/skodak/moodle
Eloy Lafuente (stronk7) [Mon, 23 Dec 2013 23:20:24 +0000 (00:20 +0100)]
Merge branch 'w52_MDL-43314_m27_floats' of https://github.com/skodak/moodle

7 years agoMerge branch 'MDL-43243-master' of git://github.com/andrewnicols/moodle
Sam Hemelryk [Mon, 23 Dec 2013 22:56:01 +0000 (11:56 +1300)]
Merge branch 'MDL-43243-master' of git://github.com/andrewnicols/moodle

7 years agoMerge branch 'MDL-41246-master' of git://github.com/StudiUM/moodle
Sam Hemelryk [Mon, 23 Dec 2013 22:41:48 +0000 (11:41 +1300)]
Merge branch 'MDL-41246-master' of git://github.com/StudiUM/moodle

7 years agoMerge branch 'MDL-43438-master' of git://github.com/FMCorz/moodle
Sam Hemelryk [Mon, 23 Dec 2013 22:23:15 +0000 (11:23 +1300)]
Merge branch 'MDL-43438-master' of git://github.com/FMCorz/moodle

7 years agoMerge branch 'MDL-43250-master' of git://github.com/damyon/moodle
Sam Hemelryk [Mon, 23 Dec 2013 21:36:22 +0000 (10:36 +1300)]
Merge branch 'MDL-43250-master' of git://github.com/damyon/moodle

7 years agoMerge branch 'MDL-43410-master' of git://github.com/andrewnicols/moodle
Sam Hemelryk [Mon, 23 Dec 2013 20:13:05 +0000 (09:13 +1300)]
Merge branch 'MDL-43410-master' of git://github.com/andrewnicols/moodle

7 years agoAutomatically generated installer lang files
AMOS bot [Mon, 23 Dec 2013 12:40:09 +0000 (12:40 +0000)]
Automatically generated installer lang files

7 years agoAutomatically generated installer lang files
AMOS bot [Mon, 23 Dec 2013 12:26:25 +0000 (12:26 +0000)]
Automatically generated installer lang files

7 years agoMDL-43490 JavaScript: Remove deprecated yui2_lib from 2.7
Andrew Nicols [Mon, 23 Dec 2013 07:35:10 +0000 (15:35 +0800)]
MDL-43490 JavaScript: Remove deprecated yui2_lib from 2.7

This patch removes the deprecated yui2_lib from Moodle 2.7. It was
deprecated in Moodle 2.4.

7 years agoMerge branch 'MDL-35032-master' of git://github.com/FMCorz/moodle
Sam Hemelryk [Mon, 23 Dec 2013 02:58:04 +0000 (15:58 +1300)]
Merge branch 'MDL-35032-master' of git://github.com/FMCorz/moodle

7 years agoMDL-43394 behat: Fix checkbox action
Aaron Barnes [Mon, 16 Dec 2013 04:08:08 +0000 (17:08 +1300)]
MDL-43394 behat: Fix checkbox action

7 years agoMerge branch 'MDL-30195-master' of git://github.com/FMCorz/moodle
Sam Hemelryk [Mon, 23 Dec 2013 01:34:35 +0000 (14:34 +1300)]
Merge branch 'MDL-30195-master' of git://github.com/FMCorz/moodle

7 years agoMerge branch 'w52_MDL-43367_m27_contextpath' of https://github.com/skodak/moodle
Sam Hemelryk [Mon, 23 Dec 2013 01:31:58 +0000 (14:31 +1300)]
Merge branch 'w52_MDL-43367_m27_contextpath' of https://github.com/skodak/moodle

7 years agoMDL-43293 Events: Added unit test for comment events
Rajesh Taneja [Tue, 17 Dec 2013 07:08:30 +0000 (15:08 +0800)]
MDL-43293 Events: Added unit test for comment events

7 years agoMDL-43293 Events: Added comments event in modules supporting comments
Rajesh Taneja [Mon, 16 Dec 2013 06:23:06 +0000 (14:23 +0800)]
MDL-43293 Events: Added comments event in modules supporting comments

7 years agoMDL-43323 JavaScript: Lazily load exception dependencies for tooltip
Andrew Nicols [Wed, 11 Dec 2013 02:01:49 +0000 (10:01 +0800)]
MDL-43323 JavaScript: Lazily load exception dependencies for tooltip

Only load the exception-related dependencies for tooltip when required. In
normal situations they should not be required at all.

7 years agoMerge branch 'MDL-43318-master' of git://github.com/damyon/moodle
Eloy Lafuente (stronk7) [Sun, 22 Dec 2013 23:39:41 +0000 (00:39 +0100)]
Merge branch 'MDL-43318-master' of git://github.com/damyon/moodle

7 years agoMDL-34182 js: fixed typo in ajaxException use
Sam Hemelryk [Sun, 22 Dec 2013 20:43:00 +0000 (09:43 +1300)]
MDL-34182 js: fixed typo in ajaxException use

7 years agoMerge branch 'MDL-34182-master' of git://github.com/andrewnicols/moodle
Sam Hemelryk [Sun, 22 Dec 2013 20:54:44 +0000 (09:54 +1300)]
Merge branch 'MDL-34182-master' of git://github.com/andrewnicols/moodle

7 years agoMerge branch 'MDL-43325-master' of git://github.com/andrewnicols/moodle
Sam Hemelryk [Sun, 22 Dec 2013 20:54:26 +0000 (09:54 +1300)]
Merge branch 'MDL-43325-master' of git://github.com/andrewnicols/moodle

Conflicts:
lib/yui/build/moodle-core-notification-dialogue/moodle-core-notification-dialogue-min.js

7 years agoMDL-43314 make float serialize consistent on all systems
Petr Škoda [Mon, 16 Dec 2013 01:18:27 +0000 (09:18 +0800)]
MDL-43314 make float serialize consistent on all systems

This should resolve problems with plugin version change detection.

7 years agoMDL-43367 stop returning of bogus context children when path unknown
Petr Škoda [Mon, 16 Dec 2013 01:44:04 +0000 (09:44 +0800)]
MDL-43367 stop returning of bogus context children when path unknown

This also prevents deletion of system context.

7 years agoMDL-43448 Links to the gradebook not fixed on restore.
Tim Hunt [Wed, 18 Dec 2013 19:02:39 +0000 (19:02 +0000)]
MDL-43448 Links to the gradebook not fixed on restore.

Note we can only fix certain generic links, we can't handle ones like
/grade/report/{reportname}/index.php, but fortunately, we were only
using the generic ones.

I added a couple of other likely things too (badges and participants
list).