moodle.git
6 years agoMerge branch 'MDL-41851-master' of git://github.com/andrewnicols/moodle
Eloy Lafuente (stronk7) [Tue, 3 Feb 2015 11:36:00 +0000 (12:36 +0100)]
Merge branch 'MDL-41851-master' of git://github.com/andrewnicols/moodle

6 years agoMDL-48624 behat: fix trailing whitespace
Dan Poltawski [Tue, 3 Feb 2015 11:01:34 +0000 (11:01 +0000)]
MDL-48624 behat: fix trailing whitespace

6 years agoMerge branch 'wip-mdl-48624-m' of https://github.com/rajeshtaneja/moodle
Dan Poltawski [Tue, 3 Feb 2015 11:01:05 +0000 (11:01 +0000)]
Merge branch 'wip-mdl-48624-m' of https://github.com/rajeshtaneja/moodle

6 years agoMerge branch 'wip-mdl-48403' of https://github.com/rajeshtaneja/moodle
Eloy Lafuente (stronk7) [Tue, 3 Feb 2015 10:57:27 +0000 (11:57 +0100)]
Merge branch 'wip-mdl-48403' of https://github.com/rajeshtaneja/moodle

6 years agoMerge branch 'wip-mdl-49015' of https://github.com/rajeshtaneja/moodle
Eloy Lafuente (stronk7) [Tue, 3 Feb 2015 10:52:03 +0000 (11:52 +0100)]
Merge branch 'wip-mdl-49015' of https://github.com/rajeshtaneja/moodle

6 years agoMerge branch 'MDL-48328_M29' of git://github.com/lazydaisy/moodle
Eloy Lafuente (stronk7) [Tue, 3 Feb 2015 10:42:41 +0000 (11:42 +0100)]
Merge branch 'MDL-48328_M29' of git://github.com/lazydaisy/moodle

Conflicts:
theme/bootstrapbase/style/moodle.css

6 years agoMerge branch 'MDL-48865-master' of git://github.com/xow/moodle
Andrew Nicols [Tue, 3 Feb 2015 08:36:11 +0000 (16:36 +0800)]
Merge branch 'MDL-48865-master' of git://github.com/xow/moodle

6 years agoMDL-48865 core_block: Show regions with only hidden blocks when editing
Neill Magill [Mon, 19 Jan 2015 15:45:44 +0000 (15:45 +0000)]
MDL-48865 core_block: Show regions with only hidden blocks when editing

Before this patch if all the blocks in a block region are set to hidden the region will be docked even when editing is enabled.
This meant that as a user I would need to add a new block to the page and move it to that region via the configuration
menu before I could manipulate the hidden blocks again.

6 years agoMerge branch 'MDL-48920-master' of git://github.com/FMCorz/moodle
Andrew Nicols [Tue, 3 Feb 2015 08:11:08 +0000 (16:11 +0800)]
Merge branch 'MDL-48920-master' of git://github.com/FMCorz/moodle

6 years agoMerge branch 'tgz_fixing' of https://github.com/tlevi/moodle
Andrew Nicols [Tue, 3 Feb 2015 08:02:59 +0000 (16:02 +0800)]
Merge branch 'tgz_fixing' of https://github.com/tlevi/moodle

6 years agoMerge branch 'MDL-48989-master' of git://github.com/jleyva/moodle
Andrew Nicols [Tue, 3 Feb 2015 07:51:38 +0000 (15:51 +0800)]
Merge branch 'MDL-48989-master' of git://github.com/jleyva/moodle

6 years agoMerge branch '48968-29' of git://github.com/samhemelryk/moodle
Andrew Nicols [Tue, 3 Feb 2015 06:22:19 +0000 (14:22 +0800)]
Merge branch '48968-29' of git://github.com/samhemelryk/moodle

6 years agoMerge branch 'MDL-48929-master' of git://github.com/FMCorz/moodle
Andrew Nicols [Tue, 3 Feb 2015 05:55:32 +0000 (13:55 +0800)]
Merge branch 'MDL-48929-master' of git://github.com/FMCorz/moodle

6 years agoMerge branch 'MDL-37477-master' of git://github.com/jethac/moodle
Andrew Nicols [Tue, 3 Feb 2015 05:48:54 +0000 (13:48 +0800)]
Merge branch 'MDL-37477-master' of git://github.com/jethac/moodle

6 years agoMDL-48484 admin: Improve coding style
Andrew Nicols [Tue, 3 Feb 2015 05:21:40 +0000 (13:21 +0800)]
MDL-48484 admin: Improve coding style

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

6 years agoMerge branch 'm29_MDL-48484' of https://github.com/totara/moodle
Andrew Nicols [Tue, 3 Feb 2015 05:04:38 +0000 (13:04 +0800)]
Merge branch 'm29_MDL-48484' of https://github.com/totara/moodle

6 years agoMerge branch 'm29_MDL-46467' of https://github.com/totara/moodle
Andrew Nicols [Tue, 3 Feb 2015 04:57:25 +0000 (12:57 +0800)]
Merge branch 'm29_MDL-46467' of https://github.com/totara/moodle

6 years agoMerge branch 'MDL-48608_master' of git://github.com/markn86/moodle
Andrew Nicols [Tue, 3 Feb 2015 04:30:29 +0000 (12:30 +0800)]
Merge branch 'MDL-48608_master' of git://github.com/markn86/moodle

6 years agoMDL-48608 mod_assign: correctly display grades for group assignments
Mark Nelson [Mon, 29 Dec 2014 07:30:32 +0000 (23:30 -0800)]
MDL-48608 mod_assign: correctly display grades for group assignments

6 years agoMerge branch 'wip_MDL-46728_master' of git://github.com/gjb2048/moodle
David Monllao [Tue, 3 Feb 2015 03:45:15 +0000 (11:45 +0800)]
Merge branch 'wip_MDL-46728_master' of git://github.com/gjb2048/moodle

6 years agoMDL-43752 repository_s3: Using setDefault
David Monllao [Tue, 3 Feb 2015 02:59:58 +0000 (10:59 +0800)]
MDL-43752 repository_s3: Using setDefault

6 years agoMerge branch 'MDL-43752-master' of git://github.com/DanBennettUK/moodle
David Monllao [Tue, 3 Feb 2015 02:52:21 +0000 (10:52 +0800)]
Merge branch 'MDL-43752-master' of git://github.com/DanBennettUK/moodle

6 years agoMDL-48328 theme_bootstrapbase: Added update info to /readme_moodle.txt
Mary Evans [Tue, 3 Feb 2015 01:32:25 +0000 (01:32 +0000)]
MDL-48328 theme_bootstrapbase: Added update info to /readme_moodle.txt

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

6 years agoMerge branch 'MDL-48525-master' of git://github.com/jleyva/moodle
Eloy Lafuente (stronk7) [Mon, 2 Feb 2015 23:57:37 +0000 (00:57 +0100)]
Merge branch 'MDL-48525-master' of git://github.com/jleyva/moodle

6 years agoMerge branch 'MDL-48578-master' of git://github.com/jleyva/moodle
Eloy Lafuente (stronk7) [Mon, 2 Feb 2015 23:47:13 +0000 (00:47 +0100)]
Merge branch 'MDL-48578-master' of git://github.com/jleyva/moodle

6 years agoMerge branch 'MDL-48793-master' of git://github.com/jleyva/moodle
Eloy Lafuente (stronk7) [Mon, 2 Feb 2015 23:45:16 +0000 (00:45 +0100)]
Merge branch 'MDL-48793-master' of git://github.com/jleyva/moodle

6 years agoMerge branch 'MDL-47562-master' of git://github.com/damyon/moodle
Eloy Lafuente (stronk7) [Mon, 2 Feb 2015 22:51:15 +0000 (23:51 +0100)]
Merge branch 'MDL-47562-master' of git://github.com/damyon/moodle

6 years agoMDL-43752 repository_s3: added endpoint select box to settings page
Dan Bennett [Fri, 30 Jan 2015 12:12:53 +0000 (12:12 +0000)]
MDL-43752 repository_s3: added endpoint select box to settings page

6 years agoMerge branch 'MDL-31036-master' of git://github.com/zbdd/moodle
David Monllao [Mon, 2 Feb 2015 06:54:48 +0000 (14:54 +0800)]
Merge branch 'MDL-31036-master' of git://github.com/zbdd/moodle

6 years agoMDL-48484 admin: Added labels to configtime settings
Brian Barnes [Wed, 28 Jan 2015 00:32:58 +0000 (13:32 +1300)]
MDL-48484 admin: Added labels to configtime settings

6 years agoMDL-43387 mod_lesson: add an editor for essay grading comments
Jean-Michel Vedrine [Sat, 17 Jan 2015 18:51:20 +0000 (19:51 +0100)]
MDL-43387 mod_lesson: add an editor for essay grading comments

6 years agoMDL-48328 theme_bootstrapbase: lessc is failing to compile our less.
Mary Evans [Thu, 29 Jan 2015 22:58:26 +0000 (22:58 +0000)]
MDL-48328 theme_bootstrapbase: lessc is failing to compile our less.

6 years agoMDL-31036 mod_assign: Don't strip quickgrading feedback of special chars
Zachary Durber [Wed, 28 Jan 2015 05:55:45 +0000 (13:55 +0800)]
MDL-31036 mod_assign: Don't strip quickgrading feedback of special chars

6 years agoMDL-48772 enrol_cohort: Replace hardcoded language with language strings
John Okely [Wed, 21 Jan 2015 09:32:21 +0000 (17:32 +0800)]
MDL-48772 enrol_cohort: Replace hardcoded language with language strings

6 years agoMDL-48403 behat: Select text in atto editor before inserting image
Rajesh Taneja [Thu, 29 Jan 2015 06:19:00 +0000 (14:19 +0800)]
MDL-48403 behat: Select text in atto editor before inserting image

6 years agoMDL-49105 mod_lesson: Removed unused image insert step in behat
Rajesh Taneja [Thu, 29 Jan 2015 06:29:53 +0000 (14:29 +0800)]
MDL-49105 mod_lesson: Removed unused image insert step in behat

6 years agoMDL-49015 mod_lesson: Don't rely on external links in behat
Rajesh Taneja [Thu, 29 Jan 2015 03:00:14 +0000 (11:00 +0800)]
MDL-49015 mod_lesson: Don't rely on external links in behat

6 years agoMDL-48624 behat: Added extended timeout to ensure step pass
Rajesh Taneja [Wed, 14 Jan 2015 01:31:54 +0000 (09:31 +0800)]
MDL-48624 behat: Added extended timeout to ensure step pass

following_should_download_between_and_bytes step sometimes
fails because of server speed. Added extended timout
ensuring they wait enough before failing.
Also, not calling force download while running behat site

6 years agoMDL-48624 behat: Added page load check in workshop step
Rajesh Taneja [Wed, 14 Jan 2015 01:33:38 +0000 (09:33 +0800)]
MDL-48624 behat: Added page load check in workshop step

i_allocate_submissions_in_workshop_as step sometimes
fails because of server speed. Added page load check
with extended timout.

6 years agoMDL-46728 themes: WOFF2 fonts are not supported.
Gareth J Barnard [Thu, 29 Jan 2015 16:11:43 +0000 (16:11 +0000)]
MDL-46728 themes: WOFF2 fonts are not supported.

6 years agoMDL-48924 backup: Fix some get_file_packer() calls for enabletgzbackups
Tony Levi [Tue, 6 Jan 2015 00:12:05 +0000 (10:42 +1030)]
MDL-48924 backup: Fix some get_file_packer() calls for enabletgzbackups

6 years agoMDL-48525 webservices: Fixed profile user image is not always returned
Juan Leyva [Wed, 28 Jan 2015 16:20:02 +0000 (17:20 +0100)]
MDL-48525 webservices: Fixed profile user image is not always returned

6 years agoMDL-48793 webservices: Deleted duplicated function in mobile service
Juan Leyva [Wed, 28 Jan 2015 12:52:23 +0000 (13:52 +0100)]
MDL-48793 webservices: Deleted duplicated function in mobile service

6 years agoMDL-48578 webservices: Fixed missing required library
Juan Leyva [Wed, 28 Jan 2015 13:31:26 +0000 (14:31 +0100)]
MDL-48578 webservices: Fixed missing required library

6 years agoMDL-48989 messages: Add site information in airnotifier payload
Juan Leyva [Wed, 28 Jan 2015 12:24:04 +0000 (13:24 +0100)]
MDL-48989 messages: Add site information in airnotifier payload

6 years agoweekly release 2.9dev
Eloy Lafuente (stronk7) [Thu, 29 Jan 2015 09:27:52 +0000 (10:27 +0100)]
weekly release 2.9dev

6 years agoMerge branch 'install_master' of https://git.in.moodle.com/amosbot/moodle-install
Eloy Lafuente (stronk7) [Thu, 29 Jan 2015 09:27:40 +0000 (10:27 +0100)]
Merge branch 'install_master' of https://git.in.moodle.com/amosbot/moodle-install

6 years agoMDL-47562 gradereport_singleview: New lang string for save button
Damyon Wiese [Thu, 22 Jan 2015 06:22:12 +0000 (14:22 +0800)]
MDL-47562 gradereport_singleview: New lang string for save button

AMOS BEGIN
    CPY [save,admin],[save,gradereport_singleview]
AMOS END

6 years agoMDL-47562 gradereport_singleview: ui fixes and improvements
Damyon Wiese [Wed, 21 Jan 2015 09:15:15 +0000 (17:15 +0800)]
MDL-47562 gradereport_singleview: ui fixes and improvements

Collection of ui improvements that did not get completed before 2.8 was released.
See the tracker for more details.

6 years agoMDL-8626 mod_data: Only show select/delete options when entries present
Andrew Nicols [Thu, 29 Jan 2015 02:26:41 +0000 (10:26 +0800)]
MDL-8626 mod_data: Only show select/delete options when entries present

6 years agoMerge branch 'MDL-36877' of https://github.com/jmvedrine/moodle
Andrew Nicols [Thu, 29 Jan 2015 01:08:53 +0000 (09:08 +0800)]
Merge branch 'MDL-36877' of https://github.com/jmvedrine/moodle

6 years agoRevert "Merge branch 'MDL-47159_master' of git://github.com/dmonllao/moodle"
Eloy Lafuente (stronk7) [Wed, 28 Jan 2015 20:13:42 +0000 (21:13 +0100)]
Revert "Merge branch 'MDL-47159_master' of git://github.com/dmonllao/moodle"

This reverts commit 73bf1119ddc19181f02fac81c7d7c3def9f5e28f, reversing
changes made to 7615deba22cfae9076a79fc8ce902b24815c1fff.

6 years agoMDL-36877 mod_lesson: Fix while MDL-38578 is not solved
Jean-Michel Vedrine [Wed, 28 Jan 2015 19:54:38 +0000 (20:54 +0100)]
MDL-36877 mod_lesson: Fix while MDL-38578 is not solved

6 years agoMerge branch 'MDL-48855_master' of https://github.com/dmonllao/moodle
Eloy Lafuente (stronk7) [Wed, 28 Jan 2015 11:41:06 +0000 (12:41 +0100)]
Merge branch 'MDL-48855_master' of https://github.com/dmonllao/moodle

6 years agoMerge branch 'MDL-48898' of git://github.com/timhunt/moodle
Eloy Lafuente (stronk7) [Wed, 28 Jan 2015 11:27:07 +0000 (12:27 +0100)]
Merge branch 'MDL-48898' of git://github.com/timhunt/moodle

6 years agoMerge branch 'wip-MDL-48978-master' of git://github.com/marinaglancy/moodle
Eloy Lafuente (stronk7) [Wed, 28 Jan 2015 10:52:45 +0000 (11:52 +0100)]
Merge branch 'wip-MDL-48978-master' of git://github.com/marinaglancy/moodle

6 years agoMerge branch 'MDL-48914' of git://github.com/rtcn2/moodle
David Monllao [Wed, 28 Jan 2015 09:44:05 +0000 (17:44 +0800)]
Merge branch 'MDL-48914' of git://github.com/rtcn2/moodle

6 years agoMDL-48978 user: fixed regression from MDL-37704
Marina Glancy [Wed, 28 Jan 2015 08:47:50 +0000 (16:47 +0800)]
MDL-48978 user: fixed regression from MDL-37704

6 years agoMDL-48542 user_menu: Handle invalid strings better
Andrew Nicols [Wed, 28 Jan 2015 07:33:46 +0000 (15:33 +0800)]
MDL-48542 user_menu: Handle invalid strings better

6 years agoMDL-48980 Security: Always clean the result from min_get_slash_argument
Damyon Wiese [Tue, 27 Jan 2015 15:16:10 +0000 (23:16 +0800)]
MDL-48980 Security: Always clean the result from min_get_slash_argument

The result from this function is used in send_file calls and if unclean
(windows dir separators, or .. path components) it could expose sensitive
files (e.g. .php files). Now we always clean the result from this function
even if it means double cleaning.

I also fixed the unit test for this function and added a new test for this cleaning.

I also updated the comments to point to get_file_argument as the full version of
min_get_slash_argument.

6 years agoMerge branch 'MDL-48266_master-fix2' of git://github.com/markn86/moodle
Andrew Nicols [Wed, 28 Jan 2015 06:09:30 +0000 (14:09 +0800)]
Merge branch 'MDL-48266_master-fix2' of git://github.com/markn86/moodle

6 years agoMerge branch 'MDL-41026-fixes' of git://github.com/andrewnicols/moodle
Andrew Nicols [Wed, 28 Jan 2015 05:57:10 +0000 (13:57 +0800)]
Merge branch 'MDL-41026-fixes' of git://github.com/andrewnicols/moodle

6 years agoMDL-41026 webservices: Correct unit tests
Andrew Nicols [Wed, 28 Jan 2015 05:50:55 +0000 (13:50 +0800)]
MDL-41026 webservices: Correct unit tests

6 years agoMDL-48266 core: fixed backup upgrade
Mark Nelson [Wed, 28 Jan 2015 05:32:07 +0000 (21:32 -0800)]
MDL-48266 core: fixed backup upgrade

6 years agoMDL-48620 JavaScript: Correct sorting after new options
Andrew Nicols [Wed, 28 Jan 2015 05:23:55 +0000 (13:23 +0800)]
MDL-48620 JavaScript: Correct sorting after new options

6 years agoMDL-48542 user_menu: Increment index for all menu items
Andrew Nicols [Wed, 28 Jan 2015 04:00:11 +0000 (12:00 +0800)]
MDL-48542 user_menu: Increment index for all menu items

The invalid type was not causing the idx to incremented, thus missing off
the final divider.

6 years agoMDL-48542 user_menu: Improve user menu tests
Andrew Nicols [Wed, 28 Jan 2015 03:54:07 +0000 (11:54 +0800)]
MDL-48542 user_menu: Improve user menu tests

Add additional test cases, and actually test that the output is roughly
what we expect.

6 years agoMerge branch 'MDL-48542-master' of git://github.com/jethac/moodle
Andrew Nicols [Wed, 28 Jan 2015 04:02:28 +0000 (12:02 +0800)]
Merge branch 'MDL-48542-master' of git://github.com/jethac/moodle

6 years agoMerge branch 'MDL-41026-master' of git://github.com/ankitagarwal/moodle
Andrew Nicols [Wed, 28 Jan 2015 02:05:31 +0000 (10:05 +0800)]
Merge branch 'MDL-41026-master' of git://github.com/ankitagarwal/moodle

6 years agoMDl-47104 Calendar: Make 'calendar_lookahead' more flexible
Stephen Bourget [Tue, 27 Jan 2015 19:53:48 +0000 (14:53 -0500)]
MDl-47104 Calendar: Make 'calendar_lookahead' more flexible

6 years agoMDL-8626 database: Move search and sort controls to top of page
John Okely [Mon, 19 Jan 2015 06:35:36 +0000 (14:35 +0800)]
MDL-8626 database: Move search and sort controls to top of page

Credit to Andrew Walbran for the patch.

6 years agoMerge branch 'MDL-48620-master' of git://github.com/andrewnicols/moodle
Eloy Lafuente (stronk7) [Wed, 28 Jan 2015 00:02:54 +0000 (01:02 +0100)]
Merge branch 'MDL-48620-master' of git://github.com/andrewnicols/moodle

Conflicts:
lib/editor/atto/plugins/undo/yui/build/moodle-atto_undo-button/moodle-atto_undo-button-min.js

6 years agoMerge branch 'MDL-48685-master' of git://github.com/andrewnicols/moodle
Eloy Lafuente (stronk7) [Tue, 27 Jan 2015 23:36:14 +0000 (00:36 +0100)]
Merge branch 'MDL-48685-master' of git://github.com/andrewnicols/moodle

6 years agoMerge branch 'MDL-47159_master' of git://github.com/dmonllao/moodle
Eloy Lafuente (stronk7) [Tue, 27 Jan 2015 20:18:24 +0000 (21:18 +0100)]
Merge branch 'MDL-47159_master' of git://github.com/dmonllao/moodle

6 years agoMerge branch 'MDL-48660-master' of https://github.com/sammarshallou/moodle
Eloy Lafuente (stronk7) [Tue, 27 Jan 2015 20:11:27 +0000 (21:11 +0100)]
Merge branch 'MDL-48660-master' of https://github.com/sammarshallou/moodle

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

6 years agoMDL-48177 core: Plugin environment checks with no version of Moodle
Neill Magill [Wed, 26 Nov 2014 14:28:56 +0000 (14:28 +0000)]
MDL-48177 core: Plugin environment checks with no version of Moodle

The environment.xml files in plugins force you to define the versions of Moodle that the checks should be carried out against.
For community plugins the environment requirements of the plugin seem unlikely to be dependant on the version of Moodle.

This patch will allow the environment.xml files to use a new <PLUGIN> tag in place of the <MOODLE version="> tag.

This solution has the following properties:

* The Environment file will not break versions of Moodle that do not support the PLUGIN syntax.
* Specific versioned MOODLE tags can still be defined for versions of Moodle that do not have this patch.
* If both MOODLE and PLUGIN tags exist the PLUGIN tag will be used in preference.
* The PLUGIN tag will not function in the main Moodle environment.xml file.
* The PLUGIN tag has a mandatory name attribute that must match the frankenstyle name of the plugin being tested.

6 years agoMerge branch 'MDL-40285_master' of git://github.com/markn86/moodle
Eloy Lafuente (stronk7) [Tue, 27 Jan 2015 11:09:58 +0000 (12:09 +0100)]
Merge branch 'MDL-40285_master' of git://github.com/markn86/moodle

6 years agoMerge branch 'MDL-48383-master' of git://github.com/FMCorz/moodle
Eloy Lafuente (stronk7) [Tue, 27 Jan 2015 11:01:04 +0000 (12:01 +0100)]
Merge branch 'MDL-48383-master' of git://github.com/FMCorz/moodle

6 years agoMDL-48660 Availability: filter_user_list() should respect 'view hidden'
sam marshall [Mon, 5 Jan 2015 15:46:09 +0000 (15:46 +0000)]
MDL-48660 Availability: filter_user_list() should respect 'view hidden'

Updated filter_user_list and get_user_list_sql to account for
the viewhiddenactivities and viewhiddensections capabilities.

6 years agoMDL-40285 mod_assign: added extra group submissions behat scenario
Mark Nelson [Wed, 31 Dec 2014 06:51:12 +0000 (22:51 -0800)]
MDL-40285 mod_assign: added extra group submissions behat scenario

Thanks a lot to Jody Steele for providing the basis for the scenario.

6 years agoMDL-40285 mod_assign: show details for all default group members
Mark Nelson [Fri, 9 Jan 2015 05:47:02 +0000 (21:47 -0800)]
MDL-40285 mod_assign: show details for all default group members

6 years agoMerge branch 'MDL-47871_master' of https://github.com/markn86/moodle
Andrew Nicols [Tue, 27 Jan 2015 05:09:29 +0000 (13:09 +0800)]
Merge branch 'MDL-47871_master' of https://github.com/markn86/moodle

6 years agoMDL-41026 webservices: use correct param format in external apis
Jerome Mouneyrac [Mon, 5 Aug 2013 06:07:03 +0000 (14:07 +0800)]
MDL-41026 webservices: use correct param format in external apis

6 years agoMDL-46755 format_social: Minor corrections during integration
Andrew Nicols [Tue, 27 Jan 2015 04:13:59 +0000 (12:13 +0800)]
MDL-46755 format_social: Minor corrections during integration

* Add additional checks in behat tests to ensure ordering of information
  does not give false positives
* Typo in lang pack
* Comment correction

6 years agoMDL-47871 tool_monitor: allow teachers to duplicate site rules
Mark Nelson [Tue, 30 Dec 2014 00:39:30 +0000 (16:39 -0800)]
MDL-47871 tool_monitor: allow teachers to duplicate site rules

6 years agoMerge branch 'MDL-46755_m29-2' of https://github.com/sbourget/moodle
Andrew Nicols [Tue, 27 Jan 2015 03:30:55 +0000 (11:30 +0800)]
Merge branch 'MDL-46755_m29-2' of https://github.com/sbourget/moodle

6 years agoMDL-48920 tool_generator: Use 'real' names during course generation
Frederic Massart [Wed, 21 Jan 2015 03:50:25 +0000 (11:50 +0800)]
MDL-48920 tool_generator: Use 'real' names during course generation

6 years agoMerge branch 'MDL-48491-master' of git://github.com/zbdd/moodle
Andrew Nicols [Tue, 27 Jan 2015 02:48:36 +0000 (10:48 +0800)]
Merge branch 'MDL-48491-master' of git://github.com/zbdd/moodle

6 years agoMDL-47159 atto_link: Adding prefix when url doesn't specify one
David Monllao [Wed, 21 Jan 2015 07:50:44 +0000 (15:50 +0800)]
MDL-47159 atto_link: Adding prefix when url doesn't specify one

6 years agoMDL-46467 forms: Labels have "for" attribute even when frozen
Brian Barnes [Tue, 27 Jan 2015 01:30:22 +0000 (14:30 +1300)]
MDL-46467 forms: Labels have "for" attribute even when frozen

6 years agoMDL-48685 core_useragent: Correct IE 5.0 issues
Andrew Nicols [Tue, 23 Dec 2014 07:09:37 +0000 (15:09 +0800)]
MDL-48685 core_useragent: Correct IE 5.0 issues

6 years agoMDL-48685 tests: Add testing for supports_json_contenttype
Andrew Nicols [Tue, 23 Dec 2014 07:09:04 +0000 (15:09 +0800)]
MDL-48685 tests: Add testing for supports_json_contenttype

6 years agoMDL-48685 tests: Add additional User Agents
Andrew Nicols [Tue, 23 Dec 2014 06:25:20 +0000 (14:25 +0800)]
MDL-48685 tests: Add additional User Agents

* Firefox 33; Mac OS X 10.10
* Chrome 39; Mac OS X
* Safari; iPhone 6 Plus; iOS 8.1; Build 12B411
* Opera 12.15 (Build 1748); Mac OS X

6 years agoMDL-48685 tests: Rewrite useragent tests
Andrew Nicols [Mon, 22 Dec 2014 08:21:51 +0000 (16:21 +0800)]
MDL-48685 tests: Rewrite useragent tests

6 years agoMerge branch 'MDL-48916' of https://github.com/wesleysitu/moodle
Eloy Lafuente (stronk7) [Tue, 27 Jan 2015 00:06:43 +0000 (01:06 +0100)]
Merge branch 'MDL-48916' of https://github.com/wesleysitu/moodle

6 years agoMerge branch 'MDL-48921-master-2nd' of git://github.com/FMCorz/moodle
Eloy Lafuente (stronk7) [Tue, 27 Jan 2015 00:02:39 +0000 (01:02 +0100)]
Merge branch 'MDL-48921-master-2nd' of git://github.com/FMCorz/moodle

6 years agoMerge branch 'MDL-48946-master' of https://github.com/sammarshallou/moodle
Eloy Lafuente (stronk7) [Mon, 26 Jan 2015 23:56:51 +0000 (00:56 +0100)]
Merge branch 'MDL-48946-master' of https://github.com/sammarshallou/moodle