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
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
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.
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*
Andrew Nicols [Mon, 30 Dec 2013 02:44:16 +0000 (10:44 +0800)]
MDL-36334 JavaScript: Enable access to the gallery
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
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.
Andrew Nicols [Wed, 6 Nov 2013 15:52:04 +0000 (23:52 +0800)]
MDL-42801 JavaScript: Fix dndupload to match actual style
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
Sam Hemelryk [Tue, 24 Dec 2013 04:17:29 +0000 (17:17 +1300)]
weekly release 2.7dev
Sam Hemelryk [Tue, 24 Dec 2013 04:17:26 +0000 (17:17 +1300)]
Merge branch 'install_master' of git://git.moodle.org/moodle-install
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
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
Sam Hemelryk [Mon, 23 Dec 2013 22:56:01 +0000 (11:56 +1300)]
Merge branch 'MDL-43243-master' of git://github.com/andrewnicols/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
Sam Hemelryk [Mon, 23 Dec 2013 22:23:15 +0000 (11:23 +1300)]
Merge branch 'MDL-43438-master' of git://github.com/FMCorz/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
Sam Hemelryk [Mon, 23 Dec 2013 20:13:05 +0000 (09:13 +1300)]
Merge branch 'MDL-43410-master' of git://github.com/andrewnicols/moodle
AMOS bot [Mon, 23 Dec 2013 12:40:09 +0000 (12:40 +0000)]
Automatically generated installer lang files
AMOS bot [Mon, 23 Dec 2013 12:26:25 +0000 (12:26 +0000)]
Automatically generated installer lang files
Sam Hemelryk [Mon, 23 Dec 2013 02:58:04 +0000 (15:58 +1300)]
Merge branch 'MDL-35032-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
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
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
Sam Hemelryk [Sun, 22 Dec 2013 20:43:00 +0000 (09:43 +1300)]
MDL-34182 js: fixed typo in ajaxException use
Sam Hemelryk [Sun, 22 Dec 2013 20:54:44 +0000 (09:54 +1300)]
Merge branch 'MDL-34182-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
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.
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.
Damyon Wiese [Fri, 20 Dec 2013 03:56:58 +0000 (11:56 +0800)]
weekly release 2.7dev
Damyon Wiese [Fri, 20 Dec 2013 03:56:54 +0000 (11:56 +0800)]
Merge branch 'install_master' of git://git.moodle.org/moodle-install
Damyon Wiese [Wed, 18 Dec 2013 08:54:40 +0000 (16:54 +0800)]
MDL-43318 Assign: Fix bug when editing previous attempt feedback
Eloy Lafuente (stronk7) [Fri, 20 Dec 2013 02:40:58 +0000 (03:40 +0100)]
MDL-42425 assign: keep already bumped version.
Eloy Lafuente (stronk7) [Fri, 20 Dec 2013 02:39:14 +0000 (03:39 +0100)]
Revert "MDL-42425 modify mod_assign_save_grade to process advanced grading data"
This reverts commit
29932b211287985c8e3235e52fc78782528309a2.
Conflicts:
mod/assign/upgrade.txt
Eloy Lafuente (stronk7) [Fri, 20 Dec 2013 01:58:12 +0000 (02:58 +0100)]
Merge branch 'MDL-43404_master-move-fails-to-scenarios' of git://github.com/dmonllao/moodle
Gareth J Barnard [Thu, 19 Dec 2013 12:08:50 +0000 (12:08 +0000)]
MDL-41788 theme_bootstrapbase: Custom menus - sub-menus breaking.
David Monllao [Thu, 19 Dec 2013 07:48:03 +0000 (15:48 +0800)]
MDL-43404 behat: Avoid failures at framework level as much as possible
- Move them to i_look_for_exceptions() so they will be
thrown at a step (scenario) level.
- Accept alerts only when they are detected to avoid
all the following scenarios to be failing; they would
continue executing, but they will all fail if the alert
is still there
- Add a step to avoid add_scorm.feature to fail
- Refine the UnknownError catch
David Monllao [Thu, 19 Dec 2013 05:47:46 +0000 (13:47 +0800)]
MDL-43213 behat: Moving permissions setting before any use of them
Petr Skoda [Thu, 19 Dec 2013 04:29:05 +0000 (12:29 +0800)]
MDL-43213 fix init regression and remove $checkphp parameter
Sam Hemelryk [Thu, 19 Dec 2013 03:12:46 +0000 (16:12 +1300)]
Merge branch 'MDL-42965_master' of https://github.com/totara/openbadges
Dan Poltawski [Thu, 19 Dec 2013 02:56:41 +0000 (10:56 +0800)]
Merge branch 'wip-mdl-43437' of https://github.com/rajeshtaneja/moodle
Damyon Wiese [Thu, 19 Dec 2013 01:40:14 +0000 (09:40 +0800)]
MDL-34432 Assign: Set up the commentinline form element properly.
Eloy Lafuente (stronk7) [Thu, 19 Dec 2013 01:13:05 +0000 (02:13 +0100)]
Revert "MDL-43306 restore: fix grade item sortorder restoration"
This reverts commit
e238b2cb928a1024b766032549168d04062a970c.
AMOS bot [Thu, 19 Dec 2013 00:44:14 +0000 (00:44 +0000)]
Automatically generated installer lang files
Eloy Lafuente (stronk7) [Thu, 19 Dec 2013 00:37:57 +0000 (01:37 +0100)]
Merge branch 'MDL-42425' of https://github.com/Lightwork-Marking/moodle
Conflicts:
mod/assign/upgrade.txt
Yuliya Bozhko [Wed, 18 Dec 2013 21:26:44 +0000 (10:26 +1300)]
MDL-42965 badges: Fix empty string comparison for Oracle
Paul Charsley [Wed, 18 Dec 2013 20:39:22 +0000 (09:39 +1300)]
MDL-42425 modify mod_assign_save_grade to process advanced grading data
Jean-Philippe Gaudreau [Wed, 11 Dec 2013 15:47:22 +0000 (10:47 -0500)]
MDL-41246 cache: Fix PHP notice of non well formed numeric values for the memcache store
Frederic Massart [Wed, 18 Dec 2013 08:13:47 +0000 (09:13 +0100)]
MDL-43438 mod_assignment: Prevent double inclusion of plugin files
David Monllao [Wed, 18 Dec 2013 08:02:02 +0000 (16:02 +0800)]
MDL-43235 behat: Remove notice about undeclared var
Dan Poltawski [Wed, 18 Dec 2013 06:40:18 +0000 (14:40 +0800)]
Merge branch 'MDL-41198-master' of https://github.com/mr-russ/moodle
Rajesh Taneja [Wed, 18 Dec 2013 05:56:44 +0000 (13:56 +0800)]
MDL-43437 wiki: Fixed unit test for page_version_deleted event
Russell Smith [Wed, 18 Dec 2013 05:48:41 +0000 (16:48 +1100)]
MDL-41198 lib: Add comment about the changes to srand on adodb
Russell Smith [Fri, 22 Nov 2013 00:34:23 +0000 (11:34 +1100)]
MDL-41198 lib: Allow PHP to generate random seed on script start
Most srand instances are removed to allow PHP to do the work.
srand was left for group randomization due to the method used.
Russell Smith [Thu, 31 Oct 2013 22:36:05 +0000 (09:36 +1100)]
MDL-41198 lib: Allow PHP to generate random seed on script start
All mt_srand instances are removed to allow PHP to do the work.
Andrew Nicols [Tue, 17 Dec 2013 00:00:23 +0000 (08:00 +0800)]
MDL-43410 JavaScript: Stop event propagation when opening the action menu
In certain situations, the click event is propagated through to the
hideIfOutside and immediately closes the menu.
This happens when blocks are dock for example.
Sam Hemelryk [Wed, 18 Dec 2013 03:26:35 +0000 (16:26 +1300)]
Merge branch 'MDL-43241-master' of git://github.com/andrewnicols/moodle
Andrew Nicols [Fri, 6 Dec 2013 08:51:46 +0000 (16:51 +0800)]
MDL-43241 JavaScript: Deprecate findChildNodes
Eloy Lafuente (stronk7) [Wed, 18 Dec 2013 01:24:08 +0000 (02:24 +0100)]
Merge branch 'MDL-43404_master' of git://github.com/dmonllao/moodle
Eloy Lafuente (stronk7) [Wed, 18 Dec 2013 01:23:08 +0000 (02:23 +0100)]
Merge branch 'MDL-41292-master' of git://github.com/mr-russ/moodle
Eloy Lafuente (stronk7) [Tue, 17 Dec 2013 23:13:15 +0000 (00:13 +0100)]
Merge branch 'MDL-40920_master' of https://github.com/markn86/moodle
Sam Hemelryk [Tue, 17 Dec 2013 22:19:34 +0000 (11:19 +1300)]
Merge branch 'MDL-43235_master' of git://github.com/dmonllao/moodle
Eloy Lafuente (stronk7) [Tue, 17 Dec 2013 21:58:51 +0000 (22:58 +0100)]
Merge branch 'MDL-43025-master' of git://github.com/damyon/moodle
Sam Hemelryk [Tue, 17 Dec 2013 21:52:41 +0000 (10:52 +1300)]
Merge branch 'MDL-43355_master' of git://github.com/dmonllao/moodle
Eloy Lafuente (stronk7) [Tue, 17 Dec 2013 21:33:51 +0000 (22:33 +0100)]
Merge branch 'wip-mdl-43311' of https://github.com/rajeshtaneja/moodle
Sam Hemelryk [Tue, 17 Dec 2013 21:30:30 +0000 (10:30 +1300)]
Merge branch 'w51_MDL-43213_m27_simplebehat' of https://github.com/skodak/moodle
Sam Hemelryk [Tue, 17 Dec 2013 21:08:33 +0000 (10:08 +1300)]
Merge branch 'MDL-41359-master' of https://github.com/mr-russ/moodle
Sam Hemelryk [Tue, 17 Dec 2013 20:59:05 +0000 (09:59 +1300)]
Merge branch 'MDL-43074-master' of git://github.com/damyon/moodle
Sam Hemelryk [Tue, 17 Dec 2013 20:55:04 +0000 (09:55 +1300)]
Merge branch 'MDL-43272-master' of git://github.com/andrewnicols/moodle
Sam Hemelryk [Tue, 17 Dec 2013 20:53:02 +0000 (09:53 +1300)]
Merge branch 'MDL-43234-master' of git://github.com/andrewnicols/moodle
Conflicts:
lib/yui/build/moodle-core-notification-dialogue/moodle-core-notification-dialogue-min.js
Sam Hemelryk [Tue, 17 Dec 2013 20:21:50 +0000 (09:21 +1300)]
Merge branch 'MDL-38698-master' of git://github.com/FMCorz/moodle
David Monllao [Tue, 17 Dec 2013 08:30:32 +0000 (16:30 +0800)]
MDL-43404 behat: Form change checker disabled when running behat
Eloy Lafuente (stronk7) [Tue, 17 Dec 2013 09:29:25 +0000 (10:29 +0100)]
Merge branch 'MDL-43306-master' of git://github.com/danpoltawski/moodle
David Monllao [Tue, 17 Dec 2013 08:29:56 +0000 (16:29 +0800)]
MDL-43404 behat: Removing auto accept_alert
Frederic Massart [Tue, 17 Dec 2013 06:03:02 +0000 (07:03 +0100)]
MDL-38698 filter_urltolink: Remove performance test in Unit Test
Frederic Massart [Thu, 12 Dec 2013 10:31:51 +0000 (11:31 +0100)]
MDL-38698 filter_urltolink: Do not link the URL property of CSS
Marina Glancy [Tue, 17 Dec 2013 05:37:19 +0000 (16:37 +1100)]
Merge branch 'MDL-37679-master' of git://github.com/phalacee/moodle
Marina Glancy [Tue, 17 Dec 2013 05:35:31 +0000 (16:35 +1100)]
Merge branch 'wip-MDL-43295-master' of git://github.com/abgreeve/moodle
