57073 Commits

Author SHA1 Message Date
Eloy Lafuente (stronk7)
3b950bab64 Merge branch 'w41_MDL-35382_m24_reordertest' of git://github.com/skodak/moodle 2012-10-08 23:54:36 +02:00
Eloy Lafuente (stronk7)
f374702e75 Merge branch 'w41_MDL-35691_m24_intsizes' of git://github.com/skodak/moodle 2012-10-08 23:51:26 +02:00
Eloy Lafuente (stronk7)
0b85584480 Merge branch 'MDL-35519_book_cancel' of git://github.com/andyjdavis/moodle 2012-10-08 23:07:25 +02:00
Eloy Lafuente (stronk7)
69d2746dd2 Revert "MDL-34894 course ws unit tests: fix windows problem."
This reverts commit 954c272e548c0578fde9d1bc0979ac46b72bc3b9.

With MDL-35714, each test gets gc_collect_cycles() called, so
no need to call it "manually".
2012-10-08 22:57:50 +02:00
Eloy Lafuente (stronk7)
311eb89695 Merge branch 'w41_MDL-35714_m24_testgc' of git://github.com/skodak/moodle 2012-10-08 22:51:45 +02:00
Petr Škoda
129e6d36a4 MDL-28980 add basic expiry notification support to manual enrolments
Thanks Helen Foster for the lang string improvements.
2012-10-08 15:15:51 +02:00
Nadav Kavalerchik
e0ce765323 MDL-35724 - Move Question Marks block to the left (Question Bank page),in RTL mode 2012-10-08 11:35:10 +02:00
Nadav Kavalerchik
fd901cf0e2 MDL-35724 - Right align "Question Type" label in Quiz Editing page, when in RTL mode 2012-10-08 11:35:09 +02:00
Aparup Banerjee
db739bf096 Merge branch 'wip-MDL-35694' of git://github.com/jennymgray/moodle 2012-10-08 17:24:53 +08:00
Aparup Banerjee
1c5f03fd4a Merge branch 'WIP-MDL-35723-master_quiz' of git://github.com/nadavkav/moodle 2012-10-08 17:15:41 +08:00
Aparup Banerjee
e1aa59b9e4 Merge branch 'w41_MDL-35739_m24_cliinstall' of git://github.com/skodak/moodle 2012-10-08 17:06:06 +08:00
Aparup Banerjee
30ee1d93be Merge branch 'w41_MDL-35814_m24_delinstance' of git://github.com/skodak/moodle 2012-10-08 16:42:03 +08:00
Petr Škoda
91652c2429 MDL-35814 improve enrol delete instance strings
Credit goes to Helen Foster, thanks!
2012-10-08 10:30:07 +02:00
Aparup Banerjee
90dd427cf7 Merge branch 'w41_MDL-35695_m24_authdb' of git://github.com/skodak/moodle 2012-10-08 15:59:39 +08:00
Aparup Banerjee
d26a3d2b6f Merge branch 'MDL-35728' of git://github.com/netspotau/moodle-mod_assign 2012-10-08 15:23:20 +08:00
Aparup Banerjee
af312fdb12 Merge branch 'wip-mdl-35784' of git://github.com/rajeshtaneja/moodle 2012-10-08 15:12:54 +08:00
Aparup Banerjee
dbce42a7c2 Merge branch 'w41_MDL-35814_m24_delinstance' of git://github.com/skodak/moodle 2012-10-08 14:59:07 +08:00
Aparup Banerjee
9f8ffac3b8 Merge branch 'wip-MDL-34448-master' of git://github.com/abgreeve/moodle 2012-10-08 14:20:04 +08:00
Tomasz Muras
c7ece2b1ef MDL-32092 Remove dead code from profile_field_textarea 2012-10-08 13:53:40 +08:00
Adrian Greeve
c0a059260f MDL-35265 - blog - Update code for removing orphaned blog association data. 2012-10-08 10:07:47 +08:00
Sam Hemelryk
dc67f522cf Merge branch 'MDL-35634-master' of git://github.com/FMCorz/moodle 2012-10-08 11:36:57 +13:00
Sam Hemelryk
382d11a43c Merge branch 'MDL-35288_dndupload_folder_warning' of git://github.com/davosmith/moodle 2012-10-08 11:18:54 +13:00
Sam Hemelryk
68b9d1f408 Merge branch 'MDL-35211_master' of git://github.com/kordan/moodle 2012-10-08 11:02:44 +13:00
Sam Hemelryk
2a00249df5 Merge branch 'MDL-35763' of git://github.com/netspotau/moodle-mod_assign 2012-10-08 10:44:10 +13:00
Sam Hemelryk
da2ebe0474 Merge branch 'MDL-35764' of git://github.com/netspotau/moodle-mod_assign 2012-10-08 10:40:35 +13:00
Sam Hemelryk
e8edb00c73 Merge branch 'MDL-34992' of git://github.com/nebgor/moodle 2012-10-08 10:33:48 +13:00
Sam Hemelryk
9201c33bb7 Merge branch 'MDL-33646-master' of git://github.com/ankitagarwal/moodle 2012-10-08 10:22:18 +13:00
Sam Hemelryk
2a2d855e14 Merge branch 'MDL-35667_extra_credit_loop' of git://github.com/andyjdavis/moodle 2012-10-08 10:15:49 +13:00
Sam Hemelryk
4c5f42b400 Merge branch 'MDL-35730' of https://github.com/aolley/moodle 2012-10-08 10:06:30 +13:00
Sam Hemelryk
267ebe02b3 MDL-25290 cache: Fixed issues with references when getting, and added unit tests to cover 2012-10-08 09:53:53 +13:00
Sam Hemelryk
26ce56fddf MDL-25290 cache: renaming to better separate store plugins from lock plugins 2012-10-08 09:53:52 +13:00
Sam Hemelryk
42f2c59eb8 MDL-25290 cache: Added unit tests for admin and fixed up identified issues 2012-10-08 09:53:52 +13:00
Sam Hemelryk
fd59389ca6 MDL-25290 cache: Plugins are now standard and strings tidied 2012-10-08 09:53:52 +13:00
Sam Hemelryk
573a6c8eb3 MDL-25290 cache: Made handling of cache locks when writing config more robust 2012-10-08 09:53:52 +13:00
Sam Hemelryk
8dbfbd71c9 MDL-25290 cache: Fixed up handling of objects by cache loader 2012-10-08 09:53:52 +13:00
Sam Hemelryk
42f5d1648d MDL-25290 cache: Fixed up memcache server settings and a couple of minor things 2012-10-08 09:53:52 +13:00
Sam Hemelryk
170f821b9d MDL-25290 cache: Fixed things up per coding style 2012-10-08 09:53:52 +13:00
Sam Hemelryk
bb250f02e6 MDL-25290 cache: Added optional CFG setting to control location of cache config file 2012-10-08 09:53:52 +13:00
Sam Hemelryk
167ad91e86 MDL-25290 cache: Added UI to view the cache lock setups and tidied up a couple of things 2012-10-08 09:53:51 +13:00
Sam Hemelryk
34c84c723a MDL-25290 cache: Added cache locking plugin and converted locking implementations to that 2012-10-08 09:53:51 +13:00
Sam Hemelryk
6fec18203b MDL-25290 cache: Renamed plugin from cache => cachestore 2012-10-08 09:53:51 +13:00
Sam Hemelryk
f23fbfd849 MDL-25290 cache: Fixed up redirect loop with admin settings for cache stores 2012-10-08 09:53:51 +13:00
Sam Hemelryk
52642d0d24 MDL-25290 cache: Fixed up issue with unit test blowing away cachedir 2012-10-08 09:53:51 +13:00
Sam Hemelryk
e3b77f9f57 MDL-25290 cache_memcache: Added Memcache cache store 2012-10-08 09:53:51 +13:00
Sam Hemelryk
47d89ccfa5 MDL-25290 cache_memcached: Added Memcached cache store 2012-10-08 09:53:51 +13:00
Sam Hemelryk
2e638e3d35 MDL-25290 cache_mongodb: Added Mongo DB cache store 2012-10-08 09:53:51 +13:00
Sam Hemelryk
5f2836e6cc MDL-25290 cache_static: Added default static cache store 2012-10-08 09:53:50 +13:00
Sam Hemelryk
d7f1f57391 MDL-25290 cache_session: Added default session cache store 2012-10-08 09:53:50 +13:00
Sam Hemelryk
62704f33d4 MDL-25290 cache_file: Added default file cache store 2012-10-08 09:53:50 +13:00
Sam Hemelryk
d6a1f63bdd MDL-25290 cache: Cache API integration with core 2012-10-08 09:53:50 +13:00