moodle.git
6 years agoMDL-42616 filelib: New user interface to edit and add file types (2/2)
sam marshall [Thu, 27 Nov 2014 18:33:39 +0000 (18:33 +0000)]
MDL-42616 filelib: New user interface to edit and add file types (2/2)

New admin tool tool_filetypes which uses the new API to add and
modify file type definitions.

6 years agoMDL-42616 filelib: Use config value for custom MIME types (1/2)
sam marshall [Mon, 15 Dec 2014 10:41:47 +0000 (10:41 +0000)]
MDL-42616 filelib: Use config value for custom MIME types (1/2)

Uses a new optional config variable to define custom MIME types
in JSON format. Includes new API for accessing and modifying
this data.

6 years agoweekly release 2.9dev
Dan Poltawski [Thu, 11 Dec 2014 09:55:09 +0000 (09:55 +0000)]
weekly release 2.9dev

6 years agoMerge branch 'install_master' of https://git.in.moodle.com/amosbot/moodle-install
Dan Poltawski [Thu, 11 Dec 2014 09:55:07 +0000 (09:55 +0000)]
Merge branch 'install_master' of https://git.in.moodle.com/amosbot/moodle-install

6 years agoMDL-48496 block_rss_client: Deleting unused string errorloadingfeed
Frederic Massart [Fri, 5 Dec 2014 07:33:17 +0000 (15:33 +0800)]
MDL-48496 block_rss_client: Deleting unused string errorloadingfeed

6 years agoMDL-48496 block_rss_client: Do not display curl error messages
Frederic Massart [Fri, 5 Dec 2014 07:31:42 +0000 (15:31 +0800)]
MDL-48496 block_rss_client: Do not display curl error messages

6 years agoRevert "MDL-46814 calendar: Export calendar uses moodle forms"
Eloy Lafuente (stronk7) [Wed, 10 Dec 2014 23:19:14 +0000 (00:19 +0100)]
Revert "MDL-46814 calendar: Export calendar uses moodle forms"

This reverts commit a008de2a58cae82121bf88826bbeade33f550fa7.

6 years agoRevert "MDL-46814 calendar export: Minor coding tweaks"
Eloy Lafuente (stronk7) [Wed, 10 Dec 2014 23:18:16 +0000 (00:18 +0100)]
Revert "MDL-46814 calendar export: Minor coding tweaks"

This reverts commit 0b956a64d85a0f9e7c43efa4cd7e51f28216ebf0.

6 years agoAutomatically generated installer lang files
AMOS bot [Wed, 10 Dec 2014 16:03:59 +0000 (00:03 +0800)]
Automatically generated installer lang files

6 years agoMDL-48430 customment: improved exception handling
Sam Hemelryk [Tue, 9 Dec 2014 20:58:16 +0000 (09:58 +1300)]
MDL-48430 customment: improved exception handling

6 years agoMerge branch 'MDL-48430_master' of https://github.com/crazyserver/moodle
Sam Hemelryk [Wed, 10 Dec 2014 02:29:06 +0000 (15:29 +1300)]
Merge branch 'MDL-48430_master' of https://github.com/crazyserver/moodle

6 years agoMerge branch 'MDL-47323-enrol-plugin-backup' of https://github.com/mpetrowi/moodle
Dan Poltawski [Tue, 9 Dec 2014 22:29:37 +0000 (22:29 +0000)]
Merge branch 'MDL-47323-enrol-plugin-backup' of https://github.com/mpetrowi/moodle

6 years agoMerge branch 'MDL-45430-master' of git://github.com/ankitagarwal/moodle
Dan Poltawski [Tue, 9 Dec 2014 21:22:03 +0000 (21:22 +0000)]
Merge branch 'MDL-45430-master' of git://github.com/ankitagarwal/moodle

6 years agoMerge branch 'm29_MDL-48389' of https://github.com/totara/moodle
Sam Hemelryk [Tue, 9 Dec 2014 20:27:18 +0000 (09:27 +1300)]
Merge branch 'm29_MDL-48389' of https://github.com/totara/moodle

6 years agoMerge branch 'MDL-31822_master' of https://github.com/dmonllao/moodle
Eloy Lafuente (stronk7) [Tue, 9 Dec 2014 15:05:56 +0000 (16:05 +0100)]
Merge branch 'MDL-31822_master' of https://github.com/dmonllao/moodle

6 years agoMDL-46814 calendar export: Minor coding tweaks
Eloy Lafuente (stronk7) [Tue, 9 Dec 2014 12:36:25 +0000 (13:36 +0100)]
MDL-46814 calendar export: Minor coding tweaks

6 years agoMDL-46814 calendar: Export calendar uses moodle forms
Brian Barnes [Tue, 28 Oct 2014 00:24:31 +0000 (13:24 +1300)]
MDL-46814 calendar: Export calendar uses moodle forms

6 years agoMDL-45679 mod_lesson: do not overqualify styles
Dan Poltawski [Tue, 9 Dec 2014 12:29:15 +0000 (12:29 +0000)]
MDL-45679 mod_lesson: do not overqualify styles

6 years agoMerge branch 'MDL-45679' of git://github.com/jmvedrine/moodle
Dan Poltawski [Tue, 9 Dec 2014 12:05:29 +0000 (12:05 +0000)]
Merge branch 'MDL-45679' of git://github.com/jmvedrine/moodle

6 years agoMerge branch 'MDL-48394-master' of git://github.com/jethac/moodle
Dan Poltawski [Tue, 9 Dec 2014 10:53:41 +0000 (10:53 +0000)]
Merge branch 'MDL-48394-master' of git://github.com/jethac/moodle

6 years agoMerge branch 'MDL-41846-master' of git://github.com/xow/moodle
Dan Poltawski [Tue, 9 Dec 2014 10:25:15 +0000 (10:25 +0000)]
Merge branch 'MDL-41846-master' of git://github.com/xow/moodle

6 years agoMerge branch 'wip_MDL-36499_master' of git://github.com/gjb2048/moodle
Sam Hemelryk [Tue, 9 Dec 2014 03:57:03 +0000 (16:57 +1300)]
Merge branch 'wip_MDL-36499_master' of git://github.com/gjb2048/moodle

6 years agoMerge branch 'wip-MDL-46486-master' of git://github.com/marinaglancy/moodle
Sam Hemelryk [Tue, 9 Dec 2014 03:20:40 +0000 (16:20 +1300)]
Merge branch 'wip-MDL-46486-master' of git://github.com/marinaglancy/moodle

6 years agoMerge branch 'MDL-40552-master' of git://github.com/danpoltawski/moodle
Sam Hemelryk [Tue, 9 Dec 2014 03:13:40 +0000 (16:13 +1300)]
Merge branch 'MDL-40552-master' of git://github.com/danpoltawski/moodle

6 years agoMerge branch 'MDL-34437-master' of git://github.com/ankitagarwal/moodle
Sam Hemelryk [Tue, 9 Dec 2014 02:58:46 +0000 (15:58 +1300)]
Merge branch 'MDL-34437-master' of git://github.com/ankitagarwal/moodle

6 years agoMerge branch 'master_MDL-46172' of https://github.com/greg-or/moodle-mod_assign
Sam Hemelryk [Tue, 9 Dec 2014 02:38:40 +0000 (15:38 +1300)]
Merge branch 'master_MDL-46172' of https://github.com/greg-or/moodle-mod_assign

6 years agoMDL-48389 forms: added page title to help text
Brian Barnes [Thu, 27 Nov 2014 00:36:48 +0000 (13:36 +1300)]
MDL-48389 forms: added page title to help text

6 years agoMerge branch 'mdl48517' of https://github.com/tlevi/moodle
Sam Hemelryk [Tue, 9 Dec 2014 02:15:51 +0000 (15:15 +1300)]
Merge branch 'mdl48517' of https://github.com/tlevi/moodle

6 years agoMerge branch 'wip-MDL-31851-master' of git://github.com/marinaglancy/moodle
Sam Hemelryk [Tue, 9 Dec 2014 02:13:33 +0000 (15:13 +1300)]
Merge branch 'wip-MDL-31851-master' of git://github.com/marinaglancy/moodle

6 years agoMDL-31822 course: Cleanup per coding guidelines.
David Balch [Tue, 11 Nov 2014 15:42:45 +0000 (15:42 +0000)]
MDL-31822 course: Cleanup per coding guidelines.

6 years agoMDL-31822 course: Formatting the section name
David Monllao [Fri, 5 Dec 2014 01:22:02 +0000 (09:22 +0800)]
MDL-31822 course: Formatting the section name

6 years agoMerge branch 'wip-MDL-48366-master' of git://github.com/marinaglancy/moodle
Sam Hemelryk [Tue, 9 Dec 2014 00:43:30 +0000 (13:43 +1300)]
Merge branch 'wip-MDL-48366-master' of git://github.com/marinaglancy/moodle

6 years agoMerge branch 'wip-mdl-48426' of https://github.com/rajeshtaneja/moodle
Sam Hemelryk [Mon, 8 Dec 2014 23:13:26 +0000 (12:13 +1300)]
Merge branch 'wip-mdl-48426' of https://github.com/rajeshtaneja/moodle

6 years agoMerge branch 'MDL-43996-master' of git://github.com/jethac/moodle
Sam Hemelryk [Mon, 8 Dec 2014 21:56:53 +0000 (10:56 +1300)]
Merge branch 'MDL-43996-master' of git://github.com/jethac/moodle

6 years agoMerge branch 'MDL-48255-master' of git://github.com/lameze/moodle
Eloy Lafuente (stronk7) [Mon, 8 Dec 2014 18:14:07 +0000 (19:14 +0100)]
Merge branch 'MDL-48255-master' of git://github.com/lameze/moodle

6 years agoMerge branch 'wip-MDL-48390-master' of git://github.com/marinaglancy/moodle
Eloy Lafuente (stronk7) [Mon, 8 Dec 2014 17:48:53 +0000 (18:48 +0100)]
Merge branch 'wip-MDL-48390-master' of git://github.com/marinaglancy/moodle

6 years agoMerge branch 'MDL-48410' of git://github.com/timhunt/moodle
Dan Poltawski [Mon, 8 Dec 2014 15:19:11 +0000 (15:19 +0000)]
Merge branch 'MDL-48410' of git://github.com/timhunt/moodle

6 years agoMerge branch 'MDL-48373' of git://github.com/timhunt/moodle
Dan Poltawski [Mon, 8 Dec 2014 15:15:35 +0000 (15:15 +0000)]
Merge branch 'MDL-48373' of git://github.com/timhunt/moodle

6 years agoMerge branch 'MDL-35983_equella_filename_dev' of git://github.com/dongsheng/moodle
Dan Poltawski [Mon, 8 Dec 2014 14:23:49 +0000 (14:23 +0000)]
Merge branch 'MDL-35983_equella_filename_dev' of git://github.com/dongsheng/moodle

6 years agoMerge branch 'MDL-47246_master' of git://github.com/dmonllao/moodle
Dan Poltawski [Mon, 8 Dec 2014 13:34:02 +0000 (13:34 +0000)]
Merge branch 'MDL-47246_master' of git://github.com/dmonllao/moodle

6 years agoMerge branch 'MDL-14908-master' of git://github.com/FMCorz/moodle
Dan Poltawski [Mon, 8 Dec 2014 13:22:16 +0000 (13:22 +0000)]
Merge branch 'MDL-14908-master' of git://github.com/FMCorz/moodle

6 years agoMDL-48273 upgrade.txt version fix
Dan Poltawski [Mon, 8 Dec 2014 11:23:11 +0000 (11:23 +0000)]
MDL-48273 upgrade.txt version fix

6 years agoMDL-48273 singleview: unit tests of load_user method
Simey Lameze [Tue, 2 Dec 2014 05:41:15 +0000 (13:41 +0800)]
MDL-48273 singleview: unit tests of load_user method

6 years agoMDL-48273 singleview: add load_user method and other group validations
Simey Lameze [Tue, 2 Dec 2014 05:40:47 +0000 (13:40 +0800)]
MDL-48273 singleview: add load_user method and other group validations

All credits goes to Damyon, thanks!

6 years agoMerge branch 'MDL-30937_master' of https://github.com/markn86/moodle
Dan Poltawski [Mon, 8 Dec 2014 11:06:49 +0000 (11:06 +0000)]
Merge branch 'MDL-30937_master' of https://github.com/markn86/moodle

6 years agoMDL-47246 mod_forum: Limit last post restriction to Q and A
David Monllao [Fri, 5 Dec 2014 03:35:28 +0000 (11:35 +0800)]
MDL-47246 mod_forum: Limit last post restriction to Q and A

6 years agoMDL-30937 report_backups: added ability to view backup logs
Mark Nelson [Wed, 19 Nov 2014 00:04:47 +0000 (16:04 -0800)]
MDL-30937 report_backups: added ability to view backup logs

6 years agoMDL-30937 core_backup: use default log level when none specified
Mark Nelson [Fri, 21 Nov 2014 01:14:05 +0000 (17:14 -0800)]
MDL-30937 core_backup: use default log level when none specified

6 years agoMerge branch 'MDL-37704-master' of git://github.com/ankitagarwal/moodle
Sam Hemelryk [Mon, 8 Dec 2014 01:50:53 +0000 (14:50 +1300)]
Merge branch 'MDL-37704-master' of git://github.com/ankitagarwal/moodle

6 years agoMerge branch 'MDL-26017_master' of https://github.com/ndunand/moodle
Sam Hemelryk [Mon, 8 Dec 2014 01:24:14 +0000 (14:24 +1300)]
Merge branch 'MDL-26017_master' of https://github.com/ndunand/moodle

6 years agoMDL-31822 course: Show custom Section name on Front page.
David Balch [Wed, 29 Feb 2012 10:03:13 +0000 (10:03 +0000)]
MDL-31822 course: Show custom Section name on Front page.

6 years agoMerge branch 'MDL-48058-master' of git://github.com/andrewnicols/moodle
Sam Hemelryk [Mon, 8 Dec 2014 00:58:15 +0000 (13:58 +1300)]
Merge branch 'MDL-48058-master' of git://github.com/andrewnicols/moodle

6 years agoMDL-34684: fixed whitespace issues
Sam Hemelryk [Sun, 7 Dec 2014 22:16:15 +0000 (11:16 +1300)]
MDL-34684: fixed whitespace issues

6 years agoMerge branch 'MDL-34684_master' of git://github.com/dmonllao/moodle
Sam Hemelryk [Sun, 7 Dec 2014 22:15:32 +0000 (11:15 +1300)]
Merge branch 'MDL-34684_master' of git://github.com/dmonllao/moodle

6 years agoMDL-48517: behat: Fix reset ordering reversal (MDL-48302)
Tony Levi [Sun, 7 Dec 2014 12:51:22 +0000 (23:21 +1030)]
MDL-48517: behat: Fix reset ordering reversal (MDL-48302)

6 years agoMDL-46172 mod/assign: Stop suspended users getting assign group emails
Gregory Faller [Fri, 5 Dec 2014 21:54:08 +0000 (08:24 +1030)]
MDL-46172 mod/assign: Stop suspended users getting assign group emails

6 years agoAutomatically generated installer lang files
AMOS bot [Fri, 5 Dec 2014 16:03:51 +0000 (00:03 +0800)]
Automatically generated installer lang files

6 years agoMDL-36499 javascript: Expand height of the file element in embedded view.
Gareth J Barnard [Fri, 7 Nov 2014 15:15:49 +0000 (15:15 +0000)]
MDL-36499 javascript: Expand height of the file element in embedded view.

6 years agoMDL-45679 mod_lesson: Essay grading page has no mark for essay status
Jean-Michel Vedrine [Sun, 12 Oct 2014 12:56:32 +0000 (14:56 +0200)]
MDL-45679 mod_lesson: Essay grading page has no mark for essay status

6 years agoMDL-48410 behat, quiz: step for efficiently adding questions
Tim Hunt [Thu, 4 Dec 2014 17:45:47 +0000 (17:45 +0000)]
MDL-48410 behat, quiz: step for efficiently adding questions

6 years agoMDL-48373 behat, questions: convert tests to use the new steps
Tim Hunt [Mon, 1 Dec 2014 20:00:51 +0000 (20:00 +0000)]
MDL-48373 behat, questions: convert tests to use the new steps

The new steps make it more efficient to create questions.

While making the changes, I took the opportunity to alter the tests to
follow Behat best practices, and only test one thing per scenario.

6 years agoMDL-48373 behat: generators for questions and categories
Tim Hunt [Fri, 28 Nov 2014 16:03:32 +0000 (16:03 +0000)]
MDL-48373 behat: generators for questions and categories

6 years agoMDL-48373 behat: find table columns better.
Tim Hunt [Mon, 1 Dec 2014 20:00:10 +0000 (20:00 +0000)]
MDL-48373 behat: find table columns better.

It was not possible to select the question bank 'Created by'
or 'Modified by' columns without this change.

6 years agoMDL-48373 behat: new container selector for list items.
Tim Hunt [Wed, 3 Dec 2014 18:12:35 +0000 (18:12 +0000)]
MDL-48373 behat: new container selector for list items.

6 years agoweekly release 2.9dev
Eloy Lafuente (stronk7) [Fri, 5 Dec 2014 10:05:11 +0000 (11:05 +0100)]
weekly release 2.9dev

6 years agoMerge branch 'install_master' of https://git.in.moodle.com/amosbot/moodle-install
Eloy Lafuente (stronk7) [Fri, 5 Dec 2014 10:05:06 +0000 (11:05 +0100)]
Merge branch 'install_master' of https://git.in.moodle.com/amosbot/moodle-install

6 years agoMDL-26017 enrol: Add keyholder role
Nicolas Dunand [Mon, 1 Sep 2014 14:44:57 +0000 (16:44 +0200)]
MDL-26017 enrol: Add keyholder role

6 years agoMDL-48058 core_message: Default message outputs: Maintain Forced status
Mark Nielsen [Fri, 5 Dec 2014 06:41:36 +0000 (14:41 +0800)]
MDL-48058 core_message: Default message outputs: Maintain Forced status

6 years agoMDL-45430 mod_book: Automate MDLQA-2428
Ankit Agarwal [Fri, 28 Nov 2014 06:37:15 +0000 (12:07 +0530)]
MDL-45430 mod_book: Automate MDLQA-2428

This test verifies that an admin can generate and view all the book log entries

6 years agoMDL-43996 editor_atto: add image drag and drop capability
Paul Nicholls [Fri, 28 Nov 2014 07:37:38 +0000 (15:37 +0800)]
MDL-43996 editor_atto: add image drag and drop capability

Adds the ability to drag and drop images directly into Atto, uploading the image and embedding it
correctly. Contains fixes from 1.0.2, as well as a policy change - images dragged and dropped into
Atto now have role=presentation by default.

6 years agoMDL-41846 repository_url: Escape > < ' " in input url
John Okely [Thu, 27 Nov 2014 09:12:56 +0000 (17:12 +0800)]
MDL-41846 repository_url: Escape > < ' " in input url

And throw an exception when a url is incorrectly formatted

6 years agoMDL-41846 repository_url: Convert spaces to %20 in input url
John Okely [Tue, 25 Nov 2014 02:03:21 +0000 (10:03 +0800)]
MDL-41846 repository_url: Convert spaces to %20 in input url

6 years agoMDL-21724 course: fixed wrong string in behat test
Marina Glancy [Thu, 4 Dec 2014 07:34:34 +0000 (15:34 +0800)]
MDL-21724 course: fixed wrong string in behat test

6 years agoMDL-48309 mod_forum: Do not escape ampersands in plain text email
Andrew Nicols [Thu, 4 Dec 2014 05:21:50 +0000 (13:21 +0800)]
MDL-48309 mod_forum: Do not escape ampersands in plain text email

6 years agoMDL-21724 course: fixed handling of returnto=0
Sam Hemelryk [Wed, 3 Dec 2014 22:02:53 +0000 (11:02 +1300)]
MDL-21724 course: fixed handling of returnto=0

6 years agoMDL-21724 course: change remaining tests to new "Save and display"
Eloy Lafuente (stronk7) [Wed, 3 Dec 2014 20:17:22 +0000 (21:17 +0100)]
MDL-21724 course: change remaining tests to new "Save and display"

6 years agoMDL-48285 calendar: Adapting unit tests to the new behaviour
David Monllao [Wed, 3 Dec 2014 07:24:15 +0000 (15:24 +0800)]
MDL-48285 calendar: Adapting unit tests to the new behaviour

Testing also the default value including repeated events.

6 years agoMerge branch '48425-48374-29' of git://github.com/samhemelryk/moodle
Eloy Lafuente (stronk7) [Wed, 3 Dec 2014 02:12:27 +0000 (03:12 +0100)]
Merge branch '48425-48374-29' of git://github.com/samhemelryk/moodle

6 years agoMDL-48374 behat: Added missing $session
Eloy Lafuente (stronk7) [Wed, 3 Dec 2014 02:02:00 +0000 (03:02 +0100)]
MDL-48374 behat: Added missing $session

6 years agoMerge branch 'test-48374' of git://github.com/rajeshtaneja/moodle
Eloy Lafuente (stronk7) [Wed, 3 Dec 2014 01:57:24 +0000 (02:57 +0100)]
Merge branch 'test-48374' of git://github.com/rajeshtaneja/moodle

6 years agoMDL-26226 course: force version bump for new setting
Eloy Lafuente (stronk7) [Wed, 3 Dec 2014 01:50:46 +0000 (02:50 +0100)]
MDL-26226 course: force version bump for new setting

6 years agoMerge branch '21724-29' of git://github.com/samhemelryk/moodle
Eloy Lafuente (stronk7) [Wed, 3 Dec 2014 01:22:51 +0000 (02:22 +0100)]
Merge branch '21724-29' of git://github.com/samhemelryk/moodle

6 years agoMerge branch '23178-29' of git://github.com/samhemelryk/moodle
Eloy Lafuente (stronk7) [Tue, 2 Dec 2014 23:06:46 +0000 (00:06 +0100)]
Merge branch '23178-29' of git://github.com/samhemelryk/moodle

6 years agoMerge branch 'MDL46116_IMSCP_container_items.updates_2014-11-11' of https://github...
Sam Hemelryk [Tue, 2 Dec 2014 19:40:37 +0000 (08:40 +1300)]
Merge branch 'MDL46116_IMSCP_container_items.updates_2014-11-11' of https://github.com/Dave-B/moodle

Conflicts:
mod/imscp/module.js

6 years agoMerge branch '26226-48304-29' of git://github.com/samhemelryk/moodle
Dan Poltawski [Tue, 2 Dec 2014 13:03:09 +0000 (13:03 +0000)]
Merge branch '26226-48304-29' of git://github.com/samhemelryk/moodle

6 years agoMDL-48374 behat: Check flag before searching for span on page
Rajesh Taneja [Tue, 2 Dec 2014 03:40:33 +0000 (11:40 +0800)]
MDL-48374 behat: Check flag before searching for span on page

6 years agoMDL-48374 behat: improved page load detection
Andrew Nicols [Tue, 2 Dec 2014 00:57:38 +0000 (08:57 +0800)]
MDL-48374 behat: improved page load detection

Check that page load detection was correctly started before testing that a
new page was loaded.

Without this, it is possible to have mutliple subsequent cases of:
    And a new page should have loaded since I started watching

Without first starting the page load detection.

6 years agoMDL-36236 caching: improved help string
Helen Foster [Tue, 2 Dec 2014 10:49:23 +0000 (10:49 +0000)]
MDL-36236 caching: improved help string

(and Dan keeping codechecker happy)

6 years agoMerge branch '36236-29' of git://github.com/samhemelryk/moodle
Dan Poltawski [Tue, 2 Dec 2014 10:48:10 +0000 (10:48 +0000)]
Merge branch '36236-29' of git://github.com/samhemelryk/moodle

6 years agoMerge branch 'wip-mdl-48290' of https://github.com/rajeshtaneja/moodle
Dan Poltawski [Tue, 2 Dec 2014 10:41:37 +0000 (10:41 +0000)]
Merge branch 'wip-mdl-48290' of https://github.com/rajeshtaneja/moodle

6 years agoMerge branch 'MDL-48285_master' of git://github.com/dmonllao/moodle
Dan Poltawski [Tue, 2 Dec 2014 08:47:07 +0000 (08:47 +0000)]
Merge branch 'MDL-48285_master' of git://github.com/dmonllao/moodle

6 years agoMerge branch 'MDL-34627_master' of https://github.com/dmonllao/moodle
Dan Poltawski [Tue, 2 Dec 2014 07:50:00 +0000 (07:50 +0000)]
Merge branch 'MDL-34627_master' of https://github.com/dmonllao/moodle

6 years agoMDL-48285 webservices: default timeend to infinity and beyond
David Monllao [Wed, 19 Nov 2014 02:42:15 +0000 (10:42 +0800)]
MDL-48285 webservices: default timeend to infinity and beyond

6 years agoMerge branch '48374-29' of git://github.com/samhemelryk/moodle
Eloy Lafuente (stronk7) [Mon, 1 Dec 2014 23:10:41 +0000 (00:10 +0100)]
Merge branch '48374-29' of git://github.com/samhemelryk/moodle

6 years agoMerge branch 'MDL-47628-master' of https://github.com/sammarshallou/moodle
Dan Poltawski [Thu, 4 Dec 2014 11:40:31 +0000 (11:40 +0000)]
Merge branch 'MDL-47628-master' of https://github.com/sammarshallou/moodle

Conflicts:
availability/yui/build/moodle-core_availability-form/moodle-core_availability-form-min.js

6 years agoMerge branch 'MDL-40419-master-2nd' of git://github.com/FMCorz/moodle
Sam Hemelryk [Mon, 1 Dec 2014 21:02:59 +0000 (10:02 +1300)]
Merge branch 'MDL-40419-master-2nd' of git://github.com/FMCorz/moodle

6 years agoMerge branch 'wip_MDL-47830_m29_pwrotation' of https://github.com/skodak/moodle
Sam Hemelryk [Mon, 1 Dec 2014 20:52:45 +0000 (09:52 +1300)]
Merge branch 'wip_MDL-47830_m29_pwrotation' of https://github.com/skodak/moodle

6 years agoMerge branch 'm29_MDL-48317' of https://github.com/totara/moodle
Dan Poltawski [Mon, 1 Dec 2014 17:30:27 +0000 (17:30 +0000)]
Merge branch 'm29_MDL-48317' of https://github.com/totara/moodle

6 years agoMerge branch 'm29_MDL-48359' of https://github.com/totara/moodle
Dan Poltawski [Mon, 1 Dec 2014 17:19:37 +0000 (17:19 +0000)]
Merge branch 'm29_MDL-48359' of https://github.com/totara/moodle

6 years agoMerge branch 'wip_MDL-48420_m29_lasttypo' of https://github.com/skodak/moodle
Dan Poltawski [Mon, 1 Dec 2014 17:08:56 +0000 (17:08 +0000)]
Merge branch 'wip_MDL-48420_m29_lasttypo' of https://github.com/skodak/moodle