Eloy Lafuente (stronk7) [Mon, 13 Feb 2017 18:14:22 +0000 (19:14 +0100)]
Merge branch 'MDL-57687-master' of git://github.com/danpoltawski/moodle
Eloy Lafuente (stronk7) [Mon, 13 Feb 2017 16:53:37 +0000 (17:53 +0100)]
Merge branch 'MDL-57890-master' of git://github.com/dpalou/moodle
Eloy Lafuente (stronk7) [Mon, 13 Feb 2017 16:41:02 +0000 (17:41 +0100)]
Merge branch 'MDL-57896-master-clicfg' of git://github.com/mudrd8mz/moodle
Dan Poltawski [Mon, 13 Feb 2017 16:22:34 +0000 (16:22 +0000)]
Merge branch 'MDL-56841' of https://github.com/andrewhancox/moodle
B Krishnan Iyer [Sat, 4 Feb 2017 15:48:19 +0000 (21:18 +0530)]
MDL-57354 output: Render continue button as a primary button.
Dan Poltawski [Mon, 13 Feb 2017 15:32:11 +0000 (15:32 +0000)]
MDL-55476 block_login: fix whitespace
Dan Poltawski [Mon, 13 Feb 2017 13:53:10 +0000 (13:53 +0000)]
Merge branch 'MDL-57752_tracksessionip' of git://github.com/davosmith/moodle
Dan Poltawski [Mon, 13 Feb 2017 13:41:13 +0000 (13:41 +0000)]
Merge branch 'MDL-55476-master' of git://github.com/jadet23/moodle
Dan Poltawski [Mon, 13 Feb 2017 13:28:37 +0000 (13:28 +0000)]
Merge branch 'MDL-57768-webservice-config-error' of https://github.com/ilya-catalyst/moodle
David Monllao [Mon, 13 Feb 2017 12:19:39 +0000 (13:19 +0100)]
Merge branch 'MDL-57697-master' of git://github.com/danpoltawski/moodle
David Monllao [Mon, 13 Feb 2017 09:12:14 +0000 (10:12 +0100)]
Merge branch 'MDL-57766-master' of git://github.com/damyon/moodle
Davo Smith [Tue, 24 Jan 2017 09:54:32 +0000 (09:54 +0000)]
MDL-57752 session: fix check_security() session termination
Marina Glancy [Tue, 7 Feb 2017 08:05:51 +0000 (16:05 +0800)]
MDL-50770 blocks: remove orphaned block positions
Marina Glancy [Tue, 10 Jan 2017 03:20:26 +0000 (11:20 +0800)]
MDL-50770 blocks: copy sitewide blocks positions when cloning dashboards
Ilya Tregubov [Tue, 7 Feb 2017 04:05:49 +0000 (15:05 +1100)]
MDL-57768 webservice: Delete manual setting of config in test
David Mudrák [Tue, 7 Feb 2017 19:53:38 +0000 (20:53 +0100)]
MDL-57896 admin: Introduce the new admin/cli/cfg.php utility
Damyon Wiese [Wed, 25 Jan 2017 04:18:24 +0000 (12:18 +0800)]
MDL-57766 mod_assign: Marker allocation fixes
Marking allocation was only ever applied in the view for the grading table. It should
have been added to the list_participants function because that is used by webservices and
the new grading UI.
David Monllao [Thu, 9 Feb 2017 07:00:01 +0000 (08:00 +0100)]
weekly release 3.3dev
David Monllao [Thu, 9 Feb 2017 07:00:00 +0000 (08:00 +0100)]
Merge branch 'install_master' of https://git.in.moodle.com/amosbot/moodle-install
Ryan Wyllie [Thu, 9 Feb 2017 03:36:52 +0000 (03:36 +0000)]
MDL-57370 message: add unread count to conversation tests
Ryan Wyllie [Thu, 9 Feb 2017 03:36:07 +0000 (03:36 +0000)]
MDL-57370 message: improve message union sql
David Monllao [Wed, 8 Feb 2017 12:11:28 +0000 (13:11 +0100)]
Merge branch 'wip-MDL-57316-master' of git://github.com/marinaglancy/moodle
Dan Poltawski [Wed, 18 Jan 2017 16:17:30 +0000 (16:17 +0000)]
MDL-57697 survery: migrate validation script from yui2
Just a modernisation of the existing yui2 code to AMD/jQuery and away from alert();
Dan Poltawski [Wed, 18 Jan 2017 11:40:55 +0000 (11:40 +0000)]
MDL-57687 js: Remove M.util.init_toggle_class_on_click
Dan Poltawski [Wed, 8 Feb 2017 09:14:07 +0000 (09:14 +0000)]
Merge branch 'MDL-57370-master-int-fix-1' of git://github.com/ryanwyllie/moodle
Ryan Wyllie [Wed, 8 Feb 2017 07:34:55 +0000 (07:34 +0000)]
MDL-57370 message: fix duplicate ids
Marina Glancy [Tue, 7 Feb 2017 01:35:46 +0000 (09:35 +0800)]
MDL-57316 media: create different instances for different pages
Rajesh Taneja [Wed, 8 Feb 2017 01:50:02 +0000 (09:50 +0800)]
MDL-56954 behat: Fixed string to pass behat
colon is not concatenated to Search courses string
AMOS bot [Tue, 7 Feb 2017 16:08:49 +0000 (00:08 +0800)]
Automatically generated installer lang files
Dani Palou [Tue, 7 Feb 2017 13:07:51 +0000 (14:07 +0100)]
MDL-57890 ws: Return cmid in all get_by_courses WebServices
Dan Poltawski [Tue, 7 Feb 2017 12:32:34 +0000 (12:32 +0000)]
Merge branch 'MDL-57009-master' of git://github.com/damyon/moodle
Dan Poltawski [Tue, 7 Feb 2017 10:35:13 +0000 (10:35 +0000)]
Merge branch 'MDL-57370-master' of git://github.com/ryanwyllie/moodle
Damyon Wiese [Tue, 7 Feb 2017 07:36:48 +0000 (15:36 +0800)]
MDL-57009 javascript: Reject on all errors
Not all error paths were resulting in a reject() call to fail a promise.
Damyon Wiese [Tue, 7 Feb 2017 07:00:05 +0000 (15:00 +0800)]
MDL-57009 javascript: Always use when.apply
Or it does not really wait for the promises.
Eloy Lafuente (stronk7) [Tue, 7 Feb 2017 05:20:26 +0000 (06:20 +0100)]
Merge branch 'MDL-56954-master' of git://github.com/lameze/moodle
Ryan Wyllie [Wed, 21 Dec 2016 05:37:17 +0000 (05:37 +0000)]
MDL-57370 message: deprecate message_get_recent_conversations
Ryan Wyllie [Wed, 21 Dec 2016 05:17:25 +0000 (05:17 +0000)]
MDL-57370 message: change indexes on message tables
John Okely [Tue, 24 Jan 2017 04:15:56 +0000 (12:15 +0800)]
MDL-57316 media: Setup media plugins in media_manager::instance()
John Okely [Thu, 22 Dec 2016 07:43:32 +0000 (15:43 +0800)]
MDL-57316 videojs: Add behat tests for lesson, url and resource
Ryan Wyllie [Wed, 21 Dec 2016 03:28:14 +0000 (03:28 +0000)]
MDL-57370 message: unit tests for get_conversations
Ryan Wyllie [Fri, 16 Dec 2016 02:55:51 +0000 (02:55 +0000)]
MDL-57370 message: remove joins from get_conversations
I have broken up the single query that was doing multiple joins on the
messaging and user tables. It no longer does any joins and will instead
query each data set individually.
This may cost more in terms of PHP processing but it will mean that
standard database tunings should be able to handle larger data sets.
For example this function was taking a long time to run on moodle.org
and was causing the MySQL join buffer to overflow.
Eloy Lafuente (stronk7) [Tue, 7 Feb 2017 00:26:03 +0000 (01:26 +0100)]
Merge branch 'wip-mdl-57851' of https://github.com/rajeshtaneja/moodle
Eloy Lafuente (stronk7) [Mon, 6 Feb 2017 23:12:30 +0000 (00:12 +0100)]
Merge branch 'MDL-57846-master' of git://github.com/jleyva/moodle
Eloy Lafuente (stronk7) [Mon, 6 Feb 2017 20:52:16 +0000 (21:52 +0100)]
Merge branch 'wip-mdl-57853' of https://github.com/rajeshtaneja/moodle
Eloy Lafuente (stronk7) [Mon, 6 Feb 2017 19:18:17 +0000 (20:18 +0100)]
Merge branch 'MDL-57841-master' of git://github.com/damyon/moodle
Eloy Lafuente (stronk7) [Mon, 6 Feb 2017 18:53:55 +0000 (19:53 +0100)]
Merge branch 'MDL-57844-master' of git://github.com/dpalou/moodle
AMOS bot [Mon, 6 Feb 2017 16:05:17 +0000 (00:05 +0800)]
Automatically generated installer lang files
Eloy Lafuente (stronk7) [Mon, 6 Feb 2017 15:06:25 +0000 (16:06 +0100)]
Merge branch 'MDL-53349-master' of https://github.com/xow/moodle
Dan Poltawski [Mon, 6 Feb 2017 13:46:50 +0000 (13:46 +0000)]
Merge branch 'MDL-57660-master' of git://github.com/junpataleta/moodle
Dan Poltawski [Mon, 6 Feb 2017 10:59:26 +0000 (10:59 +0000)]
Merge branch 'MDL-57587' of git://github.com/timhunt/moodle
David Monllao [Mon, 6 Feb 2017 08:41:13 +0000 (09:41 +0100)]
Merge branch 'MDL-57777-m' of https://github.com/micaherne/moodle
Rajesh Taneja [Thu, 2 Feb 2017 06:16:52 +0000 (14:16 +0800)]
MDL-57853 phpunit: Remove use of setExpectedException
Rajesh Taneja [Fri, 3 Feb 2017 04:53:24 +0000 (12:53 +0800)]
MDL-57851 behat: Add some more wait for scenario to pass
On slow machine with phnatomjs profile
this scenario keeps failing. Add some more
wait to ensure the page is stable and next
step can be executed
AMOS bot [Thu, 2 Feb 2017 16:03:53 +0000 (00:03 +0800)]
Automatically generated installer lang files
Andrew Hancox [Tue, 3 Jan 2017 08:53:34 +0000 (08:53 +0000)]
MDL-56841 mod_folder: Display edit and download buttons inline
Dani Palou [Thu, 2 Feb 2017 08:26:26 +0000 (09:26 +0100)]
MDL-57844 message: Add some message WS to the Mobile service
Damyon Wiese [Wed, 4 Jan 2017 07:52:32 +0000 (15:52 +0800)]
MDL-57009 javascript: cibot nagging
Damyon Wiese [Wed, 4 Jan 2017 06:59:27 +0000 (14:59 +0800)]
MDL-57009 javascript: Dont rely on async ajax
Recursively pre-scan mustache templates to extract the list of blocks and partials. Then
we can pre-fetch them all and don't have to rely on jquery async ajax (which is deprecated).
This is part of a refactoring of the promises code in the templates module to prevent duplicate requests.
Damyon Wiese [Tue, 3 Jan 2017 08:44:10 +0000 (16:44 +0800)]
MDL-57009 js: Do not fetch the same template twice
Also clean up promises use of done vs then.
Damyon Wiese [Tue, 3 Jan 2017 08:19:22 +0000 (16:19 +0800)]
MDL-57009 js: Skip ajax request for same string
This is done by caching the first promise generated to fetch a string.
Simey Lameze [Thu, 1 Dec 2016 07:21:59 +0000 (15:21 +0800)]
MDL-56954 theme_boost: apply bs4 styles to course management page
Andrew Nicols [Thu, 2 Feb 2017 03:32:03 +0000 (11:32 +0800)]
weekly release 3.3dev
Andrew Nicols [Thu, 2 Feb 2017 01:18:17 +0000 (09:18 +0800)]
Merge branch 'MDL-57630-m' of https://github.com/micaherne/moodle
Rajesh Taneja [Wed, 1 Feb 2017 23:21:56 +0000 (07:21 +0800)]
MDL-54628 behat: Rerun command now include replace option passed
Juan Leyva [Wed, 1 Feb 2017 17:00:05 +0000 (18:00 +0100)]
MDL-57846 core_exporter: Allow properties description in exporters
Nadav Kavalerchik [Tue, 24 Jan 2017 22:44:26 +0000 (00:44 +0200)]
MDL-53349 Autocomplete: Support multi lingual COMMA keycode (44)
Damyon Wiese [Wed, 1 Feb 2017 06:45:53 +0000 (14:45 +0800)]
MDL-57841 exporter: Allow scalars as related objects
Ankit Agarwal [Wed, 1 Feb 2017 05:58:18 +0000 (11:28 +0530)]
MDL-57300 lti: Make tool provider page more readable
Ankit Agarwal [Tue, 10 Jan 2017 07:08:29 +0000 (12:38 +0530)]
MDL-57027 accesslib: Improve perf of sql
Petr Skoda [Wed, 7 Dec 2016 02:45:10 +0000 (15:45 +1300)]
MDL-57027 fix get_users_by_capability()
Change-Id: I98dc88784dfa0293f88a19c3d36e7a46a3f52672
Eloy Lafuente (stronk7) [Tue, 31 Jan 2017 16:27:39 +0000 (17:27 +0100)]
Merge branch 'MDL-57592-master' of https://github.com/mwehr/moodle
Dan Poltawski [Tue, 31 Jan 2017 11:39:05 +0000 (11:39 +0000)]
Merge branch 'MDL-57588' of git://github.com/timhunt/moodle
Dan Poltawski [Tue, 31 Jan 2017 11:35:39 +0000 (11:35 +0000)]
Merge branch 'wip-mdl-54628' of https://github.com/rajeshtaneja/moodle
Dan Poltawski [Tue, 31 Jan 2017 09:32:53 +0000 (09:32 +0000)]
Merge branch 'MDL-57300-master' of git://github.com/ankitagarwal/moodle
Dan Poltawski [Tue, 31 Jan 2017 08:33:53 +0000 (08:33 +0000)]
Merge branch 'MDL-57586-master' of https://github.com/nashtechdev01/moodle
Dan Poltawski [Tue, 31 Jan 2017 08:28:15 +0000 (08:28 +0000)]
Merge branch 'MDL-57728_m33v1' of https://github.com/sbourget/moodle
Michael Aherne [Thu, 26 Jan 2017 10:45:52 +0000 (10:45 +0000)]
MDL-57777 rss: Return 404 when context not found.
Andrew Nicols [Tue, 31 Jan 2017 05:21:35 +0000 (13:21 +0800)]
Merge branch 'MDL-57638_rss_skip' of git://github.com/davosmith/moodle
Andrew Nicols [Tue, 31 Jan 2017 04:19:13 +0000 (12:19 +0800)]
Merge branch 'wip-MDL-57785-master' of git://github.com/amygroshek/moodle
Andrew Nicols [Tue, 31 Jan 2017 04:10:48 +0000 (12:10 +0800)]
Merge branch 'master_MDL-56808' of git://github.com/danmarsden/moodle
Andrew Nicols [Tue, 31 Jan 2017 03:43:38 +0000 (11:43 +0800)]
Merge branch 'MDL-35978-master-blockfix' of https://github.com/snake/moodle
Jake Dallimore [Tue, 31 Jan 2017 03:24:13 +0000 (11:24 +0800)]
MDL-35978 comments: fix for comments block which has no toggler
Andrew Nicols [Tue, 31 Jan 2017 01:00:34 +0000 (09:00 +0800)]
Merge branch 'MDL-57410-master' of git://github.com/jleyva/moodle
Andrew Nicols [Tue, 31 Jan 2017 00:35:41 +0000 (08:35 +0800)]
Merge branch 'MDL-57296-master' of git://github.com/ankitagarwal/moodle
wehr [Wed, 11 Jan 2017 19:16:11 +0000 (20:16 +0100)]
MDL-57592 assignment: Adds filtering of assignment name in grader view
Tim Hunt [Mon, 30 Jan 2017 14:31:15 +0000 (14:31 +0000)]
MDL-57588 questions: regrading should not lose flags
Dan Poltawski [Mon, 30 Jan 2017 10:08:26 +0000 (10:08 +0000)]
Merge branch 'wip-MDL-57782-master' of git://github.com/marinaglancy/moodle
Dan Poltawski [Mon, 30 Jan 2017 09:54:13 +0000 (09:54 +0000)]
Merge branch 'MDL-35978-master' of https://github.com/snake/moodle
Dan Poltawski [Mon, 30 Jan 2017 09:34:27 +0000 (09:34 +0000)]
Merge branch 'MDL-36233-master' of git://github.com/lameze/moodle
Ankit Agarwal [Tue, 24 Jan 2017 10:18:25 +0000 (15:48 +0530)]
MDL-57296 gradelib: Fix get_hidding_effect for grade_type_none items
Andrew Nicols [Mon, 30 Jan 2017 05:56:16 +0000 (13:56 +0800)]
Merge branch 'wip-MDL-57568-master' of git://github.com/abgreeve/moodle
Mike Churchward [Mon, 14 Nov 2016 21:04:10 +0000 (16:04 -0500)]
MDL-36233 mod_assign: fixed submission time comparison sql and test.
Rajesh Taneja [Wed, 18 Jan 2017 06:56:08 +0000 (14:56 +0800)]
MDL-54628 behat: Set behat dir for each run under behat_dataroot
Before this patch behat_dataroot for parallel runs
were created at same level as ->behat_dataroot
After this patch, it will be created 1 level under
->behat_dataroot with BEHAT_PARALLEL_SITE_NAME
prefix and run number as suffix. This will allow
common files as test enabled and parallel run info
to be saved in parent directory and access it easily.
Amy Groshek [Thu, 26 Jan 2017 15:49:47 +0000 (09:49 -0600)]
MDL-57785 scorm: Prevents SCORM nav refresh when nav not shown.
This improvement prevents refresh of SCORM 1.2 navigation menu
when the navigation menu is not displayed.
Marina Glancy [Fri, 27 Jan 2017 06:24:10 +0000 (14:24 +0800)]
MDL-57782 enrol_self: fix check when email needs to be sent
Thanks to Leandro for providing a fix
Helson Castro [Fri, 27 Jan 2017 05:55:07 +0000 (13:55 +0800)]
MDL-57568 forms: Added missing include for button element.
Jake Dallimore [Wed, 18 Jan 2017 08:13:31 +0000 (16:13 +0800)]
MDL-35978 comments: expandable comments announce change when toggled
Added role and aria-expanded attributes to the toggler link and added
a key handler for the space and enter keys.
Jun Pataleta [Mon, 16 Jan 2017 08:02:36 +0000 (16:02 +0800)]
MDL-57660 mod_forum: Preserve forum ID selection after form submission
Eloy Lafuente (stronk7) [Thu, 26 Jan 2017 23:27:34 +0000 (00:27 +0100)]
weekly release 3.3dev
Eloy Lafuente (stronk7) [Thu, 26 Jan 2017 23:27:30 +0000 (00:27 +0100)]
Merge branch 'install_master' of https://git.in.moodle.com/amosbot/moodle-install