57491 Commits

Author SHA1 Message Date
Dan Poltawski
1ffe4aefb1 Merge branch 'MDL-36655' of git://github.com/netspotau/moodle-mod_assign 2012-11-19 15:01:48 +08:00
Dan Poltawski
98d11a8c83 Merge branch 'w47_MDL-36682_m24_mcache' of git://github.com/skodak/moodle 2012-11-19 14:50:48 +08:00
Dan Poltawski
1ae8e2f963 Merge branch 'MDL-36415-master-int' of git://github.com/FMCorz/moodle
Conflicts:
	theme/upgrade.txt
2012-11-19 10:51:54 +08:00
Dan Poltawski
380186484b Merge branch 'MDL-34204' of git://github.com/timhunt/moodle 2012-11-19 10:33:25 +08:00
Dan Poltawski
542f68b022 Merge branch 'm24_MDL-36512_Purging_file_cachestore_does_not_purge_anything' of https://github.com/scara/moodle 2012-11-19 10:20:00 +08:00
Sam Hemelryk
41439e6c8d Merge branch 'MDL-36589' of git://github.com/rwijaya/moodle 2012-11-19 14:58:48 +13:00
Petr Škoda
0b37fe466a MDL-36682 remove old unused shared memory caching support 2012-11-18 14:46:31 +01:00
Matteo Scaramuccia
942be4a574 MDL-36512 purge_by_*() must initialise the cache implementing a store.
Indeed, given the current stores implementation, purge will not take effect in case of a file store.
2012-11-16 10:49:12 +01:00
Matteo Scaramuccia
fb8305dec7 MDL-36512 Purging a file store actually purges nothing 2012-11-16 10:43:15 +01:00
Dan Poltawski
2d7c5eeeea on demand release 2.4beta+ 2012-11-16 16:27:08 +08:00
Dan Poltawski
381230cc70 Merge branch 'install_master' of git://git.moodle.cz/moodle-install 2012-11-16 16:25:59 +08:00
Dan Poltawski
7d1f162a36 on demand release 2.4beta+ 2012-11-16 16:22:30 +08:00
Dan Poltawski
bc8f1957a4 Merge branch 'm24_MDL-36364_Improve_the_deletion_logic' of https://github.com/scara/moodle
Conflicts:
	cache/stores/file/lib.php
2012-11-16 15:24:24 +08:00
Dan Poltawski
aeb8e78785 Merge branch 'wip-MDL-36407-m24' of git://github.com/samhemelryk/moodle 2012-11-16 15:04:17 +08:00
Dan Poltawski
c941aafebb Merge branch 'wip-MDL-36276-m24' of git://github.com/samhemelryk/moodle 2012-11-16 14:52:09 +08:00
Dan Poltawski
716bf54332 Merge branch 'MDL-36525-master' of git://github.com/ankitagarwal/moodle 2012-11-16 14:49:44 +08:00
Frederic Massart
06b7ed0a45 MDL-36415 usability: Use new up/down and ordering icons 2012-11-16 12:47:09 +08:00
Barbara Ramiro
d4e5a26cfd MDL-36415 usability: New icons for sorting asc and desc 2012-11-16 12:16:36 +08:00
Barbara Ramiro
b8bd1a318a MDL-36415 usability: Revert resize of arrow up/down 2012-11-16 12:16:36 +08:00
Dan Poltawski
5d4f65e6df Merge branch 'MDL-36471-master-int' of git://github.com/FMCorz/moodle 2012-11-16 12:16:31 +08:00
Frederic Massart
f03671950f MDL-26660 libraries: Improved XML validation before parsing 2012-11-16 12:12:57 +08:00
Frederic Massart
716330444a MDL-36471 phpunit: Fixed failure because SVG support was dropped for Opera 2012-11-16 12:12:54 +08:00
Dan Poltawski
c936a6af35 MDL-36526 - calendar: trim urls for copy/pasting 2012-11-16 12:06:41 +08:00
Damyon Wiese
f3027e87fe MDL-36655: Assignment - do not add empty group to grading form when there is only one student 2012-11-16 11:07:57 +08:00
Dan Poltawski
2a594e13b1 Merge branch 'MDL-36612-master-int' of git://github.com/FMCorz/moodle 2012-11-16 11:03:45 +08:00
Dan Poltawski
44411fdb0c Merge branch 'MDL-36471-master-int' of git://github.com/FMCorz/moodle 2012-11-16 11:01:53 +08:00
Dan Poltawski
e8feeb2ca2 Merge branch 'MDL-36622-master' of git://github.com/FMCorz/moodle 2012-11-16 10:57:16 +08:00
Dan Poltawski
98504eb609 Merge branch 'MDL-36643-master' of git://github.com/FMCorz/moodle 2012-11-16 10:52:07 +08:00
AMOS bot
8c269f2425 Automatically generated installer lang files 2012-11-15 21:29:38 +00:00
Sam Hemelryk
5dd68a7523 MDL-36407 cache: unit tests + checks + improved string cache 2012-11-16 09:46:49 +13:00
Tim Hunt
1e88baa071 MDL-34204 grader report: static call to non-static method. 2012-11-15 13:42:32 +00:00
Frederic Massart
fbbf043ce4 MDL-36417 usability: Disable SVG support for Opera 2012-11-15 21:38:42 +08:00
Frederic Massart
c42651d682 MDL-36622 usability: Adaptations following new icons 2012-11-15 19:47:14 +08:00
Barbara Ramiro
447cfc94a2 MDL-36622 usability: New icons on course category page 2012-11-15 19:47:12 +08:00
Barbara Ramiro
a1a48ac0c7 MDL-36643 usability: New RSS icon 2012-11-15 19:32:24 +08:00
Ankit Agarwal
20bdf99764 MDL-36525 calendar: Curl should allow urls with force downloads 2012-11-15 16:55:03 +08:00
Dan Poltawski
e7468fb2ed Merge branch 'wip-MDL-35770-master' of git://github.com/marinaglancy/moodle 2012-11-15 16:26:26 +08:00
Marina Glancy
a062c97ce8 MDL-36594 reset cache inside course format when course marker is changed 2012-11-15 16:20:05 +08:00
Dan Poltawski
b34e88508b MDL-36526 calendar: Convert webcal:// to http://
Curl doesn't understand webcal, so needs to use http. Also fixed some
php warnings spotted during testing.
2012-11-15 15:48:24 +08:00
Frederic Massart
9b835f70b6 MDL-36612 upgrade: Force courses cache to be rebuilt 2012-11-15 14:51:28 +08:00
Dan Poltawski
391678f6fa Merge branch 'MDL-36331_redirect' of git://github.com/andyjdavis/moodle 2012-11-15 14:40:42 +08:00
Dan Poltawski
491391873e Merge branch 'MDL-36061_userid' of git://github.com/andyjdavis/moodle 2012-11-15 14:32:51 +08:00
Dan Poltawski
21dfaa0133 Merge branch 'wip-MDL-35770-master' of git://github.com/marinaglancy/moodle 2012-11-15 13:51:07 +08:00
Marina Glancy
399ad6bf3b MDL-35770 Include file defining base class in order to work correctly in cron 2012-11-15 13:26:28 +08:00
Dan Poltawski
f138b38705 Merge branch 'w47_MDL-36524_m24_ieagain' of git://github.com/skodak/moodle 2012-11-15 11:20:12 +08:00
Aparup Banerjee
6eff995f08 MDL-30643 fixed whitespace 2012-11-15 11:16:35 +08:00
Aparup Banerjee
244e907235 Merge branch 'MDL-30643_master-log-speed' of git://github.com/tbannister/moodle
Conflicts:
	lib/tests/statslib_test.php
2012-11-15 11:15:00 +08:00
Andrew Davis
69bcca5e9c MDL-36061 core_grade: added some unit tests related to refresh_grades() 2012-11-15 11:14:21 +08:00
Dan Poltawski
f315d159c8 Merge branch 'wip-MDL-35770-master' of git://github.com/marinaglancy/moodle
Conflicts:
	course/format/lib.php
2012-11-15 10:59:17 +08:00
Dan Poltawski
e4a9cc642f Merge branch 'MDL-36417-master' of git://github.com/FMCorz/moodle 2012-11-15 10:39:08 +08:00