12410 Commits

Author SHA1 Message Date
Eloy Lafuente (stronk7)
cb21d040f4 MDL-20245 grade: added tests for set_user_preference() and the 1333 limit
Added to tests to check that both the "limit" case of using 1333
chars is allowed and 1334 causes coding exception to happen
2011-12-21 16:28:22 +01:00
Eloy Lafuente (stronk7)
52a2306386 MDL-20245 grade: fix version numbers
This commit puts the 22_STABLE and master main
versions back to "on-sync" mode (very first
weeks after major release).
2011-12-21 12:17:22 +01:00
Andrew Davis
8e54ce9717 MDL-20245 grade: increased the length of the user_preferences::value column and added an exception to set_user_preference() is this new length is exceeded
Conflicts:

	lib/db/upgrade.php
	version.php
2011-12-21 12:13:33 +01:00
Sam Hemelryk
cc688de44f Merge branch 'MDL-29239' of git://github.com/rwijaya/moodle 2011-12-21 14:59:54 +13:00
Eloy Lafuente (stronk7)
e968c5f910 MDL-30761 make it work under Oracle. To revisit after MDL-29765 is done. 2011-12-20 22:36:31 +01:00
Eloy Lafuente (stronk7)
311b953168 Merge branch 'w51_MDL-30761_m23_slowmysql' of git://github.com/skodak/moodle 2011-12-20 22:17:21 +01:00
Eloy Lafuente (stronk7)
6920a61669 Merge branch 'MDL-30603_m23' of https://github.com/nebgor/moodle 2011-12-20 19:49:19 +01:00
Eloy Lafuente (stronk7)
2dee0aaf2e Merge branch 'MDL-30739' of git://github.com/stronk7/moodle 2011-12-20 02:23:09 +01:00
Sam Hemelryk
f8882018f2 Merge branch 'w51_MDL-30787_m23_coursemodedit' of git://github.com/skodak/moodle 2011-12-20 12:08:23 +13:00
Eloy Lafuente (stronk7)
961e8f9457 Merge branch 'MDL-30741_master' of git://github.com/jfilip/moodle 2011-12-19 23:59:33 +01:00
Sam Hemelryk
fc0d8f77f2 Merge branch 'wip-MDL-28948-master' of git://github.com/abgreeve/moodle 2011-12-20 10:44:41 +13:00
Sam Hemelryk
042efe1aa7 Merge branch 'w51_MDL-30789_m23_enrolupdatestatus' of git://github.com/skodak/moodle 2011-12-19 16:22:42 +13:00
Petr Skoda
af7177dbcb MDL-30789 add new update_status() method to enrol plugins and improve enrol cache invalidation 2011-12-18 17:30:17 +01:00
Petr Skoda
af18993548 MDL-30787 fix use of module and section edit capabilities 2011-12-18 13:54:38 +01:00
Petr Skoda
e7f2c2cc9f MDL-30761 improve get_user_access_sitewide() performance 2011-12-16 16:27:01 +01:00
Petr Skoda
8a238aee75 MDL-30761 fix simpletest regression caused by rubrics 2011-12-16 14:22:20 +01:00
adrian@moodle.com
98456628a2 MDL-28948 - lib - removed the hard coded key for the rc4encryt function. 2011-12-16 09:17:24 +08:00
Justin Filip
9d6fd25a05 MDL-30741 Adding a new test to check for incorrect parsing of complicate HTML with a PRE tag. 2011-12-15 11:11:35 -05:00
Justin Filip
11ec8c0412 MDL-30741 Fix the handling of PRE tags with the latest code from upstream: http://trac.roundcube.net/browser/trunk/roundcubemail/program/lib/html2text.php?rev=5497 2011-12-15 11:11:31 -05:00
Eloy Lafuente (stronk7)
5cff28cfa1 MDL-30739 add one test to confirm the solution is cross-db 2011-12-15 13:14:26 +01:00
Tim Hunt
6f4c71f5fe MDL-30744 question editing permissions. Update to new accessslib.php code.
I don't believe this will actually fix the reported problem, which I
cannot reproduce, but it should give us much better error messages, at
which point we can fix it.
2011-12-15 11:54:58 +00:00
Eloy Lafuente (stronk7)
5c5ea474c4 MDL-30592 moodlelib: minor phpdocs/debug tweaks 2011-12-14 22:37:40 +01:00
Eloy Lafuente (stronk7)
12727710d4 Merge branch 'MDL-30592' of git://github.com/timhunt/moodle 2011-12-14 22:03:26 +01:00
Eloy Lafuente (stronk7)
f477e8c1ce Merge branch 'wip-MDL-27767-master' of git://github.com/samhemelryk/moodle 2011-12-14 03:16:20 +01:00
Eloy Lafuente (stronk7)
5019c8ebb5 Merge branch 'w51_MDL-30605_m23_env23' of git://github.com/skodak/moodle 2011-12-14 02:37:04 +01:00
Aparup Banerjee
c4378f125b Merge branch 'MDL-30655-master' of git://github.com/sammarshallou/moodle 2011-12-13 13:20:21 +08:00
Petr Skoda
62988bf0bb MDL-30575 more mail header cleanup 2011-12-13 10:23:41 +08:00
Sam Hemelryk
0ebb6ff5b8 Merge branch 'MDL-27143' of git://github.com/timhunt/moodle 2011-12-13 10:25:29 +13:00
Sam Hemelryk
2b9131991f Merge branch 'w51_MDL-30621_m23_protectdir' of git://github.com/skodak/moodle 2011-12-13 10:17:45 +13:00
Petr Skoda
7a7edd21f2 MDL-30621 more dataroot protection 2011-12-12 15:06:47 +01:00
Rossiani Wijaya
8367651ee4 MDL-29239 fixed edit course setting for moodle/course:changesummary permission is set to prevent. 2011-12-12 15:52:13 +08:00
Aparup Banerjee
c45c1e1f20 Merge branch 'w51_MDL-30613_m23_FULLME' of git://github.com/skodak/moodle 2011-12-12 14:36:59 +08:00
Aparup Banerjee
9f26a481ae MDL-30603 synced and renamed incorrect ZF 1.10.6 file and name 2011-12-12 14:21:52 +08:00
Sam Hemelryk
94db939f7c Merge branch 'w51_MDL-30364_m23_report' of git://github.com/skodak/moodle 2011-12-12 17:37:27 +13:00
Sam Hemelryk
0e3e2c82dd Merge branch 'w51_MDL-30415_m23_yui2rollups' of git://github.com/skodak/moodle 2011-12-12 17:29:11 +13:00
Sam Hemelryk
07ae3349fc Merge branch 'w51_MDL-30588_m23_switchrole' of git://github.com/skodak/moodle 2011-12-12 17:10:58 +13:00
Sam Hemelryk
16fdb8d070 Merge branch 'w51_MDL-30659_m23_yuidebug' of git://github.com/skodak/moodle 2011-12-12 16:36:51 +13:00
Eloy Lafuente (stronk7)
43cf3165f1 MDL-28180 backup - take rid of dupes in course_completion_aggr_methd
Conflicts:

	version.php
2011-12-12 00:31:29 +01:00
Petr Skoda
a0b15989e7 MDL-30364 fix user report regressions 2011-12-10 20:18:44 +01:00
Petr Skoda
a1dd2a54e3 MDL-30415 prevent yui2 rollups in debug mode 2011-12-10 19:11:58 +01:00
Petr Skoda
adf0fc0e42 MDL-30621 prevent warnings when creating temp and cache dirs 2011-12-10 17:35:22 +01:00
Petr Skoda
cb664c3a0d MDL-30659 fix use of yui filters 2011-12-10 13:46:15 +01:00
Petr Skoda
7edf3f7e82 MDL-30659 fix phpdocs problems 2011-12-10 13:16:18 +01:00
Petr Skoda
dbd7282ca3 DML-30588 do not require enrollment after switching of roles 2011-12-10 12:44:32 +01:00
Petr Skoda
0126413171 MDL-30610 dev versions should not satisfy version requirements 2011-12-09 21:50:58 +01:00
Petr Skoda
33dca15616 MDL-30613 use standard https checks 2011-12-09 21:28:04 +01:00
Tim Hunt
0019a9b7aa MDL-30592 question_bank: make files in qtext work in the question list. 2011-12-09 19:23:53 +00:00
Tim Hunt
fdb5bc03f5 MDL-30592 quiz statistics, ensure images in the question text appear. 2011-12-09 19:23:46 +00:00
Tim Hunt
8c03be8c71 MDL-30592 moodlelib: new helper component_callback
I chose to be slighly inconsistent with plugin_callback in order to make a nicer API.
2011-12-09 19:23:36 +00:00
Tim Hunt
9d0ac0ffbb MDL-27143 question bank: questions not saved when deleting a category.
Based on a fix by Nikhil Gupta.
2011-12-09 18:03:52 +00:00