David Monllao [Mon, 16 Dec 2013 08:04:01 +0000 (16:04 +0800)]
MDL-43330 behat: behat-extension version changed
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
Jason Fowler [Wed, 11 Dec 2013 08:03:27 +0000 (16:03 +0800)]
MDL-37679 Course: Adding section name to page title
Sam Hemelryk [Tue, 17 Dec 2013 03:32:35 +0000 (16:32 +1300)]
Merge branch 'MDL-43259-master' of git://github.com/andrewnicols/moodle
Conflicts:
lib/upgrade.txt
Sam Hemelryk [Tue, 17 Dec 2013 03:20:34 +0000 (16:20 +1300)]
Merge branch 'MDL-38832-master' of git://github.com/danpoltawski/moodle
Adrian Greeve [Thu, 12 Dec 2013 01:46:21 +0000 (09:46 +0800)]
MDL-43295 mod_assign: Removed wrongly used format_text call in online text submission.
Marina Glancy [Tue, 17 Dec 2013 00:23:43 +0000 (11:23 +1100)]
Merge branch 'MDL-41075-master-3' of git://github.com/mouneyrac/moodle
Sam Hemelryk [Mon, 16 Dec 2013 20:31:19 +0000 (09:31 +1300)]
Merge branch 'MDL-39725_analyze' of https://github.com/mr-russ/moodle
Conflicts:
lib/dml/moodle_database.php
Sam Hemelryk [Mon, 16 Dec 2013 19:54:33 +0000 (08:54 +1300)]
Merge branch 'MDL-25473-master' of git://github.com/phalacee/moodle
Sam Hemelryk [Mon, 16 Dec 2013 19:48:08 +0000 (08:48 +1300)]
Merge branch 'MDL-34321-master' of git://github.com/phalacee/moodle
Sam Hemelryk [Mon, 16 Dec 2013 19:45:05 +0000 (08:45 +1300)]
Merge branch 'MDL-36984-master' of git://github.com/phalacee/moodle
Sam Hemelryk [Mon, 16 Dec 2013 19:25:08 +0000 (08:25 +1300)]
Merge branch 'w51_MDL-43268_m27_filternotice' of https://github.com/skodak/moodle
Frederic Massart [Mon, 16 Dec 2013 10:02:10 +0000 (11:02 +0100)]
MDL-30195 portfolio_googledocs: Allow export of rich HTML
Andrew Nicols [Mon, 16 Dec 2013 08:59:11 +0000 (16:59 +0800)]
MDL-43322 JavaScript: Correct cache-base entry in base rollup
Jerome Mouneyrac [Mon, 16 Dec 2013 04:07:33 +0000 (12:07 +0800)]
MDL-41075 Remove "Choose..." option from participants page.
Andrew Nicols [Wed, 11 Dec 2013 01:34:36 +0000 (09:34 +0800)]
MDL-43322 JavaScript: Include moodle-core-popuphelp in the mcore rollup
moodle-core-popuphelp is used on every page in Moodle, so it should be
included in the rollup by default to save a request each time.
Sam Hemelryk [Mon, 16 Dec 2013 03:03:09 +0000 (16:03 +1300)]
Merge branch 'MDL-43240-master' of git://github.com/andrewnicols/moodle
Damyon Wiese [Thu, 12 Dec 2013 05:29:41 +0000 (13:29 +0800)]
MDL-43250 Assign: separate groups mode fix
When in separate groups mode, only get graders in a group that is in the course module grouping.
Sam Hemelryk [Mon, 16 Dec 2013 02:46:56 +0000 (15:46 +1300)]
Merge branch 'MDL-34432-master' of git://github.com/damyon/moodle
Sam Hemelryk [Mon, 16 Dec 2013 02:44:15 +0000 (15:44 +1300)]
Merge branch 'wip-mdl-21180' of https://github.com/rajeshtaneja/moodle
Sam Hemelryk [Mon, 16 Dec 2013 02:40:40 +0000 (15:40 +1300)]
Merge branch 'MDL-43062-master-nomerge' of git://github.com/mouneyrac/moodle
Conflicts:
theme/bootstrapbase/style/moodle.css
Damyon Wiese [Tue, 10 Dec 2013 03:46:33 +0000 (11:46 +0800)]
MDL-34432: Allow comment inline (stripping embedded images version)
Rajesh Taneja [Thu, 12 Dec 2013 01:53:48 +0000 (09:53 +0800)]
MDL-21180 Gradebook: Consistent handling of change in aggregation
Change from/to GRADE_AGGREGATE_WEIGHTED_MEAN and GRADE_AGGREGATE_EXTRACREDIT_MEAN was only
handled prior to this patch. GRADE_AGGREGATE_SUM and GRADE_AGGREGATE_WEIGHTED_MEAN2 also
behave similar and should be handled same way
Marina Glancy [Mon, 16 Dec 2013 01:27:38 +0000 (12:27 +1100)]
Merge branch 'MDL-37972-master' of git://github.com/phalacee/moodle
Sam Hemelryk [Mon, 16 Dec 2013 01:10:15 +0000 (14:10 +1300)]
Merge branch 'wip-MDL-43348_master' of git://github.com/gjb2048/moodle
Sam Hemelryk [Mon, 16 Dec 2013 00:52:16 +0000 (13:52 +1300)]
Merge branch 'MDL-40096-master' of git://github.com/damyon/moodle
Sam Hemelryk [Mon, 16 Dec 2013 00:47:57 +0000 (13:47 +1300)]
Merge branch 'MDL-42965_master' of https://github.com/totara/openbadges
Sam Hemelryk [Sun, 15 Dec 2013 22:31:29 +0000 (11:31 +1300)]
Merge branch 'MDL-40436-master' of git://github.com/FMCorz/moodle
Sam Hemelryk [Sun, 15 Dec 2013 22:18:02 +0000 (11:18 +1300)]
Merge branch 'w51_MDL-42931_m27_env27' of https://github.com/skodak/moodle
Sam Hemelryk [Sun, 15 Dec 2013 22:11:38 +0000 (11:11 +1300)]
Merge branch 'MDL-42085-master' of git://github.com/mouneyrac/moodle
Sam Hemelryk [Sun, 15 Dec 2013 20:46:47 +0000 (09:46 +1300)]
Merge branch 'MDL-43326-master' of git://github.com/damyon/moodle
Frederic Massart [Fri, 13 Dec 2013 09:20:34 +0000 (10:20 +0100)]
MDL-35032 mod_book: 1.9 backup restore convertis files to book area
