Sam Hemelryk [Mon, 8 Dec 2014 21:56:53 +0000 (10:56 +1300)]
Merge branch 'MDL-43996-master' of git://github.com/jethac/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
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
Dan Poltawski [Mon, 8 Dec 2014 15:19:11 +0000 (15:19 +0000)]
Merge branch 'MDL-48410' 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
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
Dan Poltawski [Mon, 8 Dec 2014 13:34:02 +0000 (13:34 +0000)]
Merge branch 'MDL-47246_master' of git://github.com/dmonllao/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
Dan Poltawski [Mon, 8 Dec 2014 11:23:11 +0000 (11:23 +0000)]
MDL-48273 upgrade.txt version fix
Simey Lameze [Tue, 2 Dec 2014 05:41:15 +0000 (13:41 +0800)]
MDL-48273 singleview: unit tests of load_user method
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!
Dan Poltawski [Mon, 8 Dec 2014 11:06:49 +0000 (11:06 +0000)]
Merge branch 'MDL-30937_master' of https://github.com/markn86/moodle
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
Mark Nelson [Wed, 19 Nov 2014 00:04:47 +0000 (16:04 -0800)]
MDL-30937 report_backups: added ability to view backup logs
Mark Nelson [Fri, 21 Nov 2014 01:14:05 +0000 (17:14 -0800)]
MDL-30937 core_backup: use default log level when none specified
Sam Hemelryk [Mon, 8 Dec 2014 01:50:53 +0000 (14:50 +1300)]
Merge branch 'MDL-37704-master' of git://github.com/ankitagarwal/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
Sam Hemelryk [Mon, 8 Dec 2014 00:58:15 +0000 (13:58 +1300)]
Merge branch 'MDL-48058-master' of git://github.com/andrewnicols/moodle
Sam Hemelryk [Sun, 7 Dec 2014 22:16:15 +0000 (11:16 +1300)]
MDL-34684: fixed whitespace issues
Sam Hemelryk [Sun, 7 Dec 2014 22:15:32 +0000 (11:15 +1300)]
Merge branch 'MDL-34684_master' of git://github.com/dmonllao/moodle
Tim Hunt [Thu, 4 Dec 2014 17:45:47 +0000 (17:45 +0000)]
MDL-48410 behat, quiz: step for efficiently adding questions
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.
Tim Hunt [Fri, 28 Nov 2014 16:03:32 +0000 (16:03 +0000)]
MDL-48373 behat: generators for questions and categories
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.
Tim Hunt [Wed, 3 Dec 2014 18:12:35 +0000 (18:12 +0000)]
MDL-48373 behat: new container selector for list items.
Eloy Lafuente (stronk7) [Fri, 5 Dec 2014 10:05:11 +0000 (11:05 +0100)]
weekly release 2.9dev
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
Nicolas Dunand [Mon, 1 Sep 2014 14:44:57 +0000 (16:44 +0200)]
MDL-26017 enrol: Add keyholder role
Mark Nielsen [Fri, 5 Dec 2014 06:41:36 +0000 (14:41 +0800)]
MDL-48058 core_message: Default message outputs: Maintain Forced status
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.
Marina Glancy [Thu, 4 Dec 2014 07:34:34 +0000 (15:34 +0800)]
MDL-21724 course: fixed wrong string in behat test
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
Sam Hemelryk [Wed, 3 Dec 2014 22:02:53 +0000 (11:02 +1300)]
MDL-21724 course: fixed handling of returnto=0
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"
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.
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
Eloy Lafuente (stronk7) [Wed, 3 Dec 2014 02:02:00 +0000 (03:02 +0100)]
MDL-48374 behat: Added missing $session
Eloy Lafuente (stronk7) [Wed, 3 Dec 2014 01:57:24 +0000 (02:57 +0100)]
Merge branch 'test-48374' of git://github.com/rajeshtaneja/moodle
Eloy Lafuente (stronk7) [Wed, 3 Dec 2014 01:50:46 +0000 (02:50 +0100)]
MDL-26226 course: force version bump for new setting
Eloy Lafuente (stronk7) [Wed, 3 Dec 2014 01:22:51 +0000 (02:22 +0100)]
Merge branch '21724-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
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
Dan Poltawski [Tue, 2 Dec 2014 13:03:09 +0000 (13:03 +0000)]
Merge branch '26226-48304-29' of git://github.com/samhemelryk/moodle
Rajesh Taneja [Tue, 2 Dec 2014 03:40:33 +0000 (11:40 +0800)]
MDL-48374 behat: Check flag before searching for span on page
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.
Helen Foster [Tue, 2 Dec 2014 10:49:23 +0000 (10:49 +0000)]
MDL-36236 caching: improved help string
(and Dan keeping codechecker happy)
Dan Poltawski [Tue, 2 Dec 2014 10:48:10 +0000 (10:48 +0000)]
Merge branch '36236-29' of git://github.com/samhemelryk/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
Dan Poltawski [Tue, 2 Dec 2014 08:47:07 +0000 (08:47 +0000)]
Merge branch 'MDL-48285_master' of git://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
David Monllao [Wed, 19 Nov 2014 02:42:15 +0000 (10:42 +0800)]
MDL-48285 webservices: default timeend to infinity and beyond
Eloy Lafuente (stronk7) [Mon, 1 Dec 2014 23:10:41 +0000 (00:10 +0100)]
Merge branch '48374-29' of git://github.com/samhemelryk/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
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
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
Dan Poltawski [Mon, 1 Dec 2014 17:30:27 +0000 (17:30 +0000)]
Merge branch 'm29_MDL-48317' 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
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
Dan Poltawski [Mon, 1 Dec 2014 16:31:15 +0000 (16:31 +0000)]
Merge branch 'MDL-48342' of git://github.com/jmvedrine/moodle
Dan Poltawski [Mon, 1 Dec 2014 16:23:41 +0000 (16:23 +0000)]
Merge branch 'wip-MDL-32547-master-v2' of git://github.com/abgreeve/moodle
Conflicts:
version.php
Dan Poltawski [Mon, 1 Dec 2014 15:46:34 +0000 (15:46 +0000)]
Merge branch 'MDL-40241_master' of https://github.com/dmonllao/moodle
Dan Poltawski [Mon, 1 Dec 2014 14:28:19 +0000 (14:28 +0000)]
Merge branch '48335-29' of git://github.com/samhemelryk/moodle
David Monllao [Mon, 24 Nov 2014 05:57:47 +0000 (13:57 +0800)]
MDL-34684 tool_health: Course categories checking refinements
Minor changes:
- Updating all course categories that are part of a loop
- Moved functions to tool_health scope
- Moved tests to tool_health scope
- Raised issue importance
- Minor coding style changes
Thanks to Marko Vidberg.
Logan Reynolds [Fri, 7 Jun 2013 02:16:44 +0000 (21:16 -0500)]
MDL-34684 tool_health: Added health check for course category structure
And corresponding unit test. Work by Marko Vidberg.
AMOS bot [Wed, 3 Dec 2014 16:04:34 +0000 (00:04 +0800)]
Automatically generated installer lang files
Sam Hemelryk [Wed, 12 Nov 2014 02:01:41 +0000 (15:01 +1300)]
MDL-21724 course: ability to return when editing/creating
Sam Hemelryk [Wed, 12 Nov 2014 02:29:26 +0000 (15:29 +1300)]
MDL-23178 block_site_main_menu: indenting is possible now
David Balch [Wed, 19 Nov 2014 15:17:29 +0000 (15:17 +0000)]
MDL-46116 mod_imscp: Fix some jshint issues.
Simey Lameze [Tue, 2 Dec 2014 01:41:46 +0000 (09:41 +0800)]
MDL-48255 auth_ldap: make ldap cookie check more robust
Thanks to Baptiste Desprez for spotting this and provide a solution.
Ankit Agarwal [Tue, 2 Dec 2014 04:04:27 +0000 (09:34 +0530)]
MDL-37704 user_profile: Make sure description field can be locked
Thanks JD for the initial patch.
Rajesh Taneja [Thu, 27 Nov 2014 03:15:48 +0000 (11:15 +0800)]
MDL-48290 behat: Add log out after checking exported file
If the download step is the last in the scenario then we
can sometimes run into the situation where the download page
causes a http redirect but behat has already conducted its
reset (generating an error). By putting a logout step we avoid
behat doing the reset until we are off that page.
Sam Hemelryk [Mon, 1 Dec 2014 03:01:13 +0000 (16:01 +1300)]
MDL-48425 course: management behat tests improved
Sam Hemelryk [Mon, 1 Dec 2014 19:54:38 +0000 (08:54 +1300)]
MDL-48374 behat: improved page load exceptions
The following improvements have been made to the page load watching:
* Improved the exceptions when a page load expectation fails.
* Added an exception if start watching happens twice without a page load.
* Improved the page load span and xpath to make it faster and less likely
to interfer in the future.
Tim Hunt [Fri, 28 Nov 2014 14:54:27 +0000 (14:54 +0000)]
MDL-48374 behat: new steps for detecting page loads.
Dan Poltawski [Mon, 1 Dec 2014 12:21:19 +0000 (12:21 +0000)]
Merge branch '27548-29' of git://github.com/samhemelryk/moodle
Conflicts:
lib/db/install.xml
lib/db/upgrade.php
version.php
Frederic Massart [Mon, 1 Dec 2014 07:14:26 +0000 (15:14 +0800)]
MDL-14908 user: Parents are not restricted when separated groups is used
David Monllao [Fri, 28 Nov 2014 09:23:37 +0000 (17:23 +0800)]
MDL-40241 core_completion: Minor fixes to provided patch
Thanks to Aaron Barnes and Jon Sharp for working on this issue.
Charles Fulton [Sat, 28 Jul 2012 20:43:10 +0000 (16:43 -0400)]
MDL-34627 feedback: Convert default format value during restore
Sam Hemelryk [Mon, 1 Dec 2014 01:45:50 +0000 (14:45 +1300)]
Merge branch 'MDL-18183-master' of git://github.com/FMCorz/moodle
Sam Hemelryk [Mon, 1 Dec 2014 01:02:08 +0000 (14:02 +1300)]
Merge branch 'wip-MDL-48377-master' of git://github.com/marinaglancy/moodle
Sam Hemelryk [Mon, 1 Dec 2014 00:58:13 +0000 (13:58 +1300)]
Merge branch 'MDL-48382' of git://github.com/timhunt/moodle
Sam Hemelryk [Mon, 1 Dec 2014 00:50:52 +0000 (13:50 +1300)]
Merge branch 'MDL-35696-master-course-meta-link-sort-order' of https://github.com/amandadoughty/moodle
Sam Hemelryk [Mon, 1 Dec 2014 00:11:32 +0000 (13:11 +1300)]
Merge branch 'MDL-46618_master' of git://github.com/kordan/moodle
Sam Hemelryk [Sun, 30 Nov 2014 22:40:57 +0000 (11:40 +1300)]
Merge branch 'MDL-40607-master' of git://github.com/danpoltawski/moodle
Sam Hemelryk [Sun, 30 Nov 2014 22:35:44 +0000 (11:35 +1300)]
Merge branch 'MDL-14402-master' of git://github.com/andrewnicols/moodle
Sam Hemelryk [Sun, 30 Nov 2014 22:31:29 +0000 (11:31 +1300)]
Merge branch 'MDL-48384-master' of git://github.com/danpoltawski/moodle
Sam Hemelryk [Sun, 30 Nov 2014 22:10:25 +0000 (11:10 +1300)]
Merge branch 'MDL-48309-master' of git://github.com/andrewnicols/moodle
Sam Hemelryk [Sun, 30 Nov 2014 21:45:04 +0000 (10:45 +1300)]
Merge branch 'MDL-34867-master' of https://github.com/tbannister/moodle
Sam Hemelryk [Sun, 30 Nov 2014 21:36:23 +0000 (10:36 +1300)]
MDL-47133 editor_atto: fixed lint errors
Sam Hemelryk [Sun, 30 Nov 2014 21:34:18 +0000 (10:34 +1300)]
Merge branch 'MDL-47133-master' of git://github.com/FMCorz/moodle
Petr Skoda [Sun, 30 Nov 2014 20:25:55 +0000 (09:25 +1300)]
MDL-48420 test: fix lasttnamephonetic typo
Sam Hemelryk [Sun, 30 Nov 2014 20:14:46 +0000 (09:14 +1300)]
Merge branch 'MDL-48227-master' of git://github.com/ankitagarwal/moodle
Petr Skoda [Thu, 20 Nov 2014 22:26:32 +0000 (11:26 +1300)]
MDL-47830 auth: Add pw rotation restrictions
Sam Hemelryk [Sun, 30 Nov 2014 19:47:34 +0000 (08:47 +1300)]
Merge branch 'MDL-42717-master' of git://github.com/ankitagarwal/moodle
Sam Hemelryk [Sun, 30 Nov 2014 19:33:53 +0000 (08:33 +1300)]
Merge branch 'wip-mdl-48192' of https://github.com/rajeshtaneja/moodle
Andrew Nicols [Thu, 20 Nov 2014 02:43:20 +0000 (10:43 +0800)]
MDL-28286 JavaScript: Convert all uses of M.str to M.util.get_string
Dan Poltawski [Sat, 22 Nov 2014 09:34:55 +0000 (09:34 +0000)]
MDL-40607 deprecatedlib: final deprecations of 2.0 functions
These functions are getting final deprecation following our process.
Note that print_arrow() is getting more time due to incorrect
replacement - see MDL-45448
AMOS bot [Fri, 28 Nov 2014 16:03:58 +0000 (00:03 +0800)]
Automatically generated installer lang files
sam marshall [Mon, 13 Oct 2014 17:05:02 +0000 (18:05 +0100)]
MDL-47628 Availability: Restrict by selected grouping button
Jean-Michel Vedrine [Thu, 27 Nov 2014 08:38:38 +0000 (09:38 +0100)]
MDL-48342 Question: qformat_default::readquestion is broken
