Eric Merrill [Mon, 30 Sep 2013 23:52:30 +0000 (19:52 -0400)]
MDL-25176 forum Redirects for new discussions shouldn't use SESSION
Unset the session->fromdiscussion var, because we know that the correct
path will be computed later.
Marina Glancy [Fri, 27 Sep 2013 04:23:44 +0000 (14:23 +1000)]
weekly release 2.6dev
Marina Glancy [Fri, 27 Sep 2013 04:21:20 +0000 (14:21 +1000)]
fix permissions
Marina Glancy [Fri, 27 Sep 2013 04:17:23 +0000 (14:17 +1000)]
ie9 svg compatibility fixes
Mary Evans [Thu, 26 Sep 2013 23:43:44 +0000 (01:43 +0200)]
MDL-35217 afterburner: applying orientations
Sam Hemelryk [Thu, 26 Sep 2013 23:32:05 +0000 (11:32 +1200)]
Merge branch 'master_MDL-39910' of https://github.com/danmarsden/moodle
Conflicts:
mod/scorm/db/upgrade.php
Dan Marsden [Thu, 26 Sep 2013 09:03:00 +0000 (21:03 +1200)]
MDL-39910 SCORM: set correct site level defaults.
Dan Marsden [Thu, 26 Sep 2013 09:03:00 +0000 (21:03 +1200)]
MDL-39910 SCORM: set correct site level defaults.
Marina Glancy [Thu, 26 Sep 2013 02:29:03 +0000 (12:29 +1000)]
Revert "Merge branch 'MDL-41912-master' of git://github.com/damyon/moodle"
This reverts commit
093a6fe77fc39b06c804fbe4bfcac9834a52c966, reversing
changes made to
88a4cb473439f5a2875260368b92fac1bb808c12.
Sam Hemelryk [Wed, 25 Sep 2013 23:56:00 +0000 (11:56 +1200)]
Revert "MDL-39871 Blocks,Themes: Swap block regions in RTL mode (using pre-defined array)"
This reverts commit
e89dfdbce62ad5be906cb2d822fa0f746cf6afd6.
Sam Hemelryk [Wed, 25 Sep 2013 22:13:01 +0000 (10:13 +1200)]
Merge branch 'master_MDL-39910' of https://github.com/mayankgupta/moodle
Eloy Lafuente (stronk7) [Wed, 25 Sep 2013 21:48:42 +0000 (23:48 +0200)]
Merge branch 'MDL-40811-master-behat' of https://github.com/andrewnicols/moodle
Sam Hemelryk [Wed, 25 Sep 2013 21:12:44 +0000 (09:12 +1200)]
Revert "MDL-39871 output: improved block manipulation inheritance"
This reverts commit
eeb08203dce0131d3988a3707fbbf8563cd4bd30.
Andrew Nicols [Wed, 25 Sep 2013 17:09:54 +0000 (18:09 +0100)]
MDL-40811 JavaScript: Cast activityid to string when checking resources to show/hide
Mayank Gupta [Wed, 25 Sep 2013 11:11:33 +0000 (16:41 +0530)]
MDL-39910 mod_scorm: fix enable/disable navigation buttons
Eloy Lafuente (stronk7) [Wed, 25 Sep 2013 11:36:40 +0000 (13:36 +0200)]
Merge branch 'int_uninstall' of https://github.com/skodak/moodle
Mayank Gupta [Wed, 25 Sep 2013 11:11:33 +0000 (16:41 +0530)]
MDL-39910 mod_scorm: fix enable/disable navigation buttons
Eloy Lafuente (stronk7) [Wed, 25 Sep 2013 09:41:45 +0000 (11:41 +0200)]
Merge branch 'w39_MDL-41208_m26_yui312' of https://github.com/skodak/moodle
Petr Škoda [Wed, 25 Sep 2013 08:52:23 +0000 (10:52 +0200)]
MDL-41437 inform developers that version column was removed from module and block tables
Petr Škoda [Wed, 25 Sep 2013 08:50:00 +0000 (10:50 +0200)]
MDL-41437 fix some more forgotten module.version's
Petr Škoda [Wed, 25 Sep 2013 08:27:09 +0000 (10:27 +0200)]
MDL-41437 refactor and cleanup module uninstall support
Petr Škoda [Wed, 25 Sep 2013 08:12:11 +0000 (10:12 +0200)]
MDL-41437 implement new block, enrol and course format pluginfo uninstall methods
Petr Škoda [Wed, 25 Sep 2013 08:03:06 +0000 (10:03 +0200)]
MDL-43437 fix course format disabling
Petr Škoda [Wed, 25 Sep 2013 07:57:19 +0000 (09:57 +0200)]
MDL-41437 implement plugininfo_quiz necessary for quiz report uninstall
Petr Škoda [Wed, 25 Sep 2013 07:39:36 +0000 (09:39 +0200)]
MDL-41437 fix non-functional message processor uninstall
Dan Marsden [Wed, 25 Sep 2013 07:25:37 +0000 (19:25 +1200)]
MDL-39910 SCORM: hide toggle button when course structure disabled and fix upgrade of old settings
Petr Škoda [Wed, 25 Sep 2013 07:14:36 +0000 (09:14 +0200)]
MDL-41208 fix more invalid @VERSION@
David Monllao [Wed, 25 Sep 2013 07:06:35 +0000 (15:06 +0800)]
MDL-41421 tool_generator: Fixing help text
- p.e. replaced by e.g. which sounds more English-friendly
- Adding an extra line break as markdown don't like
p and li together
Petr Škoda [Wed, 25 Sep 2013 06:41:33 +0000 (08:41 +0200)]
MDL-41437 fix and cleanup filter uninstall
Sam Hemelryk [Wed, 25 Sep 2013 04:27:09 +0000 (16:27 +1200)]
Merge branch 'MDL-40848_master' of git://github.com/totara/openbadges
Conflicts:
theme/base/style/core.css
theme/bootstrapbase/less/moodle/core.less
theme/bootstrapbase/style/moodle.css
Marina Glancy [Wed, 25 Sep 2013 02:53:09 +0000 (12:53 +1000)]
Merge branch 'MDL-41912-master' of git://github.com/damyon/moodle
Conflicts:
lib/editor/atto/styles.css
Marina Glancy [Wed, 25 Sep 2013 02:52:39 +0000 (12:52 +1000)]
Merge branch 'MDL-41778_master' of https://github.com/nitzo/moodle
Marina Glancy [Wed, 25 Sep 2013 02:21:46 +0000 (12:21 +1000)]
Merge branch 'MDL-41870-master' of git://github.com/damyon/moodle
Marina Glancy [Wed, 25 Sep 2013 02:21:37 +0000 (12:21 +1000)]
Merge branch 'MDL-41713-master' of git://github.com/phalacee/moodle
Conflicts:
lib/editor/atto/styles.css
Marina Glancy [Wed, 25 Sep 2013 01:53:48 +0000 (11:53 +1000)]
Merge branch 'MDL-41421_master' of git://github.com/dmonllao/moodle
Eric Merrill [Tue, 17 Sep 2013 19:07:19 +0000 (15:07 -0400)]
MDL-41845 Activity Completion: Make default selection an option.
Makes an option to either default to the activity default, or default
to COMPLETION_TRACKING_NONE. This leaves open the possibility of
allowing activities to pick an actual default, instead of just on/off.
David Monllao [Thu, 5 Sep 2013 05:38:43 +0000 (13:38 +0800)]
MDL-41421 tool_generator: Adding a CLI tool to generate the test plan
David Monllao [Wed, 28 Aug 2013 08:50:00 +0000 (16:50 +0800)]
MDL-41421 tool_generator: Adding a test plan generator to feed JMeter
Also changing course_backend.php coding style
according to codechecker.
Eloy Lafuente (stronk7) [Wed, 25 Sep 2013 01:09:51 +0000 (03:09 +0200)]
Merge branch 'MDL-41910_master' of git://github.com/dmonllao/moodle
Marina Glancy [Wed, 25 Sep 2013 00:54:19 +0000 (10:54 +1000)]
Merge branch 'w39_MDL-41223_m26_customlogin' of https://github.com/skodak/moodle
Eloy Lafuente (stronk7) [Wed, 25 Sep 2013 00:38:34 +0000 (02:38 +0200)]
Merge branch 'MDL-41827_master' of git://github.com/dmonllao/moodle
Conflicts:
admin/tool/generator/classes/site_backend.php
Eloy Lafuente (stronk7) [Wed, 25 Sep 2013 00:33:30 +0000 (02:33 +0200)]
Merge branch 'MDL-41839-master' of git://github.com/sammarshallou/moodle
Eloy Lafuente (stronk7) [Wed, 25 Sep 2013 00:14:57 +0000 (02:14 +0200)]
Merge branch 'MDL-41660-imscc-tempdir' of https://github.com/mpetrowi/moodle
Eloy Lafuente (stronk7) [Wed, 25 Sep 2013 00:11:51 +0000 (02:11 +0200)]
Merge branch 'MDL-41342_master' of git://github.com/dmonllao/moodle
Conflicts:
theme/bootstrapbase/style/moodle.css
Eloy Lafuente (stronk7) [Wed, 25 Sep 2013 00:00:22 +0000 (02:00 +0200)]
Merge branch '40903-26' of git://github.com/samhemelryk/moodle
Eloy Lafuente (stronk7) [Tue, 24 Sep 2013 23:46:53 +0000 (01:46 +0200)]
MDL-41889 Use moodle collator for NATURAL sort
Eloy Lafuente (stronk7) [Tue, 24 Sep 2013 23:25:20 +0000 (01:25 +0200)]
MDL-41726 bump to force site/phpunit/behat reinstall
Eloy Lafuente (stronk7) [Tue, 24 Sep 2013 23:01:23 +0000 (01:01 +0200)]
Merge branch 'master_MDL-41806' of git://github.com/totara/moodle
Eloy Lafuente (stronk7) [Tue, 24 Sep 2013 22:27:57 +0000 (00:27 +0200)]
Merge branch 'MDL-38192-master' of git://github.com/sammarshallou/moodle
Sam Hemelryk [Tue, 24 Sep 2013 22:18:30 +0000 (10:18 +1200)]
Merge branch 'MDL-41907' of https://github.com/merrill-oakland/moodle
Sam Hemelryk [Tue, 24 Sep 2013 22:02:57 +0000 (10:02 +1200)]
Merge branch 'MDL-40835_master' of https://github.com/nadavkav/moodle
Conflicts:
theme/bootstrapbase/style/moodle.css
Sam Hemelryk [Tue, 24 Sep 2013 21:59:31 +0000 (09:59 +1200)]
Merge branch 'MDL-39730_master' of https://github.com/nadavkav/moodle
Sam Hemelryk [Tue, 24 Sep 2013 21:49:29 +0000 (09:49 +1200)]
Merge branch 'MDL-41889_master' of git://github.com/dmonllao/moodle
Sam Hemelryk [Tue, 24 Sep 2013 21:31:43 +0000 (09:31 +1200)]
Merge branch 'MDL-38286-m' of git://github.com/andrewnicols/moodle
Sam Hemelryk [Tue, 24 Sep 2013 21:27:44 +0000 (09:27 +1200)]
Merge branch 'master_MDL-41580' of git://github.com/danmarsden/moodle
Eloy Lafuente (stronk7) [Tue, 24 Sep 2013 21:23:15 +0000 (23:23 +0200)]
Merge branch 'MDL-40811-m' of git://github.com/andrewnicols/moodle
Eloy Lafuente (stronk7) [Tue, 24 Sep 2013 21:20:53 +0000 (23:20 +0200)]
Merge branch 'wip-MDL-41594-master' of git://github.com/marinaglancy/moodle
Sam Hemelryk [Tue, 24 Sep 2013 21:14:49 +0000 (09:14 +1200)]
MDL-40903 fixed merge conflicts against integration
Eloy Lafuente (stronk7) [Tue, 24 Sep 2013 21:13:50 +0000 (23:13 +0200)]
Merge branch 'MDL-41726-master-2nd' of git://github.com/FMCorz/moodle
Conflicts:
lang/en/moodle.php
Sam Hemelryk [Tue, 17 Sep 2013 01:39:49 +0000 (13:39 +1200)]
MDL-40903 cache: renamed loader method to reflect static accelerator
Sam Hemelryk [Mon, 16 Sep 2013 23:56:15 +0000 (11:56 +1200)]
MDL-40903 cache: renamed persistcache to staticacceleration
Sam Hemelryk [Mon, 16 Sep 2013 22:56:52 +0000 (10:56 +1200)]
MDL-40903 cache: fixed up event invalidation
Marina Glancy [Tue, 10 Sep 2013 13:08:35 +0000 (23:08 +1000)]
MDL-40903 cache: Unittests and small fixes for persistent application cache
Sam Hemelryk [Mon, 9 Sep 2013 21:53:45 +0000 (09:53 +1200)]
MDL-40903 cache: coding style tidyup pre-integration
Sam Hemelryk [Thu, 1 Aug 2013 06:13:58 +0000 (18:13 +1200)]
MDL-40903 cache: converted persistent into persistentdata
At the same time all cache instances were made persistent
Petr Škoda [Tue, 24 Sep 2013 20:43:46 +0000 (22:43 +0200)]
MDL-41437 fix plugin install issues
This patch prevents inclusion of settings from plugin that or not yet installed or upgraded,
this matches the original logic where we were using the modules table.
Eloy Lafuente (stronk7) [Tue, 24 Sep 2013 18:18:03 +0000 (20:18 +0200)]
Merge branch 'w39_MDL-41437_m26_mia' of https://github.com/skodak/moodle
Conflicts:
admin/auth.php
lib/db/upgrade.php
version.php
Eloy Lafuente (stronk7) [Tue, 24 Sep 2013 12:05:10 +0000 (14:05 +0200)]
Merge branch 'wip-MDL-41937-master' of git://github.com/marinaglancy/moodle
Marina Glancy [Tue, 24 Sep 2013 11:42:20 +0000 (21:42 +1000)]
Merge branch 'MDL-40550_master' of https://github.com/totara/openbadges
Marina Glancy [Tue, 24 Sep 2013 11:31:46 +0000 (21:31 +1000)]
Merge branch 'MDL-41929' of git://github.com/timhunt/moodle
Marina Glancy [Tue, 24 Sep 2013 10:53:49 +0000 (20:53 +1000)]
MDL-41937 tests: reset time limit after test
Marina Glancy [Tue, 24 Sep 2013 10:02:57 +0000 (20:02 +1000)]
MDL-39962 - Events: added missing required file
Marina Glancy [Tue, 24 Sep 2013 10:00:24 +0000 (20:00 +1000)]
Merge branch 'wip-MDL-39962-master' of git://github.com/abgreeve/moodle
Sam Hemelryk [Tue, 24 Sep 2013 09:16:29 +0000 (21:16 +1200)]
Merge branch 'int_behat' of https://github.com/skodak/moodle
Petr Škoda [Tue, 24 Sep 2013 06:59:29 +0000 (08:59 +0200)]
MDL-37324 fix phpunit and behat SESSION and USER setup
Marina Glancy [Tue, 24 Sep 2013 06:49:50 +0000 (16:49 +1000)]
Merge branch 'MDL-41725-master-onecommit' of git://github.com/jamiepratt/moodle
Marina Glancy [Tue, 24 Sep 2013 06:33:50 +0000 (16:33 +1000)]
Merge branch 'MDL-41733_master' of git://github.com/StudiUM/moodle
Marina Glancy [Tue, 24 Sep 2013 06:29:00 +0000 (16:29 +1000)]
Merge branch 'MDL-41087-master' of git://github.com/sammarshallou/moodle
Adrian Greeve [Mon, 12 Aug 2013 03:38:39 +0000 (11:38 +0800)]
MDL-39962 - Events: Replace lefacy event lti_unknown_service_api call.
Adrian Greeve [Tue, 6 Aug 2013 06:23:03 +0000 (14:23 +0800)]
MDL-39962 - Events: Replace the legacy event workshop_viewed
This also includes the abstract class course_module_viewed.
Marina Glancy [Tue, 24 Sep 2013 01:49:02 +0000 (11:49 +1000)]
Merge branch 'MDL-41840-master' of git://github.com/sammarshallou/moodle
Marina Glancy [Tue, 24 Sep 2013 01:48:49 +0000 (11:48 +1000)]
Merge branch 'MDL-41669-master' of git://github.com/sammarshallou/moodle
Sam Hemelryk [Tue, 24 Sep 2013 00:14:16 +0000 (12:14 +1200)]
Merge branch 'w39_MDL-41904_m26_markdown' of https://github.com/skodak/moodle
Sam Hemelryk [Tue, 24 Sep 2013 00:09:47 +0000 (12:09 +1200)]
Merge branch 'w39_MDL-41903_m26_typo3' of https://github.com/skodak/moodle
Dan Marsden [Wed, 4 Sep 2013 06:46:35 +0000 (18:46 +1200)]
MDL-41580 SCORM: allow imsmanifest.xml to be used in file system repos
Sam Hemelryk [Tue, 24 Sep 2013 00:01:03 +0000 (12:01 +1200)]
Merge branch 'w39_MDL-40107_m26_tcpdf' of https://github.com/skodak/moodle
Sam Hemelryk [Mon, 23 Sep 2013 22:58:46 +0000 (10:58 +1200)]
MDL-39910 mod_scorm: fixed install.xml not nulls
Sam Hemelryk [Mon, 23 Sep 2013 22:37:14 +0000 (10:37 +1200)]
MDL-39871 output: improved block manipulation inheritance
Sam Hemelryk [Mon, 23 Sep 2013 22:02:58 +0000 (10:02 +1200)]
Merge branch 'WIP-MDL-39871_master' of git://github.com/nadavkav/moodle
Sam Hemelryk [Mon, 23 Sep 2013 21:37:10 +0000 (09:37 +1200)]
Merge branch 'MDL-41716-master' of git://github.com/phalacee/moodle
Petr Škoda [Thu, 19 Sep 2013 19:37:59 +0000 (21:37 +0200)]
MDL-40107 import tcpdf 6.0.031
Includes a few more small asian fonts.
Sam Hemelryk [Mon, 23 Sep 2013 21:14:37 +0000 (09:14 +1200)]
Merge branch 'MDL-35217_M26' of git://github.com/lazydaisy/moodle
Sam Hemelryk [Mon, 23 Sep 2013 21:04:27 +0000 (09:04 +1200)]
Merge branch 'master_MDL-39910' of git://github.com/danmarsden/moodle
Sam Hemelryk [Mon, 23 Sep 2013 20:51:41 +0000 (08:51 +1200)]
Merge branch 'MDL-40048-master' of git://github.com/FMCorz/moodle
Sam Hemelryk [Mon, 23 Sep 2013 20:33:10 +0000 (08:33 +1200)]
Merge branch 'MDL-36465-master' of git://github.com/andrewnicols/moodle
Sam Hemelryk [Mon, 23 Sep 2013 20:28:40 +0000 (08:28 +1200)]
Merge branch 'MDL-41591_zindex' of https://github.com/andyjdavis/moodle
Conflicts:
theme/bootstrapbase/style/moodle.css
Eloy Lafuente (stronk7) [Mon, 23 Sep 2013 20:05:26 +0000 (22:05 +0200)]
Merge branch 'int_install' of https://github.com/skodak/moodle
Petr Škoda [Mon, 23 Sep 2013 19:35:18 +0000 (21:35 +0200)]
MDL-31501 fake requried globals in both installers
Tim Hunt [Mon, 23 Sep 2013 17:05:57 +0000 (18:05 +0100)]
MDL-41929 quiz statistics, overall stats not displayed.
Marina Glancy [Mon, 23 Sep 2013 09:16:43 +0000 (19:16 +1000)]
Merge branch 'MDL-41833-master' of git://github.com/ankitagarwal/moodle
