Commit graph

57825 commits

Author SHA1 Message Date
Sam Hemelryk
9a0e6f147d Merge branch 'WIP-MDL-35249-master' of git://github.com/nadavkav/moodle
Conflicts:
	mod/assign/gradingtable.php
2012-11-08 10:57:52 +13:00
Sam Hemelryk
81ede547f2 MDL-36381 cache: fixed bug whereby you couldn't edit store instances 2012-11-08 10:54:11 +13:00
Adrian Greeve
e2c5f38605 MDL-35558 mod_data: Show only own entries while there are required pending. 2012-11-07 19:43:42 +01:00
Iñaki Arenaza
c090d7c90e MDL-36119: auth_{ldap,cas}: LDAP Sync - implement paged results
Thanks to Jerome Charaoui for the original patch.
2012-11-07 19:13:10 +01:00
Petr Škoda
b5cf59a59d MDL-36194 remove bogus echo $PAGE->set_title()
Credit goes to Dan Poltawski, thanks!
2012-11-07 19:11:25 +01:00
Petr Škoda
eac37ff46a MDL-36431 fix multiple problems with self enrol defaults
This patch adds new method for retrieving of default properties of enrol_self instances and uses it both for automatic adding of instances and add instance form - this will guarantee both are using the same data in the future.
2012-11-07 18:57:14 +01:00
Petr Škoda
68cd60b7df MDL-36196 hardcode the required PHP version in installer 2012-11-07 13:04:08 +01:00
Petr Škoda
4f66c75f20 MDL-36194 add support for editor uninstallation 2012-11-07 13:02:21 +01:00
Eloy Lafuente (stronk7)
9986cd9013 NOBUG: Trivial whitespace fix to quickly fix ongoing CI status. 2012-11-07 11:49:56 +01:00
Frederic Massart
0f817d0d90 MDL-36290 usability: CSS post processing does not cancel SVG use 2012-11-07 17:29:20 +08:00
Dan Poltawski
2ac705c41d Merge branch 'MDL-36092-master' of git://git.luns.net.uk/moodle 2012-11-07 16:56:11 +08:00
Dan Poltawski
e87bdad9ad Merge branch 'MDL-36368_master' of git://github.com/lazydaisy/moodle 2012-11-07 16:49:35 +08:00
Dan Poltawski
4b5a6b1327 Merge branch 'wip-MDL-36317-master' of git://github.com/marinaglancy/moodle
Conflicts:
	course/format/lib.php
2012-11-07 16:41:53 +08:00
Dan Poltawski
63fc21b4e5 Merge branch 'MDL-26349-workshop-grades-display' of git://github.com/mudrd8mz/moodle 2012-11-07 16:32:43 +08:00
David Mudrák
3cb4ce45c7 MDL-26349 Display the workshop final grades to participants when the activity is closed 2012-11-07 09:08:38 +01:00
Dan Poltawski
64f7d154db Merge branch 'wip-MDL-36113-master' of git://github.com/abgreeve/moodle
Conflicts:
	lib/tests/csvclass_test.php
2012-11-07 15:40:06 +08:00
Adrian Greeve
13041f2125 MDL-36113 - lib: Unit tests for importing csv files with empty lines in the middle of the file. 2012-11-07 15:34:36 +08:00
Adrian Greeve
415a6ffcc8 MDL-36113 - lib: Importing csv entries with empty lines in the middle doesn't throw errors. 2012-11-07 15:34:29 +08:00
Dan Poltawski
defcb763fe Merge branch 'MDL-36209-workshop-assess-while-evaluating' of git://github.com/mudrd8mz/moodle 2012-11-07 15:30:38 +08:00
Dan Poltawski
092977fb0b Merge branch 'wip-MDL-36112-master' of git://github.com/abgreeve/moodle 2012-11-07 15:06:36 +08:00
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
Andrew Robert Nicols
a3b6da6dfc MDL-36022 AJAX Remove shim on chooser dialogues 2012-11-06 13:48:01 +00: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