Commit graph

63279 commits

Author SHA1 Message Date
Damyon Wiese
50cb89177e Merge branch 'wip-MDL-41196-m26' of git://github.com/samhemelryk/moodle 2013-08-22 11:19:55 +08:00
Dan Poltawski
52ef7502d6 Merge branch 'MDL-30839-master' of git://github.com/phalacee/moodle 2013-08-22 11:17:49 +08:00
Jason Fowler
72d08bd153 MDL-30839 Accessibility - Focusing on error on submit 2013-08-22 10:54:19 +08:00
Sam Hemelryk
ba214fa54c MDL-41196 phpmailer: fixed unit test detection 2013-08-22 14:46:26 +12:00
Russell Smith
cdd8382b63 MDL-41380 backup: Fix incorrect function name from MDL-40618. 2013-08-22 12:41:51 +10:00
Dan Poltawski
c44ff50cbc Merge branch 'debugdeveloperbitwisemess' of git://github.com/skodak/moodle 2013-08-22 10:40:47 +08:00
Dan Poltawski
d7d2f263dd Merge branch 'MDL-41125-master' of git://github.com/FMCorz/moodle 2013-08-22 10:32:54 +08:00
Dan Poltawski
695969987a Merge branch 'MDL-30839-master' of git://github.com/phalacee/moodle 2013-08-22 10:14:21 +08:00
Dan Poltawski
915a6b4117 Merge branch 'MDL-39980' of git://github.com/timhunt/moodle 2013-08-22 10:04:55 +08:00
Frederic Massart
7fb35af658 MDL-41125 forum: Missing include of repository lib 2013-08-22 09:50:05 +08:00
Jason Fowler
5df7412899 MDL-30839 Fixing extra line breaks in error msg 2013-08-22 09:04:30 +08:00
Petr Škoda
037d673ea9 MDL-39474 add set_debugging() tests 2013-08-21 15:41:35 +02:00
Petr Škoda
ce7b06bcd7 MDL-39474 fix incorrect bitwise ops when setting $CFG->debugdeveloper 2013-08-21 13:38:33 +02:00
Tim Hunt
d629327a14 MDL-39980 essay attempt-on-last. Handle the no-files case.
This slighly changes the format for the way answers are stroed in the DB
in the case where there is some HTML content, but no files. This should
not cause any problems.
2013-08-21 11:56:17 +01:00
Tim Hunt
ad8f011755 MDL-38765 quiz view: fix duplicate message.
The "No more attempts are allowed" message was being shown twice. I
checked back, and it has been like that since before the quiz was
converted to use a renderer. Still, it looks horrible, so changing it.
2013-08-21 10:24:25 +01:00
Dan Marsden
3d1808c6e2 MDL-40122 SCORM: replace SCORM course format with singleactivity 2013-08-21 20:26:06 +12:00
Damyon Wiese
52ec2a60f6 Merge branch 'MDL-41191-duplicaterecords' of git://github.com/danpoltawski/moodle 2013-08-21 15:43:23 +08:00
Dan Poltawski
046514b7a2 Merge branch 'MDL-30839-master' of git://github.com/phalacee/moodle 2013-08-21 15:17:44 +08:00
Jason Fowler
f8a4f2c10e MDL-30839 Fixing extra line breaks in error msg 2013-08-21 14:58:50 +08:00
Dan Poltawski
a9e6a73173 MDL-41191 mod_forum: avoid DISTINCT on TEXT columns
It is not supported by all db engines
2013-08-21 14:38:22 +08:00
Dan Poltawski
72c2c0bb09 MDL-41191 add more test data to trigger duplicate course records 2013-08-21 14:17:12 +08:00
Frederic Massart
e5f9659b79 MDL-40877 repository_url: Use core_text functions instead of mb_strlen() 2013-08-21 14:13:46 +08:00
Damyon Wiese
36719d4ade MDL-41057 csslib: Adding a version bump to clear css caches 2013-08-21 14:05:43 +08:00
Damyon Wiese
1f1bee6fbf Merge branch 'wip-MDL-41057-m26' of git://github.com/samhemelryk/moodle 2013-08-21 14:05:13 +08:00
Damyon Wiese
74df2951d1 Revert "MDL-39876 Change get_record('course') calls to get_course"
This reverts commit ab7632b74c.
2013-08-21 13:42:30 +08:00
Dan Poltawski
a101c7f011 Merge branch 'MDL-41143-master' of git://github.com/FMCorz/moodle 2013-08-21 13:40:23 +08:00
Dan Poltawski
2af95c4b51 Merge branch 'MDL-41040-master' of git://github.com/FMCorz/moodle 2013-08-21 13:36:02 +08:00
Frederic Massart
30905b5bcb MDL-41143 course: Missing formslib required for constant use 2013-08-21 13:31:59 +08:00
Damyon Wiese
90a5a4b620 Merge branch 'master_MDL-35380' of git://github.com/danmarsden/moodle 2013-08-21 11:38:37 +08:00
Dan Poltawski
d99a300563 Merge branch 'wip-MDL-36690-master' of git://github.com/marinaglancy/moodle 2013-08-21 11:35:27 +08:00
Sam Hemelryk
487caf6b65 Revert "MDL-39876 update_course_record function to update global COURSE"
This reverts commit c290ac5510.

Conflicts:
	course/lib.php
2013-08-21 15:21:06 +12:00
Dan Poltawski
c3f5f4ab37 Merge branch 'wip-MDL-32191-m26' of git://github.com/samhemelryk/moodle 2013-08-21 10:44:04 +08:00
Marina Glancy
4fcdb0123c MDL-36690 Do not cache objects inside course.modinfo as they may fail to serialize
convert moodle_url (all other fields are numbers or strings) to string before caching and then back to moodle_url when restoring.
Otherwise serialized modinfo can contain \0 byte which cause problems in Postgres DB
2013-08-21 12:30:38 +10:00
Frederic Massart
38d6fbfa87 MDL-41040 event: Level property uses defined event constants 2013-08-21 10:04:02 +08:00
Sam Hemelryk
c1613ed53a Merge branch 'wip-MDL-40830-master' of git://github.com/marinaglancy/moodle 2013-08-21 13:17:37 +12:00
Marina Glancy
ac6fb0ad17 Merge branch 'MDL-32324' of git://github.com/timhunt/moodle 2013-08-21 10:28:47 +10:00
Sam Hemelryk
2968602ccb Merge branch 'MDL-41162' of git://github.com/timhunt/moodle 2013-08-21 12:13:34 +12:00
Sam Hemelryk
6eee89bc8f Merge branch 'MDL-39876-master' of git://github.com/sammarshallou/moodle
Conflicts:
	course/lib.php
2013-08-21 12:08:46 +12:00
Marina Glancy
e542bc26d9 Merge branch 'wip-mdl-40042' of git://github.com/rajeshtaneja/moodle 2013-08-21 10:02:41 +10:00
Sam Hemelryk
87a4194fdc MDL-40931 useragent: converted useragent calls in ajaxenabled 2013-08-21 09:48:31 +10:00
Mary Evans
cef25b2ac2 MDL-41321 theme_boostrapbase: Add styling to groupinfobox in less/moodle/user.less. 2013-08-21 00:08:20 +01:00
Sam Hemelryk
f79f3c00f8 Revert "MDL-41258 Forum: Add additional unit tests for forum digest settings"
This reverts commit 0ef6f6860d.
2013-08-21 11:03:35 +12:00
Sam Hemelryk
1ef7722cba Merge branch 'master_MDL-41144' of git://github.com/danmarsden/moodle 2013-08-21 11:01:51 +12:00
Andrew Nicols
be94c6d88d MDL-36803 TinyMCE: Fix TinyMCE following touch events on iOS browsers 2013-08-20 23:58:59 +01:00
Sam Hemelryk
b89fbc4615 Merge branch 'MDL-41159-master' of git://github.com/damyon/moodle
Conflicts:
	theme/bootstrapbase/style/moodle.css
2013-08-21 10:56:00 +12:00
Sam Hemelryk
ead9cce340 Merge branch 'MDL-41157-master' of git://github.com/danpoltawski/moodle 2013-08-21 10:48:02 +12:00
Sam Hemelryk
cc76e82d58 Merge branch 'MDL-41210-master' of git://github.com/FMCorz/moodle 2013-08-21 10:21:04 +12:00
Sam Hemelryk
0eb65affd2 Merge branch 'MDL-41209-master' of git://github.com/FMCorz/moodle 2013-08-21 10:09:08 +12:00
Sam Hemelryk
c5bba2fc2d Merge branch 'MDL-41258-m' of git://github.com/andrewnicols/moodle 2013-08-21 09:59:19 +12:00
Sam Hemelryk
93564564e4 Merge branch 'MDL-41196-m' of git://github.com/andrewnicols/moodle 2013-08-21 09:56:16 +12:00