moodle.git
8 years agoMerge branch 'MDL-40055-master' of git://github.com/FMCorz/moodle
Dan Poltawski [Mon, 26 Aug 2013 07:09:33 +0000 (15:09 +0800)]
Merge branch 'MDL-40055-master' of git://github.com/FMCorz/moodle

8 years agoMDL-39959: Replace Legacy events - Groups
Frederic Massart [Mon, 19 Aug 2013 08:17:49 +0000 (16:17 +0800)]
MDL-39959: Replace Legacy events - Groups

This combines the following changes:

* Event for group member added
* Event for group member removed
* Event for group created
* Event for grouping created
* Event for group updated
* Event for grouping updated
* Event for group deleted
* Event for grouping deleted
* Adding tests for deleting functions
* Bulk remove of members uses low-level API

    The reason for this is that a bulk event has no value from a logging
    perspective as it is not granular. So now, the API is a bit slower,
    but the information the events contain makes sense, beside this is
    not (and should not be) used very often.

    The reason why the events_trigger_legacy() is kept is because we
    cannot create a new event for this, as we don't encourage developers
    to created bulk events, for the reasons mentioned above.

    I removed the call that gets the user record from the function
    groups_remove_member() as it was not required and only appeared
    to check if the user existed. It appears to be safe not to do
    this check as nothing would fail down the line.

* Bulk unassign of groupings uses low-level API

    As the previous commit, we keep the legacy event for now as it would
    be wrong to create a new event to replace it.

    Also, the code has been changed to call the low-level API to unassign
    groups from groupins, even though at the moment there are no
    events for that function.

* Bulk deletion of groups uses low-level API

    Again, we keep the legacy event because replacing it would force
    us to create a new event that does not make sense. See MDL-41312.

* Bulk deleting of groupings uses low-level API
* Asserting legacy event name in unit tests
* Minor SQL query and code improvements

8 years agoMerge branch 'MDL-35930' of git://github.com/rwijaya/moodle
Dan Poltawski [Mon, 26 Aug 2013 06:55:54 +0000 (14:55 +0800)]
Merge branch 'MDL-35930' of git://github.com/rwijaya/moodle

8 years agoMerge branch '40249-26' of git://github.com/samhemelryk/moodle
Dan Poltawski [Mon, 26 Aug 2013 06:33:06 +0000 (14:33 +0800)]
Merge branch '40249-26' of git://github.com/samhemelryk/moodle

8 years agoMDL-35930 filepicker filemanaer: make announcement on page change when selecting...
Rossiani Wijaya [Mon, 26 Aug 2013 06:30:35 +0000 (14:30 +0800)]
MDL-35930 filepicker filemanaer: make announcement on page change when selecting view files options

8 years agoMerge branch 'MDL-36126_master' of https://github.com/markn86/moodle
Dan Poltawski [Mon, 26 Aug 2013 06:25:20 +0000 (14:25 +0800)]
Merge branch 'MDL-36126_master' of https://github.com/markn86/moodle

8 years agoMDL-40055 mod_assign: Wrong namespace when throwing exception
Frederic Massart [Mon, 26 Aug 2013 06:21:34 +0000 (14:21 +0800)]
MDL-40055 mod_assign: Wrong namespace when throwing exception

8 years agoMDL-40055 mod_assign: Setting level according to new event constants
Frederic Massart [Wed, 21 Aug 2013 06:28:38 +0000 (14:28 +0800)]
MDL-40055 mod_assign: Setting level according to new event constants

8 years agoMDL-40055 mod_assign: get_name() uses get_string() not lang_string
Frederic Massart [Mon, 12 Aug 2013 09:33:07 +0000 (17:33 +0800)]
MDL-40055 mod_assign: get_name() uses get_string() not lang_string

8 years agoMDL-40055 mod_assign: Replace add_to_log 'grade submission'
Frederic Massart [Fri, 9 Aug 2013 07:53:55 +0000 (15:53 +0800)]
MDL-40055 mod_assign: Replace add_to_log 'grade submission'

8 years agoMDL-40055 mod_assign: Replace add_to_log 'unlock submission'
Frederic Massart [Tue, 6 Aug 2013 08:12:48 +0000 (16:12 +0800)]
MDL-40055 mod_assign: Replace add_to_log 'unlock submission'

8 years agoMDL-40055 mod_assign: Replace add_to_log 'submit'
Frederic Massart [Tue, 6 Aug 2013 07:53:29 +0000 (15:53 +0800)]
MDL-40055 mod_assign: Replace add_to_log 'submit'

8 years agoMDL-40055 mod_assign: Replace add_to_log 'submission statement accepted'
Frederic Massart [Tue, 6 Aug 2013 07:44:50 +0000 (15:44 +0800)]
MDL-40055 mod_assign: Replace add_to_log 'submission statement accepted'

8 years agoMDL-40055 mod_assign: Replace add_to_log 'submissioncopied'
Frederic Massart [Tue, 6 Aug 2013 07:14:58 +0000 (15:14 +0800)]
MDL-40055 mod_assign: Replace add_to_log 'submissioncopied'

8 years agoMDL-40055 mod_assign: Replace add_to_log 'set marking workflow state'
Frederic Massart [Tue, 6 Aug 2013 04:41:09 +0000 (12:41 +0800)]
MDL-40055 mod_assign: Replace add_to_log 'set marking workflow state'

8 years agoMDL-40055 mod_assign: Replace add_to_log 'set marking allocation'
Frederic Massart [Tue, 6 Aug 2013 04:38:00 +0000 (12:38 +0800)]
MDL-40055 mod_assign: Replace add_to_log 'set marking allocation'

8 years agoMDL-40055 mod_assign: Replace add_to_log 'revert submission to draft'
Frederic Massart [Tue, 6 Aug 2013 03:29:59 +0000 (11:29 +0800)]
MDL-40055 mod_assign: Replace add_to_log 'revert submission to draft'

8 years agoMDL-40055 mod_assign: Replace add_to_log 'reveal identities'
Frederic Massart [Mon, 5 Aug 2013 10:52:31 +0000 (18:52 +0800)]
MDL-40055 mod_assign: Replace add_to_log 'reveal identities'

8 years agoMDL-40055 mod_assign: Replace add_to_log 'lock submission'
Frederic Massart [Mon, 5 Aug 2013 10:17:05 +0000 (18:17 +0800)]
MDL-40055 mod_assign: Replace add_to_log 'lock submission'

8 years agoMDL-40055 mod_assign: Replace add_to_log 'grant extension'
Frederic Massart [Mon, 5 Aug 2013 09:51:30 +0000 (17:51 +0800)]
MDL-40055 mod_assign: Replace add_to_log 'grant extension'

8 years agoMDL-40055 mod_assign: Replace add_to_log 'download all submissions'
Frederic Massart [Mon, 5 Aug 2013 09:02:20 +0000 (17:02 +0800)]
MDL-40055 mod_assign: Replace add_to_log 'download all submissions'

8 years agoMerge branch 'w35_MDL-41245_m26_pluginuninstall' of https://github.com/skodak/moodle
Damyon Wiese [Mon, 26 Aug 2013 05:59:51 +0000 (13:59 +0800)]
Merge branch 'w35_MDL-41245_m26_pluginuninstall' of https://github.com/skodak/moodle

8 years agoMDL-41245 prevent notices during plugin uninstall
Petr Škoda [Mon, 26 Aug 2013 05:53:45 +0000 (07:53 +0200)]
MDL-41245 prevent notices during plugin uninstall

8 years agoMerge branch 'mdl26_MDL-29004_wiki-fix-images-in-printer-friendly-view' of https...
Damyon Wiese [Mon, 26 Aug 2013 05:50:20 +0000 (13:50 +0800)]
Merge branch 'mdl26_MDL-29004_wiki-fix-images-in-printer-friendly-view' of https://github.com/brki/moodle

8 years agoMDL-41245 fix new addon redirect regression
Petr Škoda [Mon, 26 Aug 2013 05:31:40 +0000 (07:31 +0200)]
MDL-41245 fix new addon redirect regression

8 years agoMerge branch 'MDL-41249-master' of git://github.com/damyon/moodle
Dan Poltawski [Mon, 26 Aug 2013 05:11:04 +0000 (13:11 +0800)]
Merge branch 'MDL-41249-master' of git://github.com/damyon/moodle

8 years agoMerge branch 'MDL-41380-master' of https://github.com/mr-russ/moodle
Damyon Wiese [Mon, 26 Aug 2013 04:42:15 +0000 (12:42 +0800)]
Merge branch 'MDL-41380-master' of https://github.com/mr-russ/moodle

8 years agoMerge branch 'w35_MDL-41022_m26_unittests3' of https://github.com/skodak/moodle
Dan Poltawski [Mon, 26 Aug 2013 04:23:16 +0000 (12:23 +0800)]
Merge branch 'w35_MDL-41022_m26_unittests3' of https://github.com/skodak/moodle

8 years agoMerge branch 'wip-MDL-41106-m26' of git://github.com/samhemelryk/moodle
Damyon Wiese [Mon, 26 Aug 2013 01:43:06 +0000 (09:43 +0800)]
Merge branch 'wip-MDL-41106-m26' of git://github.com/samhemelryk/moodle

8 years agoMDL-36803 tinymce: Version bump for js changes
Damyon Wiese [Mon, 26 Aug 2013 01:29:06 +0000 (09:29 +0800)]
MDL-36803 tinymce: Version bump for js changes

8 years agoMerge branch 'MDL-36803-m' of https://github.com/andrewnicols/moodle
Damyon Wiese [Mon, 26 Aug 2013 01:27:57 +0000 (09:27 +0800)]
Merge branch 'MDL-36803-m' of https://github.com/andrewnicols/moodle

8 years agoMDL-41106 cache: several fixes for the session cache.
Sam Hemelryk [Sun, 25 Aug 2013 21:15:57 +0000 (09:15 +1200)]
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

8 years agoMDL-40249 bootstrap: activity chooser now enabled for bootstrap based themes
Sam Hemelryk [Thu, 22 Aug 2013 20:58:37 +0000 (08:58 +1200)]
MDL-40249 bootstrap: activity chooser now enabled for bootstrap based themes

8 years agoMDL-41249 assign: Restore step missing gradingform mapping
Damyon Wiese [Sun, 25 Aug 2013 13:20:53 +0000 (21:20 +0800)]
MDL-41249 assign: Restore step missing gradingform mapping

Thanks to Matthieu Raggett for the report and the solution.

8 years agoMDL-41022 cleanup core_grade_scale_testcase
Petr Škoda [Sun, 11 Aug 2013 11:34:29 +0000 (13:34 +0200)]
MDL-41022 cleanup core_grade_scale_testcase

8 years agoMDL-41022 cleanup core_grade_item_testcase
Petr Škoda [Sun, 11 Aug 2013 11:32:13 +0000 (13:32 +0200)]
MDL-41022 cleanup core_grade_item_testcase

8 years agoMDL-41022 cleanup core_grade_grade_testcase
Petr Škoda [Sun, 11 Aug 2013 11:28:35 +0000 (13:28 +0200)]
MDL-41022 cleanup core_grade_grade_testcase

8 years agoMDL-41022 cleanup core_grade_category_testcase
Petr Škoda [Sun, 11 Aug 2013 11:27:48 +0000 (13:27 +0200)]
MDL-41022 cleanup core_grade_category_testcase

8 years agoMDL-41022 cleanup core_test_generator_testcase
Petr Škoda [Sun, 11 Aug 2013 11:18:52 +0000 (13:18 +0200)]
MDL-41022 cleanup core_test_generator_testcase

8 years agoMDL-41022 cleanup core_phpunit_basic_testcase
Petr Škoda [Sun, 11 Aug 2013 11:16:36 +0000 (13:16 +0200)]
MDL-41022 cleanup core_phpunit_basic_testcase

8 years agoMDL-41022 cleanup core_phpunit_advanced_testcase
Petr Škoda [Sun, 11 Aug 2013 11:13:52 +0000 (13:13 +0200)]
MDL-41022 cleanup core_phpunit_advanced_testcase

8 years agoMDL-41022 cleanup form tests
Petr Škoda [Sun, 11 Aug 2013 10:41:13 +0000 (12:41 +0200)]
MDL-41022 cleanup form tests

8 years agoMDL-41022 cleanup core_files_zip_packer_testcase
Petr Škoda [Sun, 11 Aug 2013 10:29:49 +0000 (12:29 +0200)]
MDL-41022 cleanup core_files_zip_packer_testcase

8 years agoMDL-41022 cleanup core_files_file_storage_testcase
Petr Škoda [Sun, 11 Aug 2013 10:25:40 +0000 (12:25 +0200)]
MDL-41022 cleanup core_files_file_storage_testcase

8 years agoMDL-41022 cleanup core_external_testcase
Petr Škoda [Sun, 11 Aug 2013 10:19:06 +0000 (12:19 +0200)]
MDL-41022 cleanup core_external_testcase

8 years agoMDL-41022 cleanup core_dml_testcase
Petr Škoda [Sun, 11 Aug 2013 10:11:59 +0000 (12:11 +0200)]
MDL-41022 cleanup core_dml_testcase

8 years agoMDL-41022 cleanup core_ddl_testcase
Petr Škoda [Sun, 11 Aug 2013 09:01:06 +0000 (11:01 +0200)]
MDL-41022 cleanup core_ddl_testcase

8 years agoMDL-41245 fix multiple install, upgrade and uninstallation issues
Petr Škoda [Fri, 16 Aug 2013 09:02:03 +0000 (11:02 +0200)]
MDL-41245 fix multiple install, upgrade and uninstallation issues

Includes rework of cache parameter detection on admin/index.php.

Another problem is that uninstall does not leave system in consistent state,
we need to force users to go through upgrade after any type of uninstall.

This fixes also add-on installation redirect and other issues.

8 years agoMDL-36126 backup: changed the message column in the table backup_logs to a text field...
Mark Nelson [Thu, 22 Aug 2013 07:31:03 +0000 (15:31 +0800)]
MDL-36126 backup: changed the message column in the table backup_logs to a text field to prevent DB errors

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 agoMDL-41380 backup: Fix incorrect function name from MDL-40618.
Russell Smith [Thu, 22 Aug 2013 02:41:51 +0000 (12:41 +1000)]
MDL-41380 backup: Fix incorrect function name from MDL-40618.

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 agoMDL-36803 TinyMCE: Fix TinyMCE following touch events on iOS browsers
Andrew Nicols [Mon, 19 Aug 2013 18:12:39 +0000 (19:12 +0100)]
MDL-36803 TinyMCE: Fix TinyMCE following touch events on iOS browsers

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