mirror_php/moodle
1
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-03-11 11:19:50 +01:00
Code Issues Projects Releases Wiki Activity
61,908 Commits 36 Branches 523 Tags
Commit Graph

61908 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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)
f0d37f4ac5 weekly release 2.6dev 2013-06-27 20:09:21 +02:00
Eloy Lafuente (stronk7)
20e511a9ac Merge branch 'install_master' of git://git.moodle.cz/moodle-install 2013-06-27 20:04:35 +02:00
AMOS bot
eba177265a Automatically generated installer lang files 2013-06-27 00:40:23 +00: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)
74618f31d2 Merge branch 'w26_MDL-17081_m26_roles2' of git://github.com/skodak/moodle 2013-06-25 16:28:22 +02:00
Petr Škoda
4dd680c74e MDL-17081 allow role reset to self 
The use case is importing of incomplete XML preset - keep current + preset changes. This also discards any pending changes.
 2013-06-25 15:15:46 +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
Petr Škoda
8c6b980803 MDL-17081 fix invalid role XML schema 2013-06-25 10:18:22 +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
Eloy Lafuente (stronk7)
7f5c46db8c Merge branch 'w26_MDL-17081_m26_roles2' of git://github.com/skodak/moodle 2013-06-25 01:42:17 +02:00
Sam Hemelryk
49eef7d82d Merge branch 'wip-MDL-40204_master' of git://github.com/gjb2048/moodle 
Conflicts:
	theme/bootstrapbase/style/moodle.css
 2013-06-25 11:35:57 +12:00
Sam Hemelryk
a1d472d8c6 Merge branch 'MDL-40304_master' of git://github.com/kordan/moodle 2013-06-25 10:59:29 +12:00
Petr Škoda
fcd75b6e6d MDL-17081 store also CAP_INHERIT in role export files 2013-06-25 00:24:55 +02:00
Sam Hemelryk
a0bfe7335b MDL-40289 badges: version bump 2013-06-25 10:06:08 +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)
293aba00b7 Merge branch 'MDL-40264-essay-zero' of git://github.com/ktemkin/moodle 2013-06-24 21:24:00 +02:00
Eloy Lafuente (stronk7)
1d04b481dd Merge branch 'w26_MDL-40254_m26_flatfile' of https://github.com/skodak/moodle 2013-06-24 21:13:01 +02:00
Eloy Lafuente (stronk7)
283dd00b7e Merge branch 'MDL-34610' of git://github.com/timhunt/moodle 2013-06-24 20:21:22 +02:00
Eloy Lafuente (stronk7)
b662b8576d Merge branch 'MDL-40255_master' of git://github.com/lazydaisy/moodle 2013-06-24 19:25:53 +02:00
Eloy Lafuente (stronk7)
75413055d0 Merge branch 'm26_MDL-40200_Notices_When_Viewing_Profile_Invalid_UserId' of https://github.com/scara/moodle 2013-06-24 19:00:33 +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)
4cd8979c42 Merge branch 'MDL-40250-master' of git://github.com/ankitagarwal/moodle 2013-06-24 17:23:29 +02: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
kordan
2c724a63cd MDL-40304 theme_formal_white: improved the compliancy to coding rules in formal_white 2013-06-24 15:36:32 +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
c7b6c86a49 Merge branch 'wip-MDL-39044-master' of git://github.com/phalacee/moodle 2013-06-24 15:43:19 +12: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
4ba45e3955 Merge branch 'MDL-39779' of git://github.com/rwijaya/moodle 2013-06-24 14:43:00 +12:00
Sam Hemelryk
7bb2a9586e Merge branch 'MDL-39760-master' of https://github.com/lucisgit/moodle 2013-06-24 14:30:49 +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
1d713c7c53 Merge branch 'w26_MDL-40294_m26_plugininfo' of https://github.com/skodak/moodle 2013-06-24 11:42:29 +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
45aac51a3c MDL-38376 mod_assign: fixed whitespace 2013-06-24 11:05:51 +12:00
Sam Hemelryk
8448a12a33 Merge branch 'MDL-28124_master' of git://github.com/lazydaisy/moodle 2013-06-24 10:30:19 +12:00
Amanda Doughty
ea698284cf MDL-38376 mod_assign: Feedback displayed when Grade set to hidden 2013-06-24 10:16:04 +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
3748e469fe MDL-40254 ignore flatfile records with no user idnumber 2013-06-23 21:37:56 +02:00
Petr Škoda
490149eb8f MDL-40294 remove references to removed plugin caches 2013-06-23 21:24:15 +02:00
Petr Škoda
a7b0dfd4e2 MDL-40289 fix block_badges capability defaults 2013-06-23 12:33:40 +02: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