57384 Commits

Author SHA1 Message Date
Dan Poltawski
20aea2ea0d Merge branch 'MDL-17444_localPluginBackupRestoreMaster' of https://github.com/moodlerooms/moodle 2012-11-07 14:49:15 +08:00
Nicolas Connault
dd15ef0e1b MDL-36413 Added "this->" to exclude variable assignment
The this-> keyword was missing from the $exclude = array() statement.
2012-11-07 14:48:40 +08:00
Dan Poltawski
53b6a75a99 Merge branch 'wip-MDL-35279-master' of git://github.com/marinaglancy/moodle 2012-11-07 14:44:26 +08:00
Dan Poltawski
5c6d2b1480 Merge branch 'wip-MDL-36369-master' of git://github.com/marinaglancy/moodle 2012-11-07 14:34:37 +08:00
Dan Poltawski
8f3020558d Merge branch 'wip-MDL-33017-m24-r2' of git://github.com/samhemelryk/moodle 2012-11-07 14:17:11 +08:00
Dan Poltawski
1383b1f29a Merge branch 'wip-MDL-36365-master' of git://github.com/abgreeve/moodle 2012-11-07 14:09:25 +08:00
Adrian Greeve
1222dc52e1 MDL-36365 - lib: The csv class now reads tab separated files with tabs at the end of the file. 2012-11-07 14:02:39 +08:00
Dan Poltawski
ac012a9b2c Merge branch 'wip-MDL-36397-master' of git://github.com/barbararamiro/moodle 2012-11-07 13:42:32 +08:00
Dan Poltawski
20272a548c Merge branch 'wip-mdl-36303' of git://github.com/rajeshtaneja/moodle 2012-11-07 11:57:58 +08:00
Barbara Ramiro
32ee9fe407 MDL-36397 Usability: New setting block icons in svg and png formats 2012-11-07 11:32:14 +08:00
Dan Poltawski
e9641de10d Merge branch 'w43_MDL-35771_m24_zindex' of git://github.com/skodak/moodle 2012-11-07 11:22:26 +08:00
Dan Poltawski
7451baff70 Merge branch 'wip-MDL-35961-master' of git://github.com/abgreeve/moodle 2012-11-07 11:12:45 +08:00
Dan Poltawski
e830d6f98e Merge branch 'wip-MDL-30921-m24' of git://github.com/samhemelryk/moodle 2012-11-07 10:51:06 +08:00
Dan Poltawski
1191881888 Merge branch 'wip-MDL-36120-m24' of git://github.com/samhemelryk/moodle 2012-11-07 10:49:28 +08:00
Dan Poltawski
a8ccdd28e0 Merge branch 'wip-MDL-36386-m24' of git://github.com/samhemelryk/moodle
Conflicts:
	version.php
2012-11-07 09:33:47 +08:00
AMOS bot
ddf7971c21 Automatically generated installer lang files 2012-11-07 00:36:29 +00:00
Mark Nielsen
c7b05a1d1b MDL-17444: Backup hooks for local plugin (CR)
Code review changes
* Fixed PHPDoc
* Fixed missing MOODLE_INTERNAL check
2012-11-06 15:37:08 -08:00
Sam Hemelryk
75af47ee1e MDL-36386 cache: upgrades now trigger definitions to be updated 2012-11-07 10:42:20 +13:00
Sam Hemelryk
49c497ff08 MDL-36120 cachestore_file: Added missing singledirectory check in config check 2012-11-07 10:09:58 +13:00
Sam Hemelryk
702651c7a6 MDL-36120 cache: Tidied up post peer-review 2012-11-07 10:03:32 +13:00
Sam Hemelryk
47834bcd41 MDL-36120 cache: now uses sha1 and has an option for simple keys 2012-11-07 10:03:32 +13:00
Sam Hemelryk
08aaa637fb MDL-36120 cachestore_file: improved file storage method + new setting 2012-11-07 09:58:55 +13:00
Sam Hemelryk
b9c87ef86a MDL-33017 navigation: Tidied up after peer-review 2012-11-07 09:52:47 +13:00
Sam Chaffee
a66e8bb3aa MDL-17444: Backup hooks for local plugin 2012-11-06 10:49:41 -08:00
Eloy Lafuente (stronk7)
086f5f9ea8 MDL-35762 whitespace fix 2012-11-06 17:03:57 +01:00
Eloy Lafuente (stronk7)
278714a012 MDL-35762 fix deprecated use of get_fast_modinfo() reset. 2012-11-06 16:37:43 +01:00
Eloy Lafuente (stronk7)
cd59310d1b Merge branch 'MDL-35762_fix' of git://github.com/andyjdavis/moodle 2012-11-06 16:13:47 +01:00
Dan Poltawski
8cc13d417d Merge branch 'MDL-36392-master-int' of git://github.com/FMCorz/moodle 2012-11-06 17:11:21 +08:00
Frederic Massart
281d730ea6 MDL-36392 course: Adding a module to a section does not corrupt its sequence 2012-11-06 17:00:47 +08:00
Dan Poltawski
02b800ad67 Merge branch 'MDL-34270_master' of https://github.com/markn86/moodle 2012-11-06 16:14:13 +08:00
Dan Poltawski
87b210d98f Merge branch 'w43_MDL-34915_m24_simpleyui' of git://github.com/skodak/moodle 2012-11-06 16:03:40 +08:00
Martin Dougiamas
72225e18e7 MDL-36390 - Make sure resource icons are 24px to match activities 2012-11-06 15:59:32 +08:00
Dan Poltawski
90a23f067c Merge branch 'wip-MDL-36277-master' of git://github.com/barbararamiro/moodle
Conflicts:
	theme/standard/style/course.css
2012-11-06 14:58:49 +08:00
Mark Nelson
464e00be28 MDL-34270 blocks: perform My Moodle addinstance capability check first 2012-11-06 14:56:47 +08:00
Dan Poltawski
a353088f2c Merge branch 'wip-MDL-36342-master' of git://github.com/barbararamiro/moodle
Conflicts:
	theme/base/style/core.css
2012-11-06 14:48:22 +08:00
Dan Poltawski
14c01766ec Merge branch 'wip-MDL-36338-master' of git://github.com/barbararamiro/moodle 2012-11-06 14:27:59 +08:00
Dan Poltawski
e6acc052fb Merge branch 'MDL-36037' of git://github.com/netspotau/moodle-mod_assign 2012-11-06 12:32:41 +08:00
Sam Hemelryk
468cc57297 MDL-34342 cache: Added missing include and fixed old lang manager setting 2012-11-06 17:24:20 +13:00
Dan Poltawski
cdf9b0c86f Merge branch 'MDL-36266-notification-subject' of git://github.com/mudrd8mz/moodle 2012-11-06 11:59:24 +08:00
Dan Poltawski
2f3844e154 MDL-34342 - increment version number
To pickup new cache defintion changes
2012-11-06 11:32:43 +08:00
Dan Poltawski
61d49846a1 Merge branch 'wip-MDL-34342-m24' of git://github.com/samhemelryk/moodle 2012-11-06 11:26:45 +08:00
Dan Poltawski
915fc9b96c Merge branch 'MDL-35421-conclusion' of git://github.com/mudrd8mz/moodle 2012-11-06 11:17:44 +08:00
Dan Poltawski
653c89bcf3 Merge branch 'w43_MDL-36199_m24_pluginsingletons' of git://github.com/skodak/moodle 2012-11-06 10:32:47 +08:00
Dan Poltawski
2c36da50bc Merge branch 'wip-MDL-36362-m24' of git://github.com/samhemelryk/moodle
Conflicts:
	version.php
2012-11-06 10:03:23 +08:00
Dan Poltawski
70cb1b995b Merge branch 'm24_MDL-36360_Missing_cachestore_file_config_get_configuration_array' of git://github.com/scara/moodle 2012-11-06 09:59:16 +08:00
Dan Poltawski
4798b9dd79 Merge branch 'wip-MDL-36379-m24' of git://github.com/samhemelryk/moodle 2012-11-06 09:47:56 +08:00
Dan Poltawski
eb5fc2a7d5 Merge branch 'MDL-36347' of git://github.com/timhunt/moodle 2012-11-06 09:41:56 +08:00
Dan Poltawski
980140e7cf Merge branch 'MDL-36023-master' of git://git.luns.net.uk/moodle 2012-11-06 09:35:31 +08:00
Sam Hemelryk
db19da5612 MDL-35998 admin: Fixed whitespace 2012-11-06 14:32:18 +13:00
Sam Hemelryk
8b03c25185 MDL-36379 user_view: fixed issue with page layout when editing was on 2012-11-06 14:01:14 +13:00