Eloy Lafuente (stronk7)
1d3d4d1376
MDL-39733 profiling: UI for exporting runs
2013-06-28 04:46:40 +02:00
Eloy Lafuente (stronk7)
e36a3e3643
MDL-39733 xhprof: implement export of runs
2013-06-28 04:46:39 +02:00
Eloy Lafuente (stronk7)
26568ba865
Merge branch 'w26_MDL-39701_m26_filterupgrade' of git://github.com/skodak/moodle
2013-06-26 12:30:41 +02:00
Petr Škoda
f18c764a7c
MDL-39701 prevent string filtering before finishing 2.5 upgrade
2013-06-26 09:50:33 +02:00
Eloy Lafuente (stronk7)
09579cd198
Merge branch 'MDL-40033_master' of git://github.com/dmonllao/moodle
2013-06-25 12:08:15 +02:00
Sam Hemelryk
4eba7399ad
Merge branch 'w26_MDL-40305_m26_phpunitloader' of https://github.com/skodak/moodle
2013-06-25 12:19:30 +12:00
Sam Hemelryk
10a741cc64
Merge branch 'wip-MDL-40065-master_4' of git://github.com/gjb2048/moodle
2013-06-25 09:59:24 +12:00
Sam Hemelryk
cbc4b33afd
Merge branch 'w26_MDL-40289_m26_badgescaps' of git://github.com/skodak/moodle
2013-06-25 09:13:16 +12:00
Petr Škoda
d44e0aa323
MDL-40305 implement moodle specific phpunit testcase classloader
2013-06-24 21:29:37 +02:00
Eloy Lafuente (stronk7)
65ab140e00
Merge branch 'w26_MDL-40233_m26_frontset' of git://github.com/skodak/moodle
2013-06-24 21:29:05 +02:00
Eloy Lafuente (stronk7)
e2eccd0952
Merge branch 'MDL-40258_master' of git://github.com/sam-moodle/moodle
2013-06-24 18:56:08 +02:00
Gareth J Barnard
2e3fb23ff7
MDL-40065 theme_bootstrapbase theme_clean: Simplify column lyts / fix blocks.
2013-06-24 17:06:12 +01:00
Eloy Lafuente (stronk7)
3093713382
Merge branch 'w26_MDL-17081_m26_roles2' of git://github.com/skodak/moodle
2013-06-24 15:39:07 +02:00
Petr Škoda
5e72efd498
MDL-17081 add role export/import
...
This includes improved role creation, allowed roles are editable and other improvements.
2013-06-24 12:40:59 +02:00
Sam Hemelryk
109a2ff00e
Merge branch 'w26_MDL-39701_m26_filterupgrade' of git://github.com/skodak/moodle
2013-06-24 15:15:01 +12:00
Sam Hemelryk
615a5aa6f1
Merge branch 'MDL-39280-master-int' of git://github.com/FMCorz/moodle
2013-06-24 14:19:20 +12:00
Sam Hemelryk
f8dcecfd07
Merge branch 'mdl26dev-MDL-40130-let-course-category-caching-be-used' of git://github.com/brki/moodle
2013-06-24 11:44:20 +12:00
Sam Hemelryk
f04721e2bf
MDL-38347 fixed whitespace
2013-06-24 11:28:23 +12:00
Sam Hemelryk
2d9161791f
Merge branch 'wip-MDL-38347-master' of git://github.com/phalacee/moodle
2013-06-24 11:22:30 +12:00
Sam Hemelryk
0b20ce2841
Merge branch 'wip-MDL-38631-master' of git://github.com/marinaglancy/moodle
2013-06-24 10:00:20 +12:00
Sam Hemelryk
ef03bb6d9f
Merge branch 'MDL-39153-master' of git://github.com/ankitagarwal/moodle
2013-06-24 08:57:44 +12:00
Petr Škoda
3e9f4c7b1b
MDL-40289 fix all badges capabilities
...
1/ contextlevel must be the lowest level where capability can be overriden
2/ coursecreator is for course creation only!!!
3/ do not mix user with other archetypes
4/ config risk is for admin actions only in standard install
No upgrade cleanup, sorry, blame integrators...
2013-06-23 12:22:31 +02:00
Petr Škoda
c3bc6f1217
MDL-39701 prevent filters before finishing 2.5 upgrade
...
This prevents problems with unsigned integers in MySQL 5.5
2013-06-22 22:22:47 +02:00
Petr Škoda
aaf823a64d
MDL-40233 add proper cache invalidation on frontpage setting save
2013-06-22 22:18:16 +02:00
Marina Glancy
3b42c973d7
MDL-38631 link categories in My courses only when needed
2013-06-22 16:27:28 +10:00
Dmytro Vorona
257b59e737
MDL-38631 Fixed faulty add_category call, introduced in 758103
2013-06-22 16:27:28 +10:00
Sam Chaffee
41340f0461
MDL-40258: Fixed invalid json string error in file-picker
2013-06-21 11:16:44 -04:00
Brian King
b04f84bc80
MDL-40130 Caching: let make_categories_list use the cache it makes
2013-06-21 11:12:21 +02:00
David Monllao
50eeae5906
MDL-40033 behat: Waiting until file manager is available
2013-06-21 15:37:33 +08:00
Dan Poltawski
0ea73a5524
Merge branch 'fix_classloading8' of git://github.com/skodak/moodle
2013-06-19 15:47:08 +08:00
Petr Škoda
1652aa9cdd
MDL-39854 fix borked core_component cache
2013-06-19 09:42:05 +02:00
Dan Poltawski
846f6fbe00
MDL-33955 filelib: accept any HTTP 1.0 in tests
...
This is common with proxies like squid which don't support http
pipelining.
2013-06-19 14:55:35 +08:00
David Monllao
1d4ae19d62
MDL-39854 disable component cachin in BEHAT_TEST
2013-06-19 11:28:32 +08:00
Sam Hemelryk
80b3780a53
Revert "MDL-38555 forms: Prevent same data submission multiple times."
...
This reverts commit 761670208a97c0ed7e1ff7c2e6a7ec5494eb93d3.
2013-06-19 13:45:46 +12:00
Sam Hemelryk
9d109ad60d
Merge branch 'w25_MDL-33955_m26_curlredir' of git://github.com/skodak/moodle
2013-06-19 09:13:30 +12:00
Eloy Lafuente (stronk7)
d745d2d45e
MDL-40103 Now xmldb code matches original templates 100%
...
There were still some differences between the php code
used in the issue and the php code generated by the
xmldb editor for the template tables. This commit put
both 100% in sync.
2013-06-18 15:22:51 +02:00
Russell Smith
2412371efd
MDL-40103 stats: correct incorrectly copied stats tables.
2013-06-18 12:16:38 +02:00
Petr Škoda
04a4b97f99
MDL-39854 disable component caching in BEHAT_UTIL
2013-06-18 12:02:07 +02:00
Petr Škoda
402a974e5e
MDL-39854 fix get_list_of_plugins() test
2013-06-18 11:46:44 +02:00
Petr Škoda
7f86a95f30
MDL-39854 fix test_finder regression
2013-06-18 10:37:04 +02:00
Petr Škoda
299e107e97
MDL-39854 use class loader in editor_tinymce
2013-06-18 09:10:17 +02:00
Petr Škoda
9e19a0f08b
MDL-39854 reimplement Frankenstyle support and enable classloader
...
Better performance, more reliable, completely self contained,
more validation and full backwards compatibility.
This will also allow us to implement ignoring of plugins.
2013-06-18 09:10:07 +02:00
Dan Poltawski
3d164e1ef4
Revert "MDL-39474 Library: Make a fast way to check developer debug mode"
...
There were multiple problems discovered.
This reverts commit 5c92e7a740fbce4184cf204a11ebbb6b918a376b.
Conflicts:
admin/cli/install.php
2013-06-18 15:07:22 +08:00
Ankit Agarwal
fbf4acdc9e
MDL-39153 libraries: role_unassign doesn't accept context as parameter. Fixing incorrect doc.
2013-06-18 14:27:30 +08:00
Marina Glancy
da107ae428
Merge branch 'MDL-40207-master' of git://github.com/danpoltawski/moodle
2013-06-18 15:36:42 +10:00
Dan Poltawski
c0fb582c58
Merge branch 'MDL-39339_master' of https://github.com/pauln/moodle
2013-06-18 13:10:24 +08:00
Sam Hemelryk
07cfd5e599
Merge branch 'MDL-39152-master' of git://github.com/ankitagarwal/moodle
2013-06-18 15:34:30 +12:00
Sam Hemelryk
36096f0fe9
Merge branch 'MDL-39634_master' of git://github.com/dmonllao/moodle
2013-06-18 14:51:06 +12:00
Sam Hemelryk
044bb690f8
Merge branch 'MDL-39865-master' of git://github.com/FMCorz/moodle
2013-06-18 13:54:39 +12:00
Sam Hemelryk
d35d831190
Merge branch 'MDL-38555-master' of https://github.com/lucisgit/moodle
2013-06-18 11:38:05 +12:00