Sam Hemelryk
264743baaf
Merge branch 'MDL-19125_module_security' of git://github.com/timhunt/moodle
2012-03-19 10:07:57 +13:00
Tim Hunt
8cb7a6d512
MDL-31594 question manual grading: did not handle comma as decimal.
2012-03-15 18:46:43 +00:00
Tim Hunt
0f0c0228b0
MDL-19125 module restrictions: document change in mod/upgrade.txt
2012-03-15 17:13:54 +00:00
Tim Hunt
88eca3cd26
MDL-19125 module restrictions: addinstance capabilities for all mods
2012-03-15 17:13:43 +00:00
Tim Hunt
9665ecd275
MDL-19125 module restrictions: use a capability
...
1. This used to use a complex legacy system which was buggy.
2. It now relies on a new mod/...:addinstance capability for each module.
3. All the legacy code has been stripped out.
4. Old restriction data is upgraded by creating the necessary permission
overrides. Similarly, when old backups are restored, the old settings
are converted to be overrides.
5. The required addinstance capabilities will be added as a separate
commit.
6. There is a developer debug warning about modules that are missing the
addinstance capability, unless they are MOD_ARCHETYPE_SYSTEM mods.
2012-03-15 17:11:27 +00:00
Eloy Lafuente (stronk7)
a2b30aa852
weekly release 2.3dev
2012-03-15 11:44:35 +01:00
Eloy Lafuente (stronk7)
ef5d54ffbf
Merge branch 'install_master' of git://github.com/amosbot/moodle
2012-03-15 11:41:55 +01:00
AMOS bot
11bccdfd51
Automatically generated installer lang files
2012-03-15 00:31:47 +00:00
Eloy Lafuente (stronk7)
3e59bbdbb7
Merge branch 'MDL-26243-master' of https://github.com/mackensen/moodle
2012-03-15 00:39:17 +01:00
Jenny Gray
b33e6d8e8b
MDL-31911 admin tools: moved loop after tools admin category created
2012-03-15 00:29:15 +01:00
Eloy Lafuente (stronk7)
7142a75563
MDL-30995 completion: switch one type & name for correctness
2012-03-14 18:14:36 +01:00
Eloy Lafuente (stronk7)
f7acd639a5
MDL-28972 formslib: whitespace fixes
2012-03-14 18:10:24 +01:00
Eloy Lafuente (stronk7)
956d55e638
Merge branch 'MDL-30995' of git://github.com/ankitagarwal/moodle
2012-03-14 18:07:21 +01:00
Ankit Agarwal
f55ff38a1b
MDL-30995 completion: updating PHPdocs as suggested by little smurfs
2012-03-14 14:39:36 +08:00
Sam Hemelryk
4dd2af1270
MDL-28972 formslib: Fixed up variable naming
2012-03-14 14:40:12 +13:00
Sam Hemelryk
00efe93759
Merge branch 'wip-mdl-28972' of git://github.com/rajeshtaneja/moodle
2012-03-14 14:40:07 +13:00
Aparup Banerjee
12b8995749
Merge branch 'MDL-31853_admin_externalpage_setup' of git://github.com/davosmith/moodle
2012-03-14 09:16:27 +08:00
Sam Hemelryk
772685e983
MDl-30616 course: Fixed bug with module subtype links
2012-03-14 13:56:22 +13:00
Sam Hemelryk
652d49ab35
Merge branch 'MDL-29147_insertElementBefore_warning' of git://github.com/davosmith/moodle
2012-03-14 11:52:38 +13:00
Eloy Lafuente (stronk7)
9767526f88
Merge branch 'MDL-30616-master-7' of git://git.luns.net.uk/moodle
2012-03-13 23:40:39 +01:00
Sam Hemelryk
dfcf582c43
Merge branch 'MDL-29440-master' of git://github.com/danpoltawski/moodle
2012-03-14 11:29:52 +13:00
Sam Hemelryk
29a225040c
Merge branch 'MDL-31975_master' of git://github.com/kordan/moodle
2012-03-14 11:23:39 +13:00
Sam Hemelryk
1c1cb8cd9a
Merge branch 'MDL-31169_master' of git://github.com/lazydaisy/moodle
2012-03-14 11:15:13 +13:00
Eloy Lafuente (stronk7)
8ebbe295ab
MDL-31929 minor fixup (the file is plenty, but avoid introducing new ones)
2012-03-13 23:01:59 +01:00
Eloy Lafuente (stronk7)
4c31dfd14a
Merge branch 'wip-MDL-31929-master' of git://github.com/marinaglancy/moodle
2012-03-13 23:01:11 +01:00
Ankit Agarwal
c862e2f450
MDL-28998 libraries: Using default value of 0 for userid during login
2012-03-14 10:51:52 +13:00
Eloy Lafuente (stronk7)
f02702760a
Merge branch 'wip-MDL-27405-m23' of git://github.com/samhemelryk/moodle
2012-03-13 22:35:04 +01:00
Sam Hemelryk
bc40124bfe
MDL-27405 navigation: Fixed up buggy array_merge call
2012-03-14 10:16:34 +13:00
Eloy Lafuente (stronk7)
b39877ef10
Merge branch 'w11_MDL-31790_m23_resetunenrol' of git://github.com/skodak/moodle
2012-03-13 18:13:52 +01:00
Eloy Lafuente (stronk7)
9b89dc4f7d
Merge branch 'MDL-31981' of git://github.com/timhunt/moodle
2012-03-13 18:08:40 +01:00
Andrew Davis
48e03792ca
MDL-31834 message: fixed up some not quite correct usage of moodle/site:readallmessages
2012-03-13 16:44:19 +01:00
Eloy Lafuente (stronk7)
e4db653e3a
Merge branch 'wip-MDL-31175-m23' of git://github.com/samhemelryk/moodle
2012-03-13 16:15:02 +01:00
Eloy Lafuente (stronk7)
65fc03100d
Merge branch 'w11_MDL-31845_m23_dbenrolcat' of git://github.com/skodak/moodle
2012-03-13 13:36:48 +01:00
Eloy Lafuente (stronk7)
7ca5dd85dc
MDL-31718 add a few more tests to check that lens and tags are properly handled
2012-03-13 13:13:31 +01:00
Eloy Lafuente (stronk7)
45c41bdc06
Merge branch 'w11_MDL-31718_m23_shortentext' of git://github.com/skodak/moodle
2012-03-13 12:51:41 +01:00
Petr Skoda
5b8a9d1329
MDL-31790 prevent removing of protected role assignments from subcontexts
2012-03-13 12:30:13 +01:00
Aparup Banerjee
fed36d5077
Merge branch 'MDL-31709_message_get_participants' of git://github.com/andyjdavis/moodle
2012-03-13 16:54:08 +08:00
Aparup Banerjee
66da1ab0ce
Merge branch 'wip-MDL-31838-master' of git://github.com/marinaglancy/moodle
2012-03-13 16:10:19 +08:00
Petr Skoda
35c89e5e87
MDL-31790 fix incorrect capability
2012-03-13 09:09:04 +01:00
Aparup Banerjee
42c8e4d66d
Merge branch 'master_MDL-31942' of git://github.com/danmarsden/moodle
2012-03-13 15:51:53 +08:00
Aparup Banerjee
387fb66fd9
Merge branch 'wip-mdl-27862' of git://github.com/rajeshtaneja/moodle
2012-03-13 15:16:30 +08:00
Aparup Banerjee
1fdd48c37f
MDL-31008 themes : fixed up incorrect css typo
2012-03-13 15:10:41 +08:00
Aparup Banerjee
c20cb1bab1
Merge branch 'wip-mdl-30817' of git://github.com/rajeshtaneja/moodle
2012-03-13 11:45:28 +08:00
Sam Hemelryk
c8c00cee80
MDL-29745 Fixed white space
2012-03-13 16:36:37 +13:00
Sam Hemelryk
a28c6b40fe
Merge branch 'scorm_graph_report' of git://github.com/ankitagarwal/moodle
2012-03-13 16:35:15 +13:00
Aparup Banerjee
f3c5d3102d
Merge branch 'MDL-30867' of git://github.com/rwijaya/moodle
2012-03-13 11:26:42 +08:00
Mary Evans
5e5ebb39cf
MDL-31008 themes : (base theme) reversed MDL-26712 by making dimmed objects grey and added new rule for dimmed activity label text to give 50% transparancy instead
2012-03-13 10:57:16 +08:00
Aparup Banerjee
6a0d8209d1
MDL-31910 Quiz : fixed whitespace
2012-03-13 10:15:05 +08:00
M Kassaei
137d60b66f
MDL-31910 Quiz : Error on Manual Grading report
2012-03-13 10:13:27 +08:00
Aparup Banerjee
e281281b84
Merge branch 'MDL-31935_search_restore_link' of git://github.com/davosmith/moodle
2012-03-13 10:00:33 +08:00