moodle.git
6 years agoMerge branch 'MDL-49178_m29v2' of https://github.com/sbourget/moodle
Eloy Lafuente (stronk7) [Tue, 17 Feb 2015 20:14:50 +0000 (21:14 +0100)]
Merge branch 'MDL-49178_m29v2' of https://github.com/sbourget/moodle

6 years agoMerge branch 'MDL-49041' of git://github.com/timhunt/moodle
Eloy Lafuente (stronk7) [Tue, 17 Feb 2015 20:08:20 +0000 (21:08 +0100)]
Merge branch 'MDL-49041' of git://github.com/timhunt/moodle

6 years agoMerge branch 'MDL-49059-split' of https://github.com/pauln/moodle
Eloy Lafuente (stronk7) [Tue, 17 Feb 2015 19:56:45 +0000 (20:56 +0100)]
Merge branch 'MDL-49059-split' of https://github.com/pauln/moodle

6 years agoMDL-49115 repository_s3: add endpoint default to generator
Eloy Lafuente (stronk7) [Tue, 17 Feb 2015 15:30:43 +0000 (16:30 +0100)]
MDL-49115 repository_s3: add endpoint default to generator

6 years agoMerge branch 'MDL-48221-master' of git://github.com/andrewnicols/moodle
Eloy Lafuente (stronk7) [Tue, 17 Feb 2015 14:51:59 +0000 (15:51 +0100)]
Merge branch 'MDL-48221-master' of git://github.com/andrewnicols/moodle

6 years agoMerge branch 'MDL-48993-master' of git://github.com/merrill-oakland/moodle
David Monllao [Tue, 17 Feb 2015 09:17:36 +0000 (17:17 +0800)]
Merge branch 'MDL-48993-master' of git://github.com/merrill-oakland/moodle

6 years agoMerge branch 'MDL-49167-master' of git://github.com/damyon/moodle
David Monllao [Tue, 17 Feb 2015 09:01:15 +0000 (17:01 +0800)]
Merge branch 'MDL-49167-master' of git://github.com/damyon/moodle

6 years agoMDL-48991 gradebook: Return value according to coding style
David Monllao [Tue, 17 Feb 2015 08:49:45 +0000 (16:49 +0800)]
MDL-48991 gradebook: Return value according to coding style

6 years agoMerge branch 'MDL-48991-master' of git://github.com/merrill-oakland/moodle
David Monllao [Tue, 17 Feb 2015 08:42:51 +0000 (16:42 +0800)]
Merge branch 'MDL-48991-master' of git://github.com/merrill-oakland/moodle

6 years agoMDL-49115 repository_s3: Fixed endpoint not saving
Dan Bennett [Fri, 6 Feb 2015 10:01:28 +0000 (10:01 +0000)]
MDL-49115 repository_s3: Fixed endpoint not saving

6 years agoMerge branch 'MDL-48884_master' of git://github.com/markn86/moodle
David Monllao [Tue, 17 Feb 2015 06:43:49 +0000 (14:43 +0800)]
Merge branch 'MDL-48884_master' of git://github.com/markn86/moodle

6 years agoMerge branch 'MDL-18553_master' of git://github.com/dmonllao/moodle
Andrew Nicols [Tue, 17 Feb 2015 06:35:38 +0000 (14:35 +0800)]
Merge branch 'MDL-18553_master' of git://github.com/dmonllao/moodle

6 years agoMDL-48559 behat: Moving cronclionly to the installer
Ankit Agarwal [Tue, 17 Feb 2015 05:17:28 +0000 (10:47 +0530)]
MDL-48559 behat: Moving cronclionly to the installer

6 years agoMerge branch 'MDL-48841-master' of git://github.com/lucisgit/moodle
David Monllao [Tue, 17 Feb 2015 06:23:22 +0000 (14:23 +0800)]
Merge branch 'MDL-48841-master' of git://github.com/lucisgit/moodle

6 years agoMerge branch 'wip-mdl-48670' of https://github.com/rajeshtaneja/moodle
Andrew Nicols [Tue, 17 Feb 2015 06:07:55 +0000 (14:07 +0800)]
Merge branch 'wip-mdl-48670' of https://github.com/rajeshtaneja/moodle

6 years agoMerge branch 'MDL-49169_master' of git://github.com/grabs/moodle
David Monllao [Tue, 17 Feb 2015 06:01:00 +0000 (14:01 +0800)]
Merge branch 'MDL-49169_master' of git://github.com/grabs/moodle

6 years agoMerge branch 'MDL-48215_master' of git://github.com/markn86/moodle
David Monllao [Tue, 17 Feb 2015 05:23:30 +0000 (13:23 +0800)]
Merge branch 'MDL-48215_master' of git://github.com/markn86/moodle

6 years agoMerge branch 'MDL-43415-master' of git://github.com/zbdd/moodle
David Monllao [Tue, 17 Feb 2015 05:16:39 +0000 (13:16 +0800)]
Merge branch 'MDL-43415-master' of git://github.com/zbdd/moodle

6 years agoMDL-48543 filter_mathjaxloader: Fixing upgrade version
David Monllao [Tue, 17 Feb 2015 03:00:52 +0000 (11:00 +0800)]
MDL-48543 filter_mathjaxloader: Fixing upgrade version

6 years agoMDL-48543 Mathjax: Update default config for JAWS Math player
Damyon Wiese [Fri, 30 Jan 2015 06:36:46 +0000 (14:36 +0800)]
MDL-48543 Mathjax: Update default config for JAWS Math player

JAWS Maths player does not recognise the math content when manually specifying the config for MathJax.
If you use one of the default config files it works.
So - we switch our config to the Accessible.js config that it is based off anyway.
There are no features changes with this approach.

Conflicts:
filter/mathjaxloader/version.php

6 years agoMDL-48760 filter_mathjaxloader: Removing post-2.9 release comment
David Monllao [Tue, 17 Feb 2015 02:48:06 +0000 (10:48 +0800)]
MDL-48760 filter_mathjaxloader: Removing post-2.9 release comment

6 years agoMerge branch 'MDL-48709' of git://github.com/jmvedrine/moodle
David Monllao [Tue, 17 Feb 2015 01:17:10 +0000 (09:17 +0800)]
Merge branch 'MDL-48709' of git://github.com/jmvedrine/moodle

6 years agoMerge branch 'MDL-48559-master' of git://github.com/ankitagarwal/moodle
David Monllao [Mon, 16 Feb 2015 08:51:51 +0000 (16:51 +0800)]
Merge branch 'MDL-48559-master' of git://github.com/ankitagarwal/moodle

6 years agoMerge branch 'wip-MDL-48760-master' of git://github.com/abgreeve/moodle
David Monllao [Mon, 16 Feb 2015 08:38:34 +0000 (16:38 +0800)]
Merge branch 'wip-MDL-48760-master' of git://github.com/abgreeve/moodle

6 years agoMDL-48215 gradingform_guide: Name length validation
Michael Hughes [Wed, 4 Feb 2015 11:14:21 +0000 (11:14 +0000)]
MDL-48215 gradingform_guide: Name length validation

Validating both criterion name and guide name to be 255 chars.

6 years agoMerge branch 'MDL-47529-master' of git://github.com/FMCorz/moodle
David Monllao [Mon, 16 Feb 2015 03:52:50 +0000 (11:52 +0800)]
Merge branch 'MDL-47529-master' of git://github.com/FMCorz/moodle

6 years agoMDL-49167 YUI: Fix for theme/yui_combo.php and $CFG->yuislashargs
Damyon Wiese [Fri, 13 Feb 2015 03:41:43 +0000 (11:41 +0800)]
MDL-49167 YUI: Fix for theme/yui_combo.php and $CFG->yuislashargs

It was too aggressively cleaning it's params (broken in MDL-48980).

6 years agoMDL-47529 lock: Fix typo on lock factory in config-dist
Frederic Massart [Mon, 16 Feb 2015 02:53:45 +0000 (10:53 +0800)]
MDL-47529 lock: Fix typo on lock factory in config-dist

6 years agoMerge branch 'MDL-40776_master' of git://github.com/s-cenni/moodle
David Monllao [Mon, 16 Feb 2015 02:35:06 +0000 (10:35 +0800)]
Merge branch 'MDL-40776_master' of git://github.com/s-cenni/moodle

6 years agoMDL-47172 print_overview: Fixing indentation
David Monllao [Mon, 16 Feb 2015 01:38:05 +0000 (09:38 +0800)]
MDL-47172 print_overview: Fixing indentation

6 years agoMDL-48709 mod_lesson: subclusters are not working
Jean-Michel Vedrine [Sat, 27 Dec 2014 17:15:51 +0000 (18:15 +0100)]
MDL-48709 mod_lesson: subclusters are not working

6 years agoMDL-48760 maths filters: Upgrade to mathjax 2.5
Adrian Greeve [Thu, 12 Feb 2015 05:21:01 +0000 (13:21 +0800)]
MDL-48760 maths filters: Upgrade to mathjax 2.5

6 years agoMDL-47172 print_overview: Add more unit tests
Ankit Agarwal [Tue, 6 Jan 2015 08:13:26 +0000 (13:43 +0530)]
MDL-47172 print_overview: Add more unit tests

6 years agoMDL-47172 print_overview: Show assignments only when needed
Ankit Agarwal [Mon, 5 Jan 2015 06:37:25 +0000 (12:07 +0530)]
MDL-47172 print_overview: Show assignments only when needed

The intended behaviour is not to display this notification when:-
1) The assignment is closed.
2) User is a student and has a valid submission in place.
3) User is a teacher and there is nothing to grade.

Beisdes the above changes the patch also includes minor other fixes such as:-
1) Fixed phpdocs
2) Fixed inconsistent return value.
3) Fixed unit tests that had arguments in wrong order.

6 years agoMDL-18553 mod_lesson: Requiring just the grade constants
David Monllao [Fri, 13 Feb 2015 02:40:47 +0000 (10:40 +0800)]
MDL-18553 mod_lesson: Requiring just the grade constants

6 years agoMDL-18553 Lesson: No gradeinfo display if lesson grade is zero
Jean-Michel Vedrine [Thu, 30 Oct 2014 21:17:03 +0000 (22:17 +0100)]
MDL-18553 Lesson: No gradeinfo display if lesson grade is zero

6 years agoMDL-48670 behat: Set timezone to Australia/perth
Rajesh Taneja [Thu, 12 Feb 2015 02:15:44 +0000 (10:15 +0800)]
MDL-48670 behat: Set timezone to Australia/perth

Behat tests might rely on time related tests
Ensure we have default timezone set to Australia/Perth

6 years agoMDL-48993 gradebook: When importing new items, treat blank or - as empty
Eric Merrill [Thu, 12 Feb 2015 22:07:15 +0000 (17:07 -0500)]
MDL-48993 gradebook: When importing new items, treat blank or - as empty

6 years agoMDL-48991 gradebook: Fix style problems
Eric Merrill [Thu, 12 Feb 2015 21:15:23 +0000 (16:15 -0500)]
MDL-48991 gradebook: Fix style problems

6 years agoMDL-48991 gradebook: Properly import multiple new grade items
Matt Switlik [Wed, 28 Jan 2015 22:03:29 +0000 (17:03 -0500)]
MDL-48991 gradebook: Properly import multiple new grade items

Work done in MDL-46547 caused a problem where multiple new grade items
were not imported. Fix up the passing of new grade objects.

6 years agoMDL-49059 medialib: Add test cases for invalid Youtube URL param values
Paul Nicholls [Thu, 12 Feb 2015 03:57:09 +0000 (16:57 +1300)]
MDL-49059 medialib: Add test cases for invalid Youtube URL param values

Tests to ensure that we're not allowing injection via invalid values of
the Youtube start time and playlist parameters.

6 years agoMDL-49059 medialib: Support links to Youtube videos within playlists
Paul Nicholls [Wed, 11 Feb 2015 20:34:33 +0000 (09:34 +1300)]
MDL-49059 medialib: Support links to Youtube videos within playlists

As well as embedding playlists, you can embed specific videos from them -
resulting in the playlist UI displaying, but starting with the specified
video rather than the first in the playlist.  Previously, just the
specified video would embed - without the playlist UI.

6 years agoMDL-49059 medialib: Support start time params in Youtube URLs
Paul Nicholls [Wed, 11 Feb 2015 00:33:11 +0000 (13:33 +1300)]
MDL-49059 medialib: Support start time params in Youtube URLs

Medialib (and thus the Multimedia Plugins filter) was ignoring start time
parameters on YouTube video URLs, meaning that the video would always
start at the start, even when the appropriate parameter was present.

6 years agoMDL-49059 medialib: Add tests for Youtube videos within playlists
Paul Nicholls [Wed, 11 Feb 2015 20:26:59 +0000 (09:26 +1300)]
MDL-49059 medialib: Add tests for Youtube videos within playlists

As well as embedding playlists, you can embed specific videos from them -
resulting in the playlist UI displaying, but starting with the specified
video rather than the first in the playlist.  These URLs should be covered
by the tests to ensure that we're handling them properly.

6 years agoMDL-49059 medialib: Add test cases for Youtube start times
Paul Nicholls [Tue, 10 Feb 2015 20:55:18 +0000 (09:55 +1300)]
MDL-49059 medialib: Add test cases for Youtube start times

Add test cases to core_medialib_testcase to cover YouTube videos with
start times.

6 years agoMDL-49169 user - After MDL-48978-Fix description is not saved anymore
Andreas Grabs [Wed, 11 Feb 2015 08:44:33 +0000 (09:44 +0100)]
MDL-49169 user - After MDL-48978-Fix description is not saved anymore

6 years agoweekly release 2.9dev
David Monllao [Thu, 12 Feb 2015 07:30:03 +0000 (15:30 +0800)]
weekly release 2.9dev

6 years agoMerge branch 'install_master' of https://git.in.moodle.com/amosbot/moodle-install
David Monllao [Thu, 12 Feb 2015 07:30:01 +0000 (15:30 +0800)]
Merge branch 'install_master' of https://git.in.moodle.com/amosbot/moodle-install

6 years agoMDL-47529 task: Remove usage of lock when editing a task
Frederic Massart [Thu, 29 Jan 2015 02:59:45 +0000 (10:59 +0800)]
MDL-47529 task: Remove usage of lock when editing a task

6 years agoMDL-47529 task: Do not use lock when updating task records
Frederic Massart [Fri, 9 Jan 2015 08:47:53 +0000 (16:47 +0800)]
MDL-47529 task: Do not use lock when updating task records

6 years agoMDL-43535 webservices: Adding missing deprecated WS
David Monllao [Thu, 12 Feb 2015 02:13:36 +0000 (10:13 +0800)]
MDL-43535 webservices: Adding missing deprecated WS

- enrol_manual needs a version bump to execute
  external_update_descriptions()
- core_user_get_users_by_id() is now also marked
  as deprecated

6 years agoMDL-49178 Lesson: Add question pages to generators
Stephen Bourget [Thu, 12 Feb 2015 02:03:36 +0000 (21:03 -0500)]
MDL-49178 Lesson: Add question pages to generators

6 years agoMDL-40776 grade: fix query for report outcomes
Sara Cenni [Wed, 11 Feb 2015 13:14:02 +0000 (14:14 +0100)]
MDL-40776 grade: fix query for report outcomes

Add a missing space to the query for report outcomes to avoid error with Oracle.

6 years agoMDL-48841 admin: Fix scheduled task reset to defaults finctionality.
Ruslan Kabalin [Thu, 5 Feb 2015 15:29:43 +0000 (15:29 +0000)]
MDL-48841 admin: Fix scheduled task reset to defaults finctionality.

It is safe to make fields as non-required, because form validation will not
pass through any empty field anyway.

6 years agoMDL-36296 block_navigation: navigate to course before following activity
Rajesh Taneja [Wed, 11 Feb 2015 06:58:57 +0000 (14:58 +0800)]
MDL-36296 block_navigation: navigate to course before following activity

Activity name is wrapped and chrome driver can't click on it
So navigate to course where it is visible in full

6 years agoMDL-48894 core_registration: Fixing version value
David Monllao [Wed, 11 Feb 2015 08:18:06 +0000 (16:18 +0800)]
MDL-48894 core_registration: Fixing version value

6 years agoMDL-48894 core_registration: minor string tweak
Andrew Davis [Wed, 11 Feb 2015 06:24:03 +0000 (07:24 +0100)]
MDL-48894 core_registration: minor string tweak

6 years agoMerge branch 'MDL-48894_registration' of git://github.com/andyjdavis/moodle
David Monllao [Wed, 11 Feb 2015 01:11:06 +0000 (09:11 +0800)]
Merge branch 'MDL-48894_registration' of git://github.com/andyjdavis/moodle

6 years agoMDL-49003 login: prevent signup when user is logged in
Marina Glancy [Tue, 3 Feb 2015 02:37:42 +0000 (10:37 +0800)]
MDL-49003 login: prevent signup when user is logged in

6 years agoMDL-46763 core: Change icon processing to retain source format
gthomas2 [Thu, 15 Jan 2015 17:02:03 +0000 (17:02 +0000)]
MDL-46763 core: Change icon processing to retain source format

6 years agoMDL-48894 core_registration: make it more obvious if site is registered
Andrew Davis [Mon, 26 Jan 2015 11:07:07 +0000 (12:07 +0100)]
MDL-48894 core_registration: make it more obvious if site is registered

6 years agoAutomatically generated installer lang files
AMOS bot [Tue, 10 Feb 2015 16:04:09 +0000 (00:04 +0800)]
Automatically generated installer lang files

6 years agoMerge branch 'MDL-49036-master' of git://github.com/jleyva/moodle
Eloy Lafuente (stronk7) [Tue, 10 Feb 2015 12:29:10 +0000 (13:29 +0100)]
Merge branch 'MDL-49036-master' of git://github.com/jleyva/moodle

Conflicts:
version.php

6 years agoMerge branch 'MDL-48910_block_my' of https://github.com/andyjdavis/moodle
Eloy Lafuente (stronk7) [Tue, 10 Feb 2015 12:14:59 +0000 (13:14 +0100)]
Merge branch 'MDL-48910_block_my' of https://github.com/andyjdavis/moodle

6 years agoMerge branch 'MDL-49058-master' of git://github.com/jethac/moodle
Eloy Lafuente (stronk7) [Tue, 10 Feb 2015 12:09:38 +0000 (13:09 +0100)]
Merge branch 'MDL-49058-master' of git://github.com/jethac/moodle

6 years agoMDL-48679 gradebook: Fixing trailing whitespace
David Monllao [Tue, 10 Feb 2015 09:48:57 +0000 (17:48 +0800)]
MDL-48679 gradebook: Fixing trailing whitespace

6 years agoMerge branch 'MDL-48679-master' of git://github.com/lameze/moodle
David Monllao [Tue, 10 Feb 2015 09:45:22 +0000 (17:45 +0800)]
Merge branch 'MDL-48679-master' of git://github.com/lameze/moodle

6 years agoMDL-48679 gradebook: fix grade publishing feature
Simey Lameze [Tue, 10 Feb 2015 04:47:34 +0000 (12:47 +0800)]
MDL-48679 gradebook: fix grade publishing feature

6 years agoMerge branch 'm29_MDL-49052' of https://github.com/totara/moodle
Dan Poltawski [Tue, 10 Feb 2015 09:24:42 +0000 (09:24 +0000)]
Merge branch 'm29_MDL-49052' of https://github.com/totara/moodle

6 years agoMerge branch 'wip-mdl-49081' of https://github.com/rajeshtaneja/moodle
Dan Poltawski [Tue, 10 Feb 2015 09:08:31 +0000 (09:08 +0000)]
Merge branch 'wip-mdl-49081' of https://github.com/rajeshtaneja/moodle

6 years agoMDL-49036 webservices: gradereport_user_get_grades_table ws tests
Juan Leyva [Fri, 30 Jan 2015 11:30:39 +0000 (12:30 +0100)]
MDL-49036 webservices: gradereport_user_get_grades_table ws tests

6 years agoMDL-37477 output: Add support for table captions
Jetha Chan [Mon, 10 Nov 2014 08:47:52 +0000 (16:47 +0800)]
MDL-37477 output: Add support for table captions

Conflicts:
lib/upgrade.txt
theme/bootstrapbase/style/moodle.css

6 years agoMDL-48805 theme: Fixing trailing whitespace
David Monllao [Tue, 10 Feb 2015 07:47:41 +0000 (15:47 +0800)]
MDL-48805 theme: Fixing trailing whitespace

6 years agoMerge branch 'm29_MDL-48805' of git://github.com/totara/moodle
David Monllao [Tue, 10 Feb 2015 07:26:49 +0000 (15:26 +0800)]
Merge branch 'm29_MDL-48805' of git://github.com/totara/moodle

6 years agoMDL-48910 core_block: user_can_addto() respects applicable formats
Andrew Davis [Tue, 20 Jan 2015 09:06:42 +0000 (10:06 +0100)]
MDL-48910 core_block: user_can_addto() respects applicable formats

6 years agoMerge branch 'MDL-48822-master' of git://github.com/andrewnicols/moodle
David Monllao [Tue, 10 Feb 2015 06:10:28 +0000 (14:10 +0800)]
Merge branch 'MDL-48822-master' of git://github.com/andrewnicols/moodle

6 years agoMDL-43415 auth_db: support textarea and uppercase fields
Zachary Durber [Tue, 10 Feb 2015 05:47:22 +0000 (13:47 +0800)]
MDL-43415 auth_db: support textarea and uppercase fields

6 years agoMDL-10405 course: CSS classname correction
Marina Glancy [Tue, 10 Feb 2015 04:50:08 +0000 (12:50 +0800)]
MDL-10405 course: CSS classname correction

6 years agoMDL-48679 gradebook: helper methods for grade publishing
Simey Lameze [Tue, 10 Feb 2015 04:46:40 +0000 (12:46 +0800)]
MDL-48679 gradebook: helper methods for grade publishing

6 years agoMerge branch 'MDL-49024_master' of git://github.com/nadavkav/moodle
David Monllao [Tue, 10 Feb 2015 04:32:23 +0000 (12:32 +0800)]
Merge branch 'MDL-49024_master' of git://github.com/nadavkav/moodle

6 years agoMerge branch 'm29_MDL-49064' of git://github.com/totara/moodle
David Monllao [Tue, 10 Feb 2015 03:56:52 +0000 (11:56 +0800)]
Merge branch 'm29_MDL-49064' of git://github.com/totara/moodle

6 years agoMerge branch 'MDL-48937-master' of git://github.com/FMCorz/moodle
David Monllao [Tue, 10 Feb 2015 03:41:42 +0000 (11:41 +0800)]
Merge branch 'MDL-48937-master' of git://github.com/FMCorz/moodle

6 years agoMerge branch 'MDL-48960-master' of git://github.com/danpoltawski/moodle
David Monllao [Tue, 10 Feb 2015 03:12:18 +0000 (11:12 +0800)]
Merge branch 'MDL-48960-master' of git://github.com/danpoltawski/moodle

6 years agoMDL-43415 auth_db: Adding custom profile fields to "Lock user fields"
Vadim Dvorovenko [Wed, 14 Jan 2015 17:44:37 +0000 (00:44 +0700)]
MDL-43415 auth_db: Adding custom profile fields to "Lock user fields"

Adding custom profile fields to "Lock user fields". It's needed to sync
custom user profile fields with external DB.

6 years agoMerge branch 'wip-mdl-49113' of git://github.com/rajeshtaneja/moodle
David Monllao [Tue, 10 Feb 2015 02:35:00 +0000 (10:35 +0800)]
Merge branch 'wip-mdl-49113' of git://github.com/rajeshtaneja/moodle

6 years agoMerge branch 'master_MDL-48803' of git://github.com/greg-or/moodle-mod_assign
David Monllao [Tue, 10 Feb 2015 02:00:23 +0000 (10:00 +0800)]
Merge branch 'master_MDL-48803' of git://github.com/greg-or/moodle-mod_assign

6 years agoMerge branch 'MDL-48212-master' of git://github.com/ankitagarwal/moodle
David Monllao [Tue, 10 Feb 2015 00:54:13 +0000 (08:54 +0800)]
Merge branch 'MDL-48212-master' of git://github.com/ankitagarwal/moodle

6 years agoMerge branch 'MDL-48889-master' of git://github.com/jethac/moodle
Eloy Lafuente (stronk7) [Tue, 10 Feb 2015 00:36:27 +0000 (01:36 +0100)]
Merge branch 'MDL-48889-master' of git://github.com/jethac/moodle

6 years agoMerge branch 'MDL-48964' of git://github.com/jmvedrine/moodle
Eloy Lafuente (stronk7) [Tue, 10 Feb 2015 00:09:38 +0000 (01:09 +0100)]
Merge branch 'MDL-48964' of git://github.com/jmvedrine/moodle

6 years agoMerge branch 'MDL-49073-master' of git://github.com/jethac/moodle
Eloy Lafuente (stronk7) [Tue, 10 Feb 2015 00:04:38 +0000 (01:04 +0100)]
Merge branch 'MDL-49073-master' of git://github.com/jethac/moodle

6 years agoMerge branch 'MDL-48544-master' of git://github.com/andrewnicols/moodle
Dan Poltawski [Mon, 9 Feb 2015 22:42:01 +0000 (22:42 +0000)]
Merge branch 'MDL-48544-master' of git://github.com/andrewnicols/moodle

6 years agoMerge branch 'MDL-43535_master' of git://github.com/dmonllao/moodle
Dan Poltawski [Mon, 9 Feb 2015 22:39:36 +0000 (22:39 +0000)]
Merge branch 'MDL-43535_master' of git://github.com/dmonllao/moodle

6 years agoMerge branch 'wip_MDL-49125_m29_install' of https://github.com/skodak/moodle
Eloy Lafuente (stronk7) [Mon, 9 Feb 2015 19:01:24 +0000 (20:01 +0100)]
Merge branch 'wip_MDL-49125_m29_install' of https://github.com/skodak/moodle

6 years agoMerge branch 'MDL-49006' of git://github.com/timhunt/moodle
Eloy Lafuente (stronk7) [Mon, 9 Feb 2015 18:32:40 +0000 (19:32 +0100)]
Merge branch 'MDL-49006' of git://github.com/timhunt/moodle

6 years agoMerge branch '36296-29' of git://github.com/samhemelryk/moodle
Eloy Lafuente (stronk7) [Mon, 9 Feb 2015 16:59:06 +0000 (17:59 +0100)]
Merge branch '36296-29' of git://github.com/samhemelryk/moodle

6 years agoMerge branch 'MDL-33648' of git://github.com/jmvedrine/moodle
Dan Poltawski [Mon, 9 Feb 2015 15:03:58 +0000 (15:03 +0000)]
Merge branch 'MDL-33648' of git://github.com/jmvedrine/moodle

6 years agoMerge branch 'MDL-48357-master' of git://github.com/jleyva/moodle
Eloy Lafuente (stronk7) [Mon, 9 Feb 2015 14:49:11 +0000 (15:49 +0100)]
Merge branch 'MDL-48357-master' of git://github.com/jleyva/moodle

6 years agoMerge branch 'wip-MDL-47558-master' of git://github.com/marinaglancy/moodle
Dan Poltawski [Mon, 9 Feb 2015 14:49:03 +0000 (14:49 +0000)]
Merge branch 'wip-MDL-47558-master' of git://github.com/marinaglancy/moodle

6 years agoMDL-48544 blocks: Only add docked tags if all blocks are docked
Andrew Nicols [Thu, 8 Jan 2015 06:58:26 +0000 (14:58 +0800)]
MDL-48544 blocks: Only add docked tags if all blocks are docked

Previously, if all blocks were hidden, then the region was reported as
being docked eroniously and it was not possible to unhide the blocks.

Docking should have no relation to the presence of block content.

6 years agoMerge branch 'MDL-30239-master' of git://github.com/jleyva/moodle
Dan Poltawski [Mon, 9 Feb 2015 12:32:59 +0000 (12:32 +0000)]
Merge branch 'MDL-30239-master' of git://github.com/jleyva/moodle