77458d700b
MDL-41630 oauth: Throw exception instead of dying on error
2013-09-06 14:18:29 +08:00
6cef890fbc
weekly release 2.4.5+
2013-08-30 09:39:54 +08:00
8e4c96c519
MDL-41249 assign: Fix incorrect gradingform restore step
...
The mapping in the previous patch was wrong - mod assign uses
the area "submissions" but the itemid is the grade->id not the submission->id.
2013-08-28 16:33:32 +08:00
d8669d5bef
Merge branch 'MDL-41387_m24' of https://github.com/markn86/moodle into MOODLE_24_STABLE
2013-08-27 21:00:52 +02:00
ee3433a44b
Merge branch 'm24_MDL-41410_Move_Comment_To_Appropriate_Place' of https://github.com/scara/moodle into MOODLE_24_STABLE
2013-08-27 19:46:32 +02:00
7d64b40db1
Merge branch 'MDL-41366_24' of git://github.com/timhunt/moodle into MOODLE_24_STABLE
2013-08-27 18:09:54 +08:00
08d19eaeb9
Merge branch 'MDL-41401-24' of git://github.com/danpoltawski/moodle into MOODLE_24_STABLE
2013-08-27 15:08:43 +08:00
e3559db951
MDL-38765 quiz: fix incorrect comment
2013-08-27 13:59:24 +08:00
4c37aadb32
Merge branch 'MDL-38765_24' of git://github.com/timhunt/moodle into MOODLE_24_STABLE
2013-08-27 13:53:09 +08:00
e4e6173568
Merge branch 'MDL-40877-24' of git://github.com/FMCorz/moodle into MOODLE_24_STABLE
2013-08-27 12:50:04 +08:00
58605be7f2
Merge branch 'MDL-40447_M24' of https://github.com/nadavkav/moodle into MOODLE_24_STABLE
2013-08-27 12:29:59 +08:00
9684aab5a2
MDL-37211 Backup: Migrate hard-coded strings to language string for the table header labels on the restore page
2013-08-27 11:58:04 +08:00
4acc7c0106
Merge branch 'wip-MDL-41222-m24' of git://github.com/marinaglancy/moodle into MOODLE_24_STABLE
...
Conflicts:
lib/modinfolib.php
2013-08-27 11:08:14 +08:00
0f567efc8f
Merge branch 'MDL-41291-24' of git://github.com/mr-russ/moodle into MOODLE_24_STABLE
2013-08-26 18:07:11 +08:00
727c220c7a
MDL-41213 filepicker: Version bump for css changes
2013-08-26 16:22:08 +08:00
33fec82b0a
Merge branch '41213-24' of git://github.com/samhemelryk/moodle into MOODLE_24_STABLE
2013-08-26 16:20:47 +08:00
ea6deb7e09
Merge branch 'MDL-35930_m24' of git://github.com/rwijaya/moodle into MOODLE_24_STABLE
2013-08-26 14:56:45 +08:00
433bba6b2f
Merge branch 'MDL-36126_m24' of https://github.com/markn86/moodle into MOODLE_24_STABLE
2013-08-26 14:25:42 +08:00
0534f2dd9b
MDL-36126 backup: ensure the backup_logs message does not exceed the maximum allowed length in the DB
2013-08-26 20:40:46 +08:00
1e27536646
Merge branch 'mdl24_MDL-29004_wiki-fix-images-in-printer-friendly-view' of https://github.com/brki/moodle into MOODLE_24_STABLE
2013-08-26 13:51:21 +08:00
cd118a23e7
Merge branch 'MDL-41249-24' of git://github.com/damyon/moodle into MOODLE_24_STABLE
2013-08-26 13:11:19 +08:00
4e66dc96b3
Merge branch 'wip-MDL-41106-m24' of git://github.com/samhemelryk/moodle into MOODLE_24_STABLE
2013-08-26 09:44:17 +08:00
81ff8adcc5
MDL-36803 tinymce: Version bump for js changes
2013-08-26 09:34:15 +08:00
527b36b905
Merge branch 'MDL-36803-m24' of https://github.com/andrewnicols/moodle into MOODLE_24_STABLE
2013-08-26 09:33:41 +08:00
ab2d7d4f3d
MDL-41291 cache: Use fread to avoid race conditions
2013-08-26 10:51:23 +10:00
426e9c79ac
MDL-41106 cache: several fixes for the session cache.
...
This issue makes several fixes for the session loader and the session store.
* maxsize argument now works for session caches.
* fixed performance hole when interation occurs frequently.
* fixed cache purge bug occuring when multiple caches are defined before being used.
* improved lastaccess handling.
Big thanks to Marina who contributed the following commits:
* Always make sure the elements in cache are sorted so we need to remove only elements in the beginning of array
* Remove expired elements from session store to free memory
* Minor bug fixes
2013-08-26 09:49:57 +12:00
2254ea48a9
MDL-41213 filepicker: corrected outline of selected file dialogue
2013-08-26 08:37:12 +12:00
56f24fadd4
MDL-41249 assign: Restore step missing gradingform mapping
...
Thanks to Matthieu Raggett for the report and the solution.
2013-08-25 21:25:49 +08:00
91b9fb3749
MDL-41410 Caching: move comment to the appropriate place.
...
MDL-38162 fixes the issue about testing the connection to the memcached
daemon, which means testing once the connection to the pool of servers
and not to each of the servers while being added to the pool.
It misses to move the comment to that code too.
2013-08-25 14:17:53 +02:00
95899cab2f
MDL-41401 backup: fix misnamed test method
2013-08-23 15:10:45 +08:00
abb767192f
weekly release 2.4.5+
2013-08-23 10:33:40 +08:00
f0a60c5f2f
MDL-41387 tags: changed character case in string used when deleting a course
2013-08-22 17:40:12 +08:00
ee262fa7f5
Revert "MDL-36044 - Delete Icon ("X") blocks Score numbers, when in RTL mode (mod/assign , Rubrics editor)"
...
This reverts commit 42fabe1e87
2013-08-22 17:36:39 +08:00
c951ff9d39
Merge branch 'wip-MDL-41196-m24' of git://github.com/samhemelryk/moodle into MOODLE_24_STABLE
2013-08-22 11:23:17 +08:00
17f8a9f75f
Merge branch 'MDL-30839-24' of git://github.com/phalacee/moodle into MOODLE_24_STABLE
2013-08-22 11:18:10 +08:00
1b883b8c20
MDL-30839 Accessibility - Focusing on error on submit
2013-08-22 10:53:18 +08:00
fc4f36be11
MDL-41196 phpmailer: fixed unit test detection
2013-08-22 14:46:42 +12:00
5689cb3a27
Merge branch 'MDL-30839-24' of git://github.com/phalacee/moodle into MOODLE_24_STABLE
2013-08-22 10:15:59 +08:00
6050809347
MDL-30839 Fixing extra line breaks in error msg
2013-08-22 09:10:19 +08:00
f08bce9a54
MDL-40996 & MDL-41162 quiz: fix html_writer::div use in 2.4.
2013-08-22 08:26:01 +12:00
67051eb403
MDL-41366 qbehaviour_informationitem fix name capitalisation.
2013-08-21 12:30:06 +01:00
6dc4e89073
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:32 +01:00
5f6877ddee
MDL-41191 mod_forum: avoid DISTINCT on TEXT columns
...
It is not supported by all db engines
2013-08-21 15:48:09 +08:00
381f53e27e
Merge branch 'MDL-30839-24' of git://github.com/phalacee/moodle into MOODLE_24_STABLE
2013-08-21 15:18:03 +08:00
466fb01621
MDL-30839 Fixing extra line breaks in error msg
2013-08-21 15:01:59 +08:00
a8f5f4b6e2
MDL-40877 repository_url: Use textlib functions instead of mb_strlen()
2013-08-21 14:00:40 +08:00
af5e39e1b6
Merge branch 'wip-MDL-36690-m24' of git://github.com/marinaglancy/moodle into MOODLE_24_STABLE
2013-08-21 11:36:40 +08:00
661d4816df
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 13:13:35 +10:00
184309fa55
Merge branch 'wip-MDL-32191-m24' of git://github.com/samhemelryk/moodle into MOODLE_24_STABLE
2013-08-21 10:45:07 +08:00
4bc9eec96f
Merge branch 'MDL-41162_24' of git://github.com/timhunt/moodle into MOODLE_24_STABLE
2013-08-21 12:12:43 +12:00
Frederic Massart