moodle.git
8 years agoweekly release 2.6dev
Damyon Wiese [Fri, 23 Aug 2013 02:31:56 +0000 (10:31 +0800)]
weekly release 2.6dev

8 years agoRevert "MDL-36044 - Delete Icon ("X") blocks Score numbers, when in RTL mode (mod...
Dan Poltawski [Thu, 22 Aug 2013 09:36:16 +0000 (17:36 +0800)]
Revert "MDL-36044 - Delete Icon ("X") blocks Score numbers, when in RTL mode (mod/assign , Rubrics editor)"

This reverts commit 42fabe1e87da7eb9ca5e5f3414402a357babcc3e.

8 years agoMDL-36002 dragdrop: Implement keyboard dragdrop for blocks
Damyon Wiese [Thu, 22 Aug 2013 08:36:08 +0000 (16:36 +0800)]
MDL-36002 dragdrop: Implement keyboard dragdrop for blocks

This is for the NEW block drag and drop code - not the other one :)
All it does it add proper drag handles.

8 years agoRevert "MDL-35380 SCORM: improve check for imsmanifest file and consolidate into...
Damyon Wiese [Thu, 22 Aug 2013 06:11:18 +0000 (14:11 +0800)]
Revert "MDL-35380 SCORM: improve check for imsmanifest file and consolidate into a single function."

This reverts commit 492407e9f734989782e6380c381cfa14a09b1b26.

8 years agoRevert "MDL-40931 useragent: separated user agent functionality into a lib"
Damyon Wiese [Thu, 22 Aug 2013 05:29:46 +0000 (13:29 +0800)]
Revert "MDL-40931 useragent: separated user agent functionality into a lib"

This reverts commit af62237d0e6e27df868d50848f7098f57c103f86.
This reverts commit 87a4194fdcd322d4aee5a6207b55a8da0864da94.
This reverts commit b2c66eb60c01805f26cc791966f05be52af7b406.

Conflicts:

version.php

8 years agoMerge branch 'wip-MDL-41196-m26' of git://github.com/samhemelryk/moodle
Damyon Wiese [Thu, 22 Aug 2013 03:19:55 +0000 (11:19 +0800)]
Merge branch 'wip-MDL-41196-m26' of git://github.com/samhemelryk/moodle

8 years agoMerge branch 'MDL-30839-master' of git://github.com/phalacee/moodle
Dan Poltawski [Thu, 22 Aug 2013 03:17:49 +0000 (11:17 +0800)]
Merge branch 'MDL-30839-master' of git://github.com/phalacee/moodle

8 years agoMDL-30839 Accessibility - Focusing on error on submit
Jason Fowler [Thu, 22 Aug 2013 02:54:19 +0000 (10:54 +0800)]
MDL-30839 Accessibility - Focusing on error on submit

8 years agoMDL-41196 phpmailer: fixed unit test detection
Sam Hemelryk [Thu, 22 Aug 2013 02:46:26 +0000 (14:46 +1200)]
MDL-41196 phpmailer: fixed unit test detection

8 years agoMerge branch 'debugdeveloperbitwisemess' of git://github.com/skodak/moodle
Dan Poltawski [Thu, 22 Aug 2013 02:40:47 +0000 (10:40 +0800)]
Merge branch 'debugdeveloperbitwisemess' of git://github.com/skodak/moodle

8 years agoMerge branch 'MDL-41125-master' of git://github.com/FMCorz/moodle
Dan Poltawski [Thu, 22 Aug 2013 02:32:54 +0000 (10:32 +0800)]
Merge branch 'MDL-41125-master' of git://github.com/FMCorz/moodle

8 years agoMerge branch 'MDL-30839-master' of git://github.com/phalacee/moodle
Dan Poltawski [Thu, 22 Aug 2013 02:14:21 +0000 (10:14 +0800)]
Merge branch 'MDL-30839-master' of git://github.com/phalacee/moodle

8 years agoMerge branch 'MDL-39980' of git://github.com/timhunt/moodle
Dan Poltawski [Thu, 22 Aug 2013 02:04:55 +0000 (10:04 +0800)]
Merge branch 'MDL-39980' of git://github.com/timhunt/moodle

8 years agoMDL-41125 forum: Missing include of repository lib
Frederic Massart [Thu, 22 Aug 2013 01:50:05 +0000 (09:50 +0800)]
MDL-41125 forum: Missing include of repository lib

8 years agoMDL-30839 Fixing extra line breaks in error msg
Jason Fowler [Wed, 21 Aug 2013 06:58:50 +0000 (14:58 +0800)]
MDL-30839 Fixing extra line breaks in error msg

8 years agoMDL-39474 add set_debugging() tests
Petr Škoda [Wed, 21 Aug 2013 13:40:09 +0000 (15:40 +0200)]
MDL-39474 add set_debugging() tests

8 years agoMDL-39474 fix incorrect bitwise ops when setting $CFG->debugdeveloper
Petr Škoda [Wed, 21 Aug 2013 11:38:33 +0000 (13:38 +0200)]
MDL-39474 fix incorrect bitwise ops when setting $CFG->debugdeveloper

8 years agoMDL-39980 essay attempt-on-last. Handle the no-files case.
Tim Hunt [Wed, 21 Aug 2013 10:53:23 +0000 (11:53 +0100)]
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.

8 years agoMerge branch 'MDL-41191-duplicaterecords' of git://github.com/danpoltawski/moodle
Damyon Wiese [Wed, 21 Aug 2013 07:43:23 +0000 (15:43 +0800)]
Merge branch 'MDL-41191-duplicaterecords' of git://github.com/danpoltawski/moodle

8 years agoMerge branch 'MDL-30839-master' of git://github.com/phalacee/moodle
Dan Poltawski [Wed, 21 Aug 2013 07:17:44 +0000 (15:17 +0800)]
Merge branch 'MDL-30839-master' of git://github.com/phalacee/moodle

8 years agoMDL-30839 Fixing extra line breaks in error msg
Jason Fowler [Wed, 21 Aug 2013 06:58:50 +0000 (14:58 +0800)]
MDL-30839 Fixing extra line breaks in error msg

8 years agoMDL-41191 mod_forum: avoid DISTINCT on TEXT columns
Dan Poltawski [Wed, 21 Aug 2013 06:33:44 +0000 (14:33 +0800)]
MDL-41191 mod_forum: avoid DISTINCT on TEXT columns

It is not supported by all db engines

8 years agoMDL-41191 add more test data to trigger duplicate course records
Dan Poltawski [Wed, 21 Aug 2013 06:17:12 +0000 (14:17 +0800)]
MDL-41191 add more test data to trigger duplicate course records

8 years agoMDL-41057 csslib: Adding a version bump to clear css caches
Damyon Wiese [Wed, 21 Aug 2013 06:05:43 +0000 (14:05 +0800)]
MDL-41057 csslib: Adding a version bump to clear css caches

8 years agoMerge branch 'wip-MDL-41057-m26' of git://github.com/samhemelryk/moodle
Damyon Wiese [Wed, 21 Aug 2013 06:05:13 +0000 (14:05 +0800)]
Merge branch 'wip-MDL-41057-m26' of git://github.com/samhemelryk/moodle

8 years agoRevert "MDL-39876 Change get_record('course') calls to get_course"
Damyon Wiese [Wed, 21 Aug 2013 05:42:30 +0000 (13:42 +0800)]
Revert "MDL-39876 Change get_record('course') calls to get_course"

This reverts commit ab7632b74c331540c90229bf03d13aa2e6bdd9be.

8 years agoMerge branch 'MDL-41143-master' of git://github.com/FMCorz/moodle
Dan Poltawski [Wed, 21 Aug 2013 05:40:23 +0000 (13:40 +0800)]
Merge branch 'MDL-41143-master' of git://github.com/FMCorz/moodle

8 years agoMerge branch 'MDL-41040-master' of git://github.com/FMCorz/moodle
Dan Poltawski [Wed, 21 Aug 2013 05:36:02 +0000 (13:36 +0800)]
Merge branch 'MDL-41040-master' of git://github.com/FMCorz/moodle

8 years agoMDL-41143 course: Missing formslib required for constant use
Frederic Massart [Wed, 21 Aug 2013 05:31:59 +0000 (13:31 +0800)]
MDL-41143 course: Missing formslib required for constant use

8 years agoMerge branch 'master_MDL-35380' of git://github.com/danmarsden/moodle
Damyon Wiese [Wed, 21 Aug 2013 03:38:37 +0000 (11:38 +0800)]
Merge branch 'master_MDL-35380' of git://github.com/danmarsden/moodle

8 years agoMerge branch 'wip-MDL-36690-master' of git://github.com/marinaglancy/moodle
Dan Poltawski [Wed, 21 Aug 2013 03:35:27 +0000 (11:35 +0800)]
Merge branch 'wip-MDL-36690-master' of git://github.com/marinaglancy/moodle

8 years agoRevert "MDL-39876 update_course_record function to update global COURSE"
Sam Hemelryk [Wed, 21 Aug 2013 03:11:59 +0000 (15:11 +1200)]
Revert "MDL-39876 update_course_record function to update global COURSE"

This reverts commit c290ac5510ca06b3eae557c2165c2f106dde46aa.

Conflicts:
course/lib.php

8 years agoMerge branch 'wip-MDL-32191-m26' of git://github.com/samhemelryk/moodle
Dan Poltawski [Wed, 21 Aug 2013 02:44:04 +0000 (10:44 +0800)]
Merge branch 'wip-MDL-32191-m26' of git://github.com/samhemelryk/moodle

8 years agoMDL-36690 Do not cache objects inside course.modinfo as they may fail to serialize
Marina Glancy [Wed, 7 Aug 2013 03:46:08 +0000 (13:46 +1000)]
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

8 years agoMDL-41040 event: Level property uses defined event constants
Frederic Massart [Fri, 16 Aug 2013 03:20:21 +0000 (11:20 +0800)]
MDL-41040 event: Level property uses defined event constants

8 years agoMerge branch 'wip-MDL-40830-master' of git://github.com/marinaglancy/moodle
Sam Hemelryk [Wed, 21 Aug 2013 01:17:37 +0000 (13:17 +1200)]
Merge branch 'wip-MDL-40830-master' of git://github.com/marinaglancy/moodle

8 years agoMerge branch 'MDL-32324' of git://github.com/timhunt/moodle
Marina Glancy [Wed, 21 Aug 2013 00:28:47 +0000 (10:28 +1000)]
Merge branch 'MDL-32324' of git://github.com/timhunt/moodle

8 years agoMerge branch 'MDL-41162' of git://github.com/timhunt/moodle
Sam Hemelryk [Wed, 21 Aug 2013 00:13:34 +0000 (12:13 +1200)]
Merge branch 'MDL-41162' of git://github.com/timhunt/moodle

8 years agoMerge branch 'MDL-39876-master' of git://github.com/sammarshallou/moodle
Sam Hemelryk [Wed, 21 Aug 2013 00:08:46 +0000 (12:08 +1200)]
Merge branch 'MDL-39876-master' of git://github.com/sammarshallou/moodle

Conflicts:
course/lib.php

8 years agoMerge branch 'wip-mdl-40042' of git://github.com/rajeshtaneja/moodle
Marina Glancy [Wed, 21 Aug 2013 00:02:41 +0000 (10:02 +1000)]
Merge branch 'wip-mdl-40042' of git://github.com/rajeshtaneja/moodle

8 years agoMDL-40931 useragent: converted useragent calls in ajaxenabled
Sam Hemelryk [Tue, 20 Aug 2013 21:06:43 +0000 (09:06 +1200)]
MDL-40931 useragent: converted useragent calls in ajaxenabled

8 years agoRevert "MDL-41258 Forum: Add additional unit tests for forum digest settings"
Sam Hemelryk [Tue, 20 Aug 2013 23:03:35 +0000 (11:03 +1200)]
Revert "MDL-41258 Forum: Add additional unit tests for forum digest settings"

This reverts commit 0ef6f6860debcc2a5b67fecaeb57256377436b6b.

8 years agoMerge branch 'master_MDL-41144' of git://github.com/danmarsden/moodle
Sam Hemelryk [Tue, 20 Aug 2013 23:01:51 +0000 (11:01 +1200)]
Merge branch 'master_MDL-41144' of git://github.com/danmarsden/moodle

8 years agoMerge branch 'MDL-41159-master' of git://github.com/damyon/moodle
Sam Hemelryk [Tue, 20 Aug 2013 22:56:00 +0000 (10:56 +1200)]
Merge branch 'MDL-41159-master' of git://github.com/damyon/moodle

Conflicts:
theme/bootstrapbase/style/moodle.css

8 years agoMerge branch 'MDL-41157-master' of git://github.com/danpoltawski/moodle
Sam Hemelryk [Tue, 20 Aug 2013 22:48:02 +0000 (10:48 +1200)]
Merge branch 'MDL-41157-master' of git://github.com/danpoltawski/moodle

8 years agoMerge branch 'MDL-41210-master' of git://github.com/FMCorz/moodle
Sam Hemelryk [Tue, 20 Aug 2013 22:21:04 +0000 (10:21 +1200)]
Merge branch 'MDL-41210-master' of git://github.com/FMCorz/moodle

8 years agoMerge branch 'MDL-41209-master' of git://github.com/FMCorz/moodle
Sam Hemelryk [Tue, 20 Aug 2013 22:09:08 +0000 (10:09 +1200)]
Merge branch 'MDL-41209-master' of git://github.com/FMCorz/moodle

8 years agoMerge branch 'MDL-41258-m' of git://github.com/andrewnicols/moodle
Sam Hemelryk [Tue, 20 Aug 2013 21:59:19 +0000 (09:59 +1200)]
Merge branch 'MDL-41258-m' of git://github.com/andrewnicols/moodle

8 years agoMerge branch 'MDL-41196-m' of git://github.com/andrewnicols/moodle
Sam Hemelryk [Tue, 20 Aug 2013 21:56:16 +0000 (09:56 +1200)]
Merge branch 'MDL-41196-m' of git://github.com/andrewnicols/moodle

8 years agoMerge branch 'MDL-41143-master' of git://github.com/FMCorz/moodle
Dan Poltawski [Tue, 20 Aug 2013 10:21:17 +0000 (18:21 +0800)]
Merge branch 'MDL-41143-master' of git://github.com/FMCorz/moodle

Conflicts:
version.php

8 years agoMerge branch 'MDL-41136-master' of git://github.com/FMCorz/moodle
Dan Poltawski [Tue, 20 Aug 2013 09:51:18 +0000 (17:51 +0800)]
Merge branch 'MDL-41136-master' of git://github.com/FMCorz/moodle

8 years agoMDL-41143 mod_forum: Prevent unnessary loading of formslib
Frederic Massart [Mon, 12 Aug 2013 07:24:26 +0000 (15:24 +0800)]
MDL-41143 mod_forum: Prevent unnessary loading of formslib

8 years agoMerge branch 'MDL-41125-master' of git://github.com/FMCorz/moodle
Dan Poltawski [Tue, 20 Aug 2013 09:10:05 +0000 (17:10 +0800)]
Merge branch 'MDL-41125-master' of git://github.com/FMCorz/moodle

8 years agoMerge branch 'w33_MDL-41094_m26_purgecleanup' of https://github.com/skodak/moodle
Dan Poltawski [Tue, 20 Aug 2013 09:03:47 +0000 (17:03 +0800)]
Merge branch 'w33_MDL-41094_m26_purgecleanup' of https://github.com/skodak/moodle

8 years agoMDL-40931 useragentlib: Removed unused class variable + version fix
Damyon Wiese [Tue, 20 Aug 2013 08:48:18 +0000 (16:48 +0800)]
MDL-40931 useragentlib: Removed unused class variable + version fix

8 years agoMerge branch 'wip-MDL-40931-m26' of git://github.com/samhemelryk/moodle
Damyon Wiese [Tue, 20 Aug 2013 08:45:33 +0000 (16:45 +0800)]
Merge branch 'wip-MDL-40931-m26' of git://github.com/samhemelryk/moodle

8 years agoMerge branch 'MDL-41211-master' of git://github.com/FMCorz/moodle
Dan Poltawski [Tue, 20 Aug 2013 08:44:09 +0000 (16:44 +0800)]
Merge branch 'MDL-41211-master' of git://github.com/FMCorz/moodle

8 years agoMerge branch 'MDL-39770_chat' of https://github.com/andyjdavis/moodle
Dan Poltawski [Tue, 20 Aug 2013 08:34:18 +0000 (16:34 +0800)]
Merge branch 'MDL-39770_chat' of https://github.com/andyjdavis/moodle

8 years agoMerge branch 'MDL-41191-master' of git://github.com/danpoltawski/moodle
Damyon Wiese [Tue, 20 Aug 2013 08:13:55 +0000 (16:13 +0800)]
Merge branch 'MDL-41191-master' of git://github.com/danpoltawski/moodle

8 years agoMerge branch 'MDL-40709-master' of git://github.com/danpoltawski/moodle
Damyon Wiese [Tue, 20 Aug 2013 08:10:49 +0000 (16:10 +0800)]
Merge branch 'MDL-40709-master' of git://github.com/danpoltawski/moodle

8 years agoMerge branch 'w33_MDL-40952_m26_opcacheunit' of https://github.com/skodak/moodle
Dan Poltawski [Tue, 20 Aug 2013 08:07:12 +0000 (16:07 +0800)]
Merge branch 'w33_MDL-40952_m26_opcacheunit' of https://github.com/skodak/moodle

8 years agoMerge branch 'MDL-41071-master' of git://github.com/FMCorz/moodle
Damyon Wiese [Tue, 20 Aug 2013 08:01:12 +0000 (16:01 +0800)]
Merge branch 'MDL-41071-master' of git://github.com/FMCorz/moodle

8 years agoMDL-39957 course: added missing assertions for events
Mark Nelson [Tue, 20 Aug 2013 07:42:12 +0000 (15:42 +0800)]
MDL-39957 course: added missing assertions for events

This occurred when an add_to_log call, with no associated legacy event,
was replaced with a new event. We should still call assertEventLegacyData
even though there is no legacy event data to compare with, simply ensure
that the expected data was passed.

8 years agoMDL-40038 files: Removed commented code from unit test
Damyon Wiese [Tue, 20 Aug 2013 07:52:11 +0000 (15:52 +0800)]
MDL-40038 files: Removed commented code from unit test

8 years agoMerge branch 'wip-MDL-40038-master' of git://github.com/abgreeve/moodle
Damyon Wiese [Tue, 20 Aug 2013 07:51:57 +0000 (15:51 +0800)]
Merge branch 'wip-MDL-40038-master' of git://github.com/abgreeve/moodle

Conflicts:
files/tests/externallib_test.php

8 years agoMerge branch 'w33_MDL-41112_m26_cachedist' of https://github.com/skodak/moodle
Damyon Wiese [Tue, 20 Aug 2013 07:22:34 +0000 (15:22 +0800)]
Merge branch 'w33_MDL-41112_m26_cachedist' of https://github.com/skodak/moodle

8 years agoMerge branch 'wip-MDL-40974-m26' of git://github.com/samhemelryk/moodle
Dan Poltawski [Tue, 20 Aug 2013 07:13:02 +0000 (15:13 +0800)]
Merge branch 'wip-MDL-40974-m26' of git://github.com/samhemelryk/moodle

8 years agoMDL-38197 tool_generator: fix use of raw LIKE sql
Dan Poltawski [Tue, 20 Aug 2013 06:53:57 +0000 (14:53 +0800)]
MDL-38197 tool_generator: fix use of raw LIKE sql

8 years agoMerge branch 'MDL-38197-master' of git://github.com/sammarshallou/moodle
Dan Poltawski [Tue, 20 Aug 2013 06:55:07 +0000 (14:55 +0800)]
Merge branch 'MDL-38197-master' of git://github.com/sammarshallou/moodle

8 years agoMerge branch 'MDL-40162_master' of https://github.com/totara/openbadges
Damyon Wiese [Tue, 20 Aug 2013 06:45:34 +0000 (14:45 +0800)]
Merge branch 'MDL-40162_master' of https://github.com/totara/openbadges

8 years agoMerge branch 'wip-mdl-40043' of git://github.com/rajeshtaneja/moodle
Damyon Wiese [Tue, 20 Aug 2013 06:40:42 +0000 (14:40 +0800)]
Merge branch 'wip-mdl-40043' of git://github.com/rajeshtaneja/moodle

Conflicts:
course/tests/courselib_test.php
lang/en/moodle.php

8 years agoMDL-39800 tags: moved cloud sorting to print function
Jenny Gray [Mon, 29 Jul 2013 11:25:31 +0000 (12:25 +0100)]
MDL-39800 tags: moved cloud sorting to print function

8 years agoMDL-39800 tags: Applied weight and ordering fix on all more page options
Jenny Gray [Mon, 8 Jul 2013 14:16:51 +0000 (15:16 +0100)]
MDL-39800 tags: Applied weight and ordering fix on all more page options

Also:
Fixed weight and ordering on more page show=all
Fixed weight and ordering on more page show=my
rationalised tag_print_cloud lines now identical

8 years agoMDL-39800 tags: resolved weighting in block content
Jenny Gray [Mon, 8 Jul 2013 13:49:15 +0000 (14:49 +0100)]
MDL-39800 tags: resolved weighting in block content

8 years agoMerge branch 'wip-MDL-37674-m26' of git://github.com/samhemelryk/moodle
Dan Poltawski [Tue, 20 Aug 2013 06:21:38 +0000 (14:21 +0800)]
Merge branch 'wip-MDL-37674-m26' of git://github.com/samhemelryk/moodle

8 years agoMDL-40043 Events API: Added user_loggedinas event to replace add_to_log
Rajesh Taneja [Wed, 14 Aug 2013 07:43:17 +0000 (15:43 +0800)]
MDL-40043 Events API: Added user_loggedinas event to replace add_to_log

8 years agoMDL-40043 Events API: Added course_section_updated event to replace add_to_log
Rajesh Taneja [Wed, 14 Aug 2013 02:14:51 +0000 (10:14 +0800)]
MDL-40043 Events API: Added course_section_updated event to replace add_to_log

8 years agoMerge branch 'MDL-27595-2' of https://github.com/bostelm/moodle
Damyon Wiese [Tue, 20 Aug 2013 05:31:16 +0000 (13:31 +0800)]
Merge branch 'MDL-27595-2' of https://github.com/bostelm/moodle

8 years agoMerge branch 'MDL-41036' of git://github.com/timhunt/moodle
Damyon Wiese [Tue, 20 Aug 2013 04:55:31 +0000 (12:55 +0800)]
Merge branch 'MDL-41036' of git://github.com/timhunt/moodle

8 years agoMerge branch 'MDL-39957_master' of https://github.com/markn86/moodle
Dan Poltawski [Tue, 20 Aug 2013 04:38:08 +0000 (12:38 +0800)]
Merge branch 'MDL-39957_master' of https://github.com/markn86/moodle

8 years agoMerge branch 'MDL-41122_master' of git://github.com/kastashov/moodle
Damyon Wiese [Tue, 20 Aug 2013 04:28:00 +0000 (12:28 +0800)]
Merge branch 'MDL-41122_master' of git://github.com/kastashov/moodle

8 years agoMerge branch 'MDL-39956-master' of git://github.com/FMCorz/moodle
Damyon Wiese [Tue, 20 Aug 2013 04:21:04 +0000 (12:21 +0800)]
Merge branch 'MDL-39956-master' of git://github.com/FMCorz/moodle

8 years agoMerge branch 'MDL-36002-master' of git://github.com/damyon/moodle
Dan Poltawski [Tue, 20 Aug 2013 04:17:16 +0000 (12:17 +0800)]
Merge branch 'MDL-36002-master' of git://github.com/damyon/moodle

Conflicts:
theme/bootstrapbase/style/moodle.css

8 years agoMerge branch 'w33_MDL-39474_m26_debugdeveloper' of https://github.com/skodak/moodle
Dan Poltawski [Tue, 20 Aug 2013 03:42:03 +0000 (11:42 +0800)]
Merge branch 'w33_MDL-39474_m26_debugdeveloper' of https://github.com/skodak/moodle

Conflicts:
lib/upgrade.txt

8 years agoMerge branch 'MDL-38203' of git://github.com/timhunt/moodle
Dan Poltawski [Tue, 20 Aug 2013 03:28:39 +0000 (11:28 +0800)]
Merge branch 'MDL-38203' of git://github.com/timhunt/moodle

8 years agoMerge branch 'WIP-MDL-36044-master' of git://github.com/nadavkav/moodle
Dan Poltawski [Tue, 20 Aug 2013 03:07:53 +0000 (11:07 +0800)]
Merge branch 'WIP-MDL-36044-master' of git://github.com/nadavkav/moodle

8 years agoMerge branch 'MDL-39236-master' of git://github.com/nadavkav/moodle
Dan Poltawski [Tue, 20 Aug 2013 02:59:31 +0000 (10:59 +0800)]
Merge branch 'MDL-39236-master' of git://github.com/nadavkav/moodle

8 years agoMerge branch 'MDL-39980' of git://github.com/timhunt/moodle
Dan Poltawski [Tue, 20 Aug 2013 02:47:45 +0000 (10:47 +0800)]
Merge branch 'MDL-39980' of git://github.com/timhunt/moodle

8 years agoMerge branch 'MDL-30839-master' of git://github.com/phalacee/moodle
Dan Poltawski [Mon, 19 Aug 2013 09:40:37 +0000 (17:40 +0800)]
Merge branch 'MDL-30839-master' of git://github.com/phalacee/moodle

8 years agoMDL-36002 keyboard drag drop: Hidden activities and labels
Damyon Wiese [Mon, 19 Aug 2013 08:18:23 +0000 (16:18 +0800)]
MDL-36002 keyboard drag drop: Hidden activities and labels

Get the correct title for hidden activities and labels.

8 years agoMerge branch 'master_MDL-39572' of https://github.com/totara/moodle
Damyon Wiese [Mon, 19 Aug 2013 07:42:17 +0000 (15:42 +0800)]
Merge branch 'master_MDL-39572' of https://github.com/totara/moodle

8 years agoMerge branch 'MDL-40896' of git://github.com/timhunt/moodle
Damyon Wiese [Mon, 19 Aug 2013 07:38:23 +0000 (15:38 +0800)]
Merge branch 'MDL-40896' of git://github.com/timhunt/moodle

Conflicts:
theme/bootstrapbase/style/moodle.css

8 years agoRevert "MDL-41106 cache: several fixes for the session cache."
Damyon Wiese [Mon, 19 Aug 2013 07:31:24 +0000 (15:31 +0800)]
Revert "MDL-41106 cache: several fixes for the session cache."

This reverts commit 89182546a0ae93a2aef79383bac902c77c7801f8.
This reverts commit 170b05362a82b2c1f5353551b7bd6fe4246fe951.
This reverts commit 2e9d5a534e8e3045923055baa1609d66cec0affe.

8 years agoMerge branch 'MDL-40893-master' of https://github.com/mr-russ/moodle
Dan Poltawski [Mon, 19 Aug 2013 06:50:01 +0000 (14:50 +0800)]
Merge branch 'MDL-40893-master' of https://github.com/mr-russ/moodle

8 years agoMerge branch 'wip-MDL-41106-m26' of git://github.com/samhemelryk/moodle
Damyon Wiese [Mon, 19 Aug 2013 05:50:46 +0000 (13:50 +0800)]
Merge branch 'wip-MDL-41106-m26' of git://github.com/samhemelryk/moodle

8 years agoMerge branch 'wip-MDL-36789-master' of git://github.com/marinaglancy/moodle
Damyon Wiese [Mon, 19 Aug 2013 05:29:55 +0000 (13:29 +0800)]
Merge branch 'wip-MDL-36789-master' of git://github.com/marinaglancy/moodle

8 years agoMerge branch 'MDL-39703_master' of https://github.com/nadavkav/moodle
Dan Poltawski [Mon, 19 Aug 2013 05:08:10 +0000 (13:08 +0800)]
Merge branch 'MDL-39703_master' of https://github.com/nadavkav/moodle

8 years agoMerge branch 'master_MDL-37393' of github.com:danmarsden/moodle
Dan Poltawski [Mon, 19 Aug 2013 04:57:34 +0000 (12:57 +0800)]
Merge branch 'master_MDL-37393' of github.com:danmarsden/moodle

8 years agoMDL-39770 mod_chat: improved the chat experience on small screens
Andrew Davis [Mon, 24 Jun 2013 13:36:43 +0000 (21:36 +0800)]
MDL-39770 mod_chat: improved the chat experience on small screens

8 years agoMDL-30839 Accessibility, Forms - Improve accessibility or error messages
Jason Fowler [Mon, 12 Aug 2013 03:03:53 +0000 (11:03 +0800)]
MDL-30839 Accessibility, Forms - Improve accessibility or error messages