62030 Commits

Author SHA1 Message Date
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
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
Mary Evans
7f773d0bcd MDL-40255 theme_boxxie/theme_formfactor: Added block-region class to layout files to enable dnd file uploader to work. 2013-06-22 20:34:44 +01:00
Matteo Scaramuccia
243ab45c16 MDL-40200 Administration: Return the invalid user message and stop there
To avoid adding duplicate code, 'invalid user' and 'user deleted' checks
have been merged together.
2013-06-22 09:54:30 +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
Tim Hunt
3f6a09d42d MDL-34610 remove legacy IE CSS. It breaks form layout 2013-06-21 21:57:44 +01:00
Sam Chaffee
41340f0461 MDL-40258: Fixed invalid json string error in file-picker 2013-06-21 11:16:44 -04:00
Michael Aherne
4dd791328e MDL-40275 core Improve documentation for block_base::has_config() 2013-06-21 11:40:36 +01: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
0ea1fbbb55 weekly release 2.6dev 2013-06-21 13:25:42 +08:00
Dan Poltawski
a6ef66d919 fix permissions 2013-06-21 13:24:44 +08:00
Dan Poltawski
ba045b31a7 Merge branch 'install_master' of git://git.moodle.cz/moodle-install 2013-06-21 13:23:21 +08:00
Ankit Agarwal
11f20be783 MDL-40250 phpunit: Add unit tests for core_files_external::upload() 2013-06-21 11:32:02 +08:00
Kyle Temkin
efe677970a MDL-40264 fix essay handling of zero-string response
Fixes an inappropriate behavior of the is_complete_response() function
for the Essay question type, which caused the string "0" to be
inappropriately marked as an incomplete response.

Also adds a set of unit tests for the Essay question type's
is_complete_response.
2013-06-20 19:10:12 -04:00
Tim Gus
74816ad801 MDL-40259 - For SCORM reports limit fields returned from
get_users_by_capability to user ID to decrease memory utilization
2013-06-20 15:48:40 -04:00
Dan Poltawski
e64e28d715 Revert "MDL-33105 flexible apply_units() function"
This reverts commit bf766d43f965d81ff0461026e6f3aba34c0f59b0.
2013-06-20 21:09:36 +08:00
Jason Fowler
a9e9b129e0 MDL-39044 - Course Completion - Replaceing strtolower with multibyte safe textlib::strtolower 2013-06-20 08:56:23 +08:00
Ruslan Kabalin
450fde4e16 MDL-39760: mod_assign: Add few more callback methods.
Adds lock, unlock and release_to_draft. All of them accept single parameter -
an assign_submission record.
2013-06-19 14:51:46 +01: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
11fb83fee8 Merge branch 'MDL-40109_master-fix' of git://github.com/dmonllao/moodle 2013-06-19 14:06:41 +12: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
David Monllao
2532b034f4 MDL-40109 behat: Fixing backup feature 2013-06-19 08:53:08 +08: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