Dan Poltawski [Tue, 29 Mar 2016 06:39:53 +0000 (14:39 +0800)]
Merge branch 'MDL-53515-master' of git://github.com/merrill-oakland/moodle
David Monllao [Tue, 29 Mar 2016 05:38:14 +0000 (13:38 +0800)]
Merge branch 'wip-MDL-53467-master' of git://github.com/abgreeve/moodle
David Monllao [Tue, 29 Mar 2016 05:28:04 +0000 (13:28 +0800)]
Merge branch 'wip-MDL-53557-master' of https://github.com/marinaglancy/moodle
David Monllao [Tue, 29 Mar 2016 04:58:33 +0000 (12:58 +0800)]
Merge branch 'MDL-52646' of https://github.com/wjroes/moodle
David Monllao [Tue, 29 Mar 2016 04:55:46 +0000 (12:55 +0800)]
Merge branch 'wip-MDL-52760-master' of https://github.com/marinaglancy/moodle
David Monllao [Tue, 29 Mar 2016 04:52:07 +0000 (12:52 +0800)]
Merge branch 'wip-MDL-53209-master' of git://github.com/marinaglancy/moodle
Dan Poltawski [Tue, 29 Mar 2016 04:49:27 +0000 (12:49 +0800)]
Merge branch 'wip-mdl-53623' of https://github.com/rajeshtaneja/moodle
Dan Poltawski [Tue, 29 Mar 2016 02:37:25 +0000 (10:37 +0800)]
Merge branch 'MDL-45835-master' of git://github.com/cameron1729/moodle
David Monllao [Tue, 29 Mar 2016 02:01:58 +0000 (10:01 +0800)]
Merge branch 'wip-MDL-29303-master2' of https://github.com/marinaglancy/moodle
Rajesh Taneja [Tue, 29 Mar 2016 01:52:37 +0000 (09:52 +0800)]
MDL-53623 behat: catch expection if failed to trigger event
Inline editing element might hide before
event is triggred, so don't trigger exception
if exception happens
David Monllao [Tue, 29 Mar 2016 01:50:52 +0000 (09:50 +0800)]
Merge branch 'MDL-53181-master' of git://github.com/andrewnicols/moodle
Dan Poltawski [Tue, 29 Mar 2016 01:43:30 +0000 (09:43 +0800)]
Merge branch 'MDL-52945' of https://github.com/mr-russ/moodle
Adrian Greeve [Tue, 15 Mar 2016 06:07:17 +0000 (14:07 +0800)]
MDL-53467 repositories: Upgrade s3 to v0.5.1
Marina Glancy [Sat, 19 Mar 2016 12:20:08 +0000 (20:20 +0800)]
MDL-29303 mod_feedback: allow any characters in labels
Marina Glancy [Sun, 20 Mar 2016 09:10:26 +0000 (17:10 +0800)]
MDL-53557 mod_feedback: partial boundaries in numeric items
Marina Glancy [Mon, 14 Mar 2016 14:28:08 +0000 (22:28 +0800)]
MDL-53209 mod_feedback: allow frontpage users to view and complete
Dan Poltawski [Sat, 26 Mar 2016 03:37:35 +0000 (11:37 +0800)]
Merge branch 'wip-MDL-53538-master' of git://github.com/abgreeve/moodle
Dan Poltawski [Sat, 26 Mar 2016 03:26:31 +0000 (11:26 +0800)]
Merge branch 'wip-MDL-50941-master' of https://github.com/marinaglancy/moodle
Dan Poltawski [Sat, 26 Mar 2016 02:35:55 +0000 (10:35 +0800)]
Merge branch 'MDL-53562-forum-reply-re' of https://github.com/brendanheywood/moodle
Dan Poltawski [Sat, 26 Mar 2016 02:26:02 +0000 (10:26 +0800)]
Merge branch 'MDL-53508-master' of git://github.com/merrill-oakland/moodle
Dan Poltawski [Sat, 26 Mar 2016 02:05:40 +0000 (10:05 +0800)]
MDL-53507 quiz: fix bad htmlid
Dan Poltawski [Sat, 26 Mar 2016 01:41:20 +0000 (09:41 +0800)]
Merge branch 'MDL-53507' of git://github.com/timhunt/moodle
Dan Poltawski [Sat, 26 Mar 2016 01:31:54 +0000 (09:31 +0800)]
Merge branch 'wip-MDL-50795-master' of git://github.com/abgreeve/moodle
Eric Merrill [Thu, 24 Mar 2016 19:44:27 +0000 (15:44 -0400)]
MDL-53515 search: Extend search API to allow file indexing
Eloy Lafuente (stronk7) [Thu, 24 Mar 2016 11:58:10 +0000 (12:58 +0100)]
weekly release 3.1dev
Eloy Lafuente (stronk7) [Thu, 24 Mar 2016 11:58:10 +0000 (12:58 +0100)]
NOBUG: Fixed file access permissions
Vadim Dvorovenko [Sun, 28 Feb 2016 16:43:47 +0000 (23:43 +0700)]
MDL-45835 group: events for groupings assign/unassign
Adrian Greeve [Fri, 18 Mar 2016 02:59:15 +0000 (10:59 +0800)]
MDL-50795 atto: Pasting into atto removes background colour style.
Copying from one atto editor to another comes with a lot of style
information. This removes the color attributes which make the page
look ugly when competing with different themes.
Dan Poltawski [Thu, 24 Mar 2016 01:01:11 +0000 (09:01 +0800)]
MDL-53147 theme_bootstrapbase: Fix RTL issues in messags
Eric Merrill [Wed, 23 Mar 2016 12:55:48 +0000 (08:55 -0400)]
MDL-53508 search: Improve highlighting and move to text fields
Dan Poltawski [Wed, 23 Mar 2016 06:40:05 +0000 (14:40 +0800)]
Merge branch 'MDL-53260-master' of git://github.com/junpataleta/moodle
Jun Pataleta [Wed, 23 Mar 2016 06:13:36 +0000 (14:13 +0800)]
MDL-53260 upgrade: Fix lang help text description.
David Monllao [Wed, 23 Mar 2016 05:53:18 +0000 (13:53 +0800)]
MDL-52924 mod_assign: Bump version for new external function
Dan Poltawski [Wed, 23 Mar 2016 04:08:32 +0000 (12:08 +0800)]
Merge branch 'MDL-52952-master-fix' of github.com:xow/moodle
John Okely [Wed, 23 Mar 2016 03:54:27 +0000 (11:54 +0800)]
MDL-52952 forms: Ignore autofill catching fields in form change checker
David Monllao [Wed, 23 Mar 2016 01:17:11 +0000 (09:17 +0800)]
Merge branch 'wip-MDL-53254-master' of https://github.com/marinaglancy/moodle
Dan Poltawski [Wed, 23 Mar 2016 00:14:23 +0000 (08:14 +0800)]
Merge branch 'MDL-53383-master' of git://github.com/andrewnicols/moodle
Juan Leyva [Fri, 11 Mar 2016 14:46:09 +0000 (15:46 +0100)]
MDL-52767 mod_quiz: New Web Service get_quiz_required_qtypes
Juan Leyva [Fri, 11 Mar 2016 14:45:32 +0000 (15:45 +0100)]
MDL-52767 mod_quiz: New API for retrieving the question types
Juan Leyva [Fri, 11 Mar 2016 13:34:20 +0000 (14:34 +0100)]
MDL-52767 mod_quiz: New Web Service get_attempt_access_information
Juan Leyva [Fri, 11 Mar 2016 13:24:15 +0000 (14:24 +0100)]
MDL-52767 mod_quiz: New Web Service get_quiz_access_information
Eloy Lafuente (stronk7) [Tue, 22 Mar 2016 21:58:30 +0000 (22:58 +0100)]
Merge branch 'MDL-53547' of git://github.com/timhunt/moodle
Marina Glancy [Tue, 22 Mar 2016 09:10:34 +0000 (17:10 +0800)]
MDL-53254 tags: little fixes after review
Dan Poltawski [Tue, 22 Mar 2016 08:40:00 +0000 (16:40 +0800)]
MDL-52752 mathjaxloader: version bump
Dan Poltawski [Tue, 22 Mar 2016 08:31:10 +0000 (16:31 +0800)]
Merge branch 'wip-MDL-52752-master' of git://github.com/abgreeve/moodle
Eloy Lafuente (stronk7) [Tue, 22 Mar 2016 08:05:01 +0000 (09:05 +0100)]
MDL-53393 libraries: Fix thirdpartylib to point to directory
Tim Hunt [Fri, 18 Mar 2016 11:59:51 +0000 (11:59 +0000)]
MDL-53547 logstore_database: better DB driver handling in unit test
Adrian Greeve [Tue, 22 Mar 2016 06:21:27 +0000 (14:21 +0800)]
MDL-53538 mod_data: Unit test for data_get_advance_search_ids
Adrian Greeve [Fri, 18 Mar 2016 01:54:44 +0000 (09:54 +0800)]
MDL-53538 mod_data: Show no records message instead of error.
When there are no records in the database module and a user
does an advanced search. Show a message that there are no entries
in the database.
Dan Poltawski [Tue, 22 Mar 2016 05:51:34 +0000 (13:51 +0800)]
Merge branch 'wip-mdl-49963' of https://github.com/rajeshtaneja/moodle
Rajesh Taneja [Tue, 22 Mar 2016 05:46:13 +0000 (13:46 +0800)]
MDL-49963 behat: fixed scenario and step definition
1. Participants are sorted by last access and they could
be different on different db's. So sort them by last name
before checking.
2. Use Give-When-Then steps.
Dan Poltawski [Tue, 22 Mar 2016 05:12:03 +0000 (13:12 +0800)]
Merge branch 'wip-MDL-51867-master2' of https://github.com/marinaglancy/moodle
David Monllao [Tue, 22 Mar 2016 05:00:30 +0000 (13:00 +0800)]
Merge branch 'wip-MDL-53227-master' of git://github.com/marinaglancy/moodle
Dan Poltawski [Tue, 22 Mar 2016 04:56:53 +0000 (12:56 +0800)]
MDL-39524 tests: fix incorrect phpdoc
Dan Poltawski [Tue, 22 Mar 2016 04:52:26 +0000 (12:52 +0800)]
Merge branch 'MDL-39524' of https://github.com/jrchamp/moodle
Dan Poltawski [Tue, 22 Mar 2016 04:51:30 +0000 (12:51 +0800)]
Merge branch 'MDL-39524-master' of git://github.com/danpoltawski/moodle
Dan Poltawski [Tue, 22 Mar 2016 04:47:07 +0000 (12:47 +0800)]
MDL-39524 tests: unit test for get_real_size()
Dan Poltawski [Tue, 22 Mar 2016 03:44:19 +0000 (11:44 +0800)]
Merge branch 'MDL-53049-anchor-offset' of https://github.com/brendanheywood/moodle
Dan Poltawski [Tue, 22 Mar 2016 03:38:47 +0000 (11:38 +0800)]
Merge branch 'MDL-53147-inbox-layout' of https://github.com/brendanheywood/moodle
David Monllao [Tue, 22 Mar 2016 03:35:54 +0000 (11:35 +0800)]
Merge branch 'MDL-53228-master' of git://github.com/andrewnicols/moodle
Mark Nelson [Tue, 22 Mar 2016 03:01:00 +0000 (11:01 +0800)]
MDL-48012 tool_recyclebin: removed indexes as FKs exist
Dan Poltawski [Tue, 22 Mar 2016 02:32:34 +0000 (10:32 +0800)]
Merge branch 'MDL-52158-master' of https://github.com/xow/moodle
Eloy Lafuente (stronk7) [Tue, 22 Mar 2016 02:16:51 +0000 (03:16 +0100)]
Merge branch 'MDL-53393-master' of git://github.com/cameron1729/moodle
David Monllao [Tue, 22 Mar 2016 01:57:51 +0000 (09:57 +0800)]
MDL-53513 libraries: Fix lessphp version
David Monllao [Tue, 22 Mar 2016 01:56:21 +0000 (09:56 +0800)]
Merge branch 'MDL-53513-master' of git://github.com/lameze/moodle
Dan Poltawski [Tue, 22 Mar 2016 01:54:03 +0000 (09:54 +0800)]
Merge branch 'wip-MDL-52619-master' of git://github.com/abgreeve/moodle
David Monllao [Tue, 22 Mar 2016 01:50:34 +0000 (09:50 +0800)]
Merge branch 'MDL-53456-master' of git://github.com/lameze/moodle
David Monllao [Tue, 22 Mar 2016 01:47:36 +0000 (09:47 +0800)]
Merge branch 'MDL-53512-master' of git://github.com/lameze/moodle
David Monllao [Tue, 22 Mar 2016 01:44:49 +0000 (09:44 +0800)]
Merge branch 'MDL-53455-master' of git://github.com/lameze/moodle
Conflicts:
lib/jquery/plugins.php
David Monllao [Tue, 22 Mar 2016 01:35:19 +0000 (09:35 +0800)]
Merge branch 'wip-MDL-53458-master' of git://github.com/abgreeve/moodle
Eloy Lafuente (stronk7) [Tue, 22 Mar 2016 01:25:40 +0000 (02:25 +0100)]
Merge branch 'MDL-53357-dont-break-urls' of https://github.com/brendanheywood/moodle
Andrew Nicols [Tue, 22 Mar 2016 00:26:59 +0000 (08:26 +0800)]
MDL-53181 core: Add selectors to user menu items
Simey Lameze [Fri, 18 Mar 2016 09:16:42 +0000 (17:16 +0800)]
MDL-53512 libraries: update google API library to version 1.1.7
David Monllao [Tue, 22 Mar 2016 00:01:16 +0000 (08:01 +0800)]
Merge branch 'MDL-53409-master' of git://github.com/crazyserver/moodle
Eloy Lafuente (stronk7) [Mon, 21 Mar 2016 23:45:48 +0000 (00:45 +0100)]
Merge branch 'wip-MDL-45274-master' of https://github.com/marinaglancy/moodle
David Monllao [Mon, 21 Mar 2016 23:44:31 +0000 (07:44 +0800)]
MDL-53454 lib: Fix incorrect jquery version
David Monllao [Mon, 21 Mar 2016 23:42:52 +0000 (07:42 +0800)]
Merge branch 'MDL-53454-master' of git://github.com/lameze/moodle
Eloy Lafuente (stronk7) [Mon, 21 Mar 2016 23:14:25 +0000 (00:14 +0100)]
Merge branch 'MDL-48307-master' of git://github.com/marinaglancy/moodle
David Monllao [Mon, 21 Mar 2016 23:24:37 +0000 (07:24 +0800)]
Merge branch 'wip-MDL-53457-master' of git://github.com/abgreeve/moodle
Tim Hunt [Sun, 20 Mar 2016 22:02:51 +0000 (22:02 +0000)]
MDL-53507 quiz editing: was possible to lose questions
If you dragged a question to the top of the quiz, it could
disappear. Several other cases of dragging questions to the
same place in sequence, but to a different page/section were
also failing, and have been fixed.
David Monllao [Mon, 21 Mar 2016 23:12:52 +0000 (07:12 +0800)]
Merge branch 'wip-MDL-53465-master' of git://github.com/abgreeve/moodle
David Monllao [Mon, 21 Mar 2016 22:56:40 +0000 (06:56 +0800)]
Merge branch 'MDL-53518-master' of git://github.com/lameze/moodle
David Monllao [Mon, 21 Mar 2016 22:51:57 +0000 (06:51 +0800)]
Merge branch 'MDL-53519-master' of git://github.com/lameze/moodle
Eloy Lafuente (stronk7) [Mon, 21 Mar 2016 22:07:16 +0000 (23:07 +0100)]
Merge branch 'MDL-52978_master' of git://github.com/markn86/moodle
Eloy Lafuente (stronk7) [Mon, 21 Mar 2016 22:01:46 +0000 (23:01 +0100)]
MDL-53034 mod_quiz: version mini-bump
Eloy Lafuente (stronk7) [Mon, 21 Mar 2016 21:58:28 +0000 (22:58 +0100)]
Merge branch 'MDL-53034-master' of git://github.com/jleyva/moodle
Eloy Lafuente (stronk7) [Mon, 21 Mar 2016 21:40:43 +0000 (22:40 +0100)]
Merge branch 'MDL-52888-master' of git://github.com/jleyva/moodle
Eloy Lafuente (stronk7) [Mon, 21 Mar 2016 21:20:00 +0000 (22:20 +0100)]
Merge branch 'MDL-52868-master' of git://github.com/jleyva/moodle
Dan Poltawski [Mon, 21 Mar 2016 09:42:19 +0000 (17:42 +0800)]
Merge branch 'MDL-52863-master' of git://github.com/jleyva/moodle
Dan Poltawski [Mon, 21 Mar 2016 09:27:20 +0000 (17:27 +0800)]
Merge branch 'MDL-52852-master' of git://github.com/jleyva/moodle
Dan Poltawski [Mon, 21 Mar 2016 09:09:15 +0000 (17:09 +0800)]
Merge branch 'MDL-52830-master' of git://github.com/jleyva/moodle
Dan Poltawski [Mon, 21 Mar 2016 09:05:05 +0000 (17:05 +0800)]
MDL-52813 mod_quiz: bump version
Diverge from stable branching
Brendan Heywood [Mon, 21 Mar 2016 00:03:12 +0000 (11:03 +1100)]
MDL-53562 forum: Fixed missing forum subject Re: prefix
Dan Poltawski [Mon, 21 Mar 2016 08:37:57 +0000 (16:37 +0800)]
Merge branch 'MDL-52813-master' of git://github.com/jleyva/moodle
Brendan Heywood [Thu, 10 Mar 2016 13:05:07 +0000 (00:05 +1100)]
MDL-53049 themes: Offset href anchor when bootstrap header is fixed
On large screens the bootstrap header is static and can obscure the
anchor target content underneath it.
Willem Roes [Sun, 20 Mar 2016 10:14:34 +0000 (11:14 +0100)]
MDL-52646 mod_scorm: fix missing launch_data for SCORM 2004
Dan Poltawski [Mon, 21 Mar 2016 07:23:37 +0000 (15:23 +0800)]
MDL-53260 cli: fix trailing whitespace
Dan Poltawski [Mon, 21 Mar 2016 07:14:23 +0000 (15:14 +0800)]
Merge branch 'MDL-53260-master' of git://github.com/junpataleta/moodle
Jun Pataleta [Mon, 21 Mar 2016 03:53:27 +0000 (11:53 +0800)]
MDL-53260 upgrade: Make lang option default to the site language
Dan Poltawski [Mon, 21 Mar 2016 06:48:41 +0000 (14:48 +0800)]
Merge branch 'MDL-53407-editing-css' of https://github.com/Dagefoerde/moodle
