Eloy Lafuente (stronk7) [Thu, 19 May 2016 11:50:47 +0000 (13:50 +0200)]
Merge branch 'MDL-54643-master' of git://github.com/jleyva/moodle
Dan Poltawski [Thu, 19 May 2016 10:34:15 +0000 (11:34 +0100)]
MDL-54641 enrol: fix trailing whitespace in upgrade.txt
Dan Poltawski [Thu, 19 May 2016 10:33:53 +0000 (11:33 +0100)]
Merge branch 'MDL-54641_master' of https://github.com/snake/moodle
Dan Poltawski [Thu, 19 May 2016 09:59:06 +0000 (10:59 +0100)]
Merge branch 'MDL-54627_master' of git://github.com/dmonllao/moodle
Dan Poltawski [Thu, 19 May 2016 09:57:47 +0000 (10:57 +0100)]
MDL-53988 lti: build js
Dan Poltawski [Thu, 19 May 2016 09:56:01 +0000 (10:56 +0100)]
Merge branch 'MDL-53988-master-fix2' of https://github.com/xow/moodle
Juan Leyva [Thu, 19 May 2016 09:55:14 +0000 (11:55 +0200)]
MDL-54643 tool_mobile: Fix dependencies check
Jake Dallimore [Thu, 19 May 2016 09:29:21 +0000 (17:29 +0800)]
MDL-54641 enrol: Consolidate 3.1 changes into correct section header.
John Okely [Thu, 19 May 2016 09:03:47 +0000 (17:03 +0800)]
MDL-53988 mod_lti: Improve error handling and user interface
Only show one, more helpful error instead of two non-helpful errors.
Don't show the 'no configured tools' message if there is a proxy there.
Return to the Tool configure page when editing a proxy if you came
from it.
Dan Poltawski [Thu, 19 May 2016 08:00:12 +0000 (09:00 +0100)]
Merge branch 'MDL-54633-master-tinymce' of git://github.com/mudrd8mz/moodle
Andrew Nicols [Thu, 19 May 2016 07:17:03 +0000 (15:17 +0800)]
Merge branch 'MDL-54632-master' of git://github.com/andrewnicols/moodle
Marina Glancy [Thu, 19 May 2016 02:30:07 +0000 (10:30 +0800)]
MDL-54632 mod_lti: separate show as preconfigured and in activitychooser
David Monllao [Thu, 19 May 2016 07:03:14 +0000 (15:03 +0800)]
Merge branch 'MDL-54630_master' of git://github.com/markn86/moodle
Mark Nelson [Wed, 18 May 2016 11:42:40 +0000 (19:42 +0800)]
MDL-54630 core_tags: preserve 'timemodified' when moving tags
David Monllao [Thu, 19 May 2016 05:47:22 +0000 (13:47 +0800)]
Merge branch 'MDL-54638' of git://github.com/stronk7/moodle
Conflicts:
mod/lti/version.php
David Monllao [Wed, 18 May 2016 08:28:18 +0000 (16:28 +0800)]
MDL-54627 search: Ensure that all format_string strings are text.
All user input that is usually displayed through format_strings with
filters like mulitlang applied should be converted to text as well.
Andrew Nicols [Thu, 19 May 2016 03:58:16 +0000 (11:58 +0800)]
Merge branch 'MDL-53988-master-fix' of https://github.com/xow/moodle
John Okely [Thu, 19 May 2016 03:55:17 +0000 (11:55 +0800)]
MDL-53988 mod_lti: Add language string for unactivated proxies
Andrew Nicols [Thu, 19 May 2016 03:52:29 +0000 (11:52 +0800)]
Merge branch 'MDL-54542-master-fixup' of https://github.com/FMCorz/moodle
Andrew Nicols [Thu, 19 May 2016 03:43:27 +0000 (11:43 +0800)]
Merge branch 'MDL-53988-master' of https://github.com/xow/moodle
Frederic Massart [Thu, 19 May 2016 03:42:15 +0000 (11:42 +0800)]
MDL-54542 competency: Really handle false negatives in plans to review
David Monllao [Thu, 19 May 2016 03:41:21 +0000 (11:41 +0800)]
Merge branch 'MDL-54578_m31v2' of https://github.com/sbourget/moodle
David Monllao [Thu, 19 May 2016 03:20:58 +0000 (11:20 +0800)]
Merge branch 'MDL-54613-m' of https://github.com/micaherne/moodle
John Okely [Thu, 28 Apr 2016 02:46:35 +0000 (10:46 +0800)]
MDL-53988 mod_lti: Fix followup up issues
Fix function naming
Fix param types
Fix error popping up twice with incorrect URL
Add confirm dialog when you delete a tool
Show orphaned tool proxies in list
Fix interface jumping up and down
Change to use notification stack
Change capabilities in db/services.php
Add loading animation after registering tool
Show loading animation until tools are rendered
Andrew Nicols [Thu, 19 May 2016 02:56:50 +0000 (10:56 +0800)]
Merge branch 'MDL-54542-master-fixup' of https://github.com/FMCorz/moodle
Frederic Massart [Thu, 19 May 2016 02:23:46 +0000 (10:23 +0800)]
MDL-54542 competency: False negative when listing plans to review
Eloy Lafuente (stronk7) [Thu, 19 May 2016 00:17:59 +0000 (02:17 +0200)]
MDL-54638 versions: main version bump
Eloy Lafuente (stronk7) [Thu, 19 May 2016 00:14:45 +0000 (02:14 +0200)]
MDL-54638 versions: bump all versions and requires near release
version =
2016052300 release version
requires=
2016051900 current rc1 version
David Mudrák [Wed, 18 May 2016 22:01:36 +0000 (00:01 +0200)]
MDL-54633 tinymce: Automatically sync editor with its textarea
Probably as a result of recent changes in the way how forms client side
validators are trigerred (MDL-52826), the field validator has been
triggered before the underlying textarea's values property is updated by
TinyMCE. This led to marking such a field as "required" even if the
value is provided.
Inspired by http://stackoverflow.com/questions/
2122085/
this patch adds a new onchange callback that automatically keeps the
underlying textarea synced with the editor iframe. Relevant API docs:
http://archive.tinymce.com/wiki.php/Configuration3x:onchange_callback
I was also trying to call the save() method via the editor's onSubmit
method but that one seems to be also triggered only after the validator.
Dan Poltawski [Wed, 18 May 2016 18:20:23 +0000 (19:20 +0100)]
Merge branch 'MDL-54025' of https://github.com/stronk7/moodle
Eloy Lafuente (stronk7) [Wed, 18 May 2016 17:34:25 +0000 (19:34 +0200)]
MDL-54025 mod_lti: Amend tests to observe the new behavior
Eloy Lafuente (stronk7) [Wed, 18 May 2016 16:23:41 +0000 (18:23 +0200)]
Merge branch 'MDL-54553-master' of git://github.com/danpoltawski/moodle
Stephen Bourget [Wed, 18 May 2016 13:08:24 +0000 (09:08 -0400)]
MDL-54578 Behat: Add tests for the myprofile block
Eloy Lafuente (stronk7) [Wed, 18 May 2016 11:36:45 +0000 (13:36 +0200)]
Merge branch 'MDL-53896-master' of git://github.com/cameron1729/moodle
Dan Poltawski [Wed, 18 May 2016 10:38:30 +0000 (11:38 +0100)]
Merge branch 'MDL-54025_master' of https://github.com/snake/moodle
Dan Poltawski [Thu, 12 May 2016 12:26:07 +0000 (13:26 +0100)]
MDL-54553 behat: check statuscode of http request
Dan Poltawski [Wed, 18 May 2016 10:05:06 +0000 (11:05 +0100)]
Merge branch 'MDL-54027-master' of git://github.com/FMCorz/moodle
Dan Poltawski [Wed, 18 May 2016 09:45:22 +0000 (10:45 +0100)]
Merge branch 'wip-mdl-53956' of https://github.com/rajeshtaneja/moodle
Dan Poltawski [Wed, 18 May 2016 09:28:08 +0000 (10:28 +0100)]
Merge branch 'MDL-54549-master-en_fix' of git://github.com/mudrd8mz/moodle
David Monllao [Wed, 18 May 2016 08:20:27 +0000 (16:20 +0800)]
Merge branch 'wip-MDL-54061-master' of git://github.com/abgreeve/moodle
Adrian Greeve [Fri, 6 May 2016 09:02:38 +0000 (17:02 +0800)]
MDL-54061 mod_assign: Added encoding and separator to upload form.
Added the fields of encoding and separator so that the user has
more control when uploading a csv assignment grading file.
David Monllao [Wed, 18 May 2016 06:12:21 +0000 (14:12 +0800)]
MDL-45390 grades: Bump build to today's date
To test backup/restore.
David Monllao [Wed, 18 May 2016 06:10:31 +0000 (14:10 +0800)]
Merge branch 'wip-MDL-45390-master' of git://github.com/abgreeve/moodle
David Monllao [Wed, 18 May 2016 06:02:00 +0000 (14:02 +0800)]
Merge branch 'MDL-54594-master' of git://github.com/ryanwyllie/moodle
David Monllao [Wed, 18 May 2016 05:55:05 +0000 (13:55 +0800)]
Merge branch 'MDL-54544-master' of git://github.com/damyon/moodle
Ryan Wyllie [Wed, 18 May 2016 01:15:24 +0000 (01:15 +0000)]
MDL-54594 mod_assign: Fix editpdf toolbar breakpoints
Fixed the CSS media breakpoints for the editpdf toolbar after the
additional button was added.
Damyon Wiese [Wed, 18 May 2016 05:43:32 +0000 (13:43 +0800)]
MDL-54544 files: Better error handling in $fs->create_converted_document()
David Monllao [Wed, 18 May 2016 05:00:29 +0000 (13:00 +0800)]
Merge branch 'MDL-53883_master' of git://github.com/markn86/moodle
David Monllao [Wed, 18 May 2016 04:24:45 +0000 (12:24 +0800)]
Merge branch 'MDL-53805-master' of git://github.com/cameron1729/moodle
Conflicts:
theme/bootstrapbase/style/moodle.css
Andrew Nicols [Wed, 18 May 2016 04:04:44 +0000 (12:04 +0800)]
MDL-54620 rating: Add tests for get_aggregate_string
Andrew Nicols [Wed, 18 May 2016 04:04:20 +0000 (12:04 +0800)]
Merge branch 'MDL-54620_master' of git://github.com/dmonllao/moodle
Cameron Ball [Mon, 16 May 2016 04:51:23 +0000 (12:51 +0800)]
MDL-53896 core: Document Html2Text run-time overrides
Andrew Nicols [Thu, 28 Apr 2016 02:36:52 +0000 (10:36 +0800)]
MDL-53896 core: WIP bc layer for Html2Text
David Monllao [Wed, 18 May 2016 03:33:04 +0000 (11:33 +0800)]
Merge branch 'MDL-54119-master-with_progress_bar_template' of git://github.com/junpataleta/moodle
David Monllao [Wed, 18 May 2016 03:30:25 +0000 (11:30 +0800)]
Merge branch 'MDL-54595-master' of git://github.com/junpataleta/moodle
Adrian Greeve [Wed, 18 May 2016 01:45:34 +0000 (09:45 +0800)]
MDL-45390 gradebook: sql tidy up and version alignment.
Rajesh Taneja [Wed, 18 May 2016 02:35:59 +0000 (10:35 +0800)]
MDL-53956 behat: Avoid before and after step and switch
After pressing the button, if system is slow then
after step and before step might fail as the window
is closed by then. Execute steps one after other
Andrew Nicols [Wed, 18 May 2016 02:34:34 +0000 (10:34 +0800)]
Merge branch 'MDL-54049-master' of git://github.com/jleyva/moodle
David Monllao [Wed, 18 May 2016 02:30:30 +0000 (10:30 +0800)]
Merge branch 'MDL-54164-integration-cli-fix' of git://github.com/ryanwyllie/moodle
David Monllao [Tue, 17 May 2016 08:10:33 +0000 (16:10 +0800)]
MDL-45390 grades: Courses letters using system bad boundaries
Added unit tests to highlight the existing failures and adding
unset_config between each set of tests.
Adrian Greeve [Mon, 9 May 2016 02:33:54 +0000 (10:33 +0800)]
MDL-45390 gradebook: Grade boundary fix.
Code to upgrade, fix, and freeze the gradebook for
courses with letter boundary problems.
Adrian Greeve [Wed, 18 May 2016 01:54:55 +0000 (09:54 +0800)]
MDL-45390 gradebook: Behat tests for grade boundary issues.
Ryan Wyllie [Wed, 18 May 2016 01:48:37 +0000 (01:48 +0000)]
MDL-54164 notification: Add notification render to CLI renderer
Andrew Nicols [Wed, 18 May 2016 01:48:27 +0000 (09:48 +0800)]
Merge branch 'MDL-54542-master' of git://github.com/FMCorz/moodle
Adrian Greeve [Mon, 9 May 2016 02:29:43 +0000 (10:29 +0800)]
MDL-45390 gradebook: Unit tests for grade boundary issue.
Kevin Wiliarty [Tue, 26 Apr 2016 17:18:43 +0000 (13:18 -0400)]
MDL-54620 ratings: display '0' when aggregate = 0
David Monllao [Tue, 17 May 2016 23:11:25 +0000 (07:11 +0800)]
Merge branch 'MDL-54164-master' of git://github.com/ryanwyllie/moodle
David Mudrák [Tue, 17 May 2016 16:29:30 +0000 (18:29 +0200)]
MDL-54549 lang: Fix changed strings in behat scenario files
Helen Foster [Tue, 17 May 2016 15:53:47 +0000 (17:53 +0200)]
MDL-54549 lang: Merge English strings from the en_fix language pack
Michael Aherne [Tue, 17 May 2016 12:06:32 +0000 (13:06 +0100)]
MDL-54613 unit tests: Add iteminstance to test grade_item
Jake Dallimore [Tue, 17 May 2016 03:55:37 +0000 (11:55 +0800)]
MDL-54025 mod_lti: Use activity name when creating tool from cartridge.
Mark Nelson [Tue, 17 May 2016 09:40:28 +0000 (17:40 +0800)]
MDL-53883 core_form: updated the group elements ID
Dan Poltawski [Tue, 17 May 2016 09:49:40 +0000 (10:49 +0100)]
Moodle release 3.1rc1
Dan Poltawski [Tue, 17 May 2016 09:49:38 +0000 (10:49 +0100)]
Merge branch 'install_master' of https://git.in.moodle.com/amosbot/moodle-install
David Monllao [Tue, 17 May 2016 09:16:32 +0000 (17:16 +0800)]
NOBUG: Bumping versions after a rewrite
Andrew Nicols [Tue, 17 May 2016 07:42:49 +0000 (15:42 +0800)]
Merge branch 'MDL-52599_master' of https://github.com/markn86/moodle
Andrew Nicols [Tue, 17 May 2016 07:33:38 +0000 (15:33 +0800)]
Merge branch 'MDL-53962-master-alt' of git://github.com/cameron1729/moodle
Mark Nelson [Tue, 17 May 2016 05:43:12 +0000 (13:43 +0800)]
MDL-52599 block_rss_client: fixed various PHP errors
Adrian Greeve [Tue, 17 May 2016 00:22:15 +0000 (08:22 +0800)]
MDL-53923 mod_assign: Put messages into notifications.
The unoconv test page was before just outputting text to
page. Now it is wrapped in a nice notification. One of the
warnings has been improved as well.
David Monllao [Tue, 17 May 2016 03:16:34 +0000 (11:16 +0800)]
Merge branch 'MDL-54121-master' of git://github.com/damyon/moodle
Rajesh Taneja [Tue, 17 May 2016 05:11:01 +0000 (13:11 +0800)]
MDL-54573 testing: don't uppercase dbtype
Andrew Nicols [Tue, 17 May 2016 03:04:38 +0000 (11:04 +0800)]
Merge branch 'MDL-52599-master' of git://github.com/danpoltawski/moodle
Andrew Nicols [Tue, 17 May 2016 02:54:45 +0000 (10:54 +0800)]
Merge branch 'wip-mdl-54600' of https://github.com/rajeshtaneja/moodle
Michael Aherne [Tue, 17 May 2016 02:13:09 +0000 (10:13 +0800)]
MDL-54600 phpunit: fixed classname to follow frankenstyle
David Monllao [Tue, 17 May 2016 02:22:24 +0000 (10:22 +0800)]
Merge branch 'MDL-54573-master' of git://github.com/danpoltawski/moodle
David Monllao [Tue, 17 May 2016 02:03:19 +0000 (10:03 +0800)]
Merge branch 'MDL-54108-master' of git://github.com/marinaglancy/moodle
Andrew Nicols [Tue, 17 May 2016 01:30:16 +0000 (09:30 +0800)]
Merge branch 'MDL-54131_m31v4' of git://github.com/sbourget/moodle
Dan Poltawski [Mon, 16 May 2016 09:24:25 +0000 (10:24 +0100)]
Merge branch 'MDL-54545-master' of git://github.com/junpataleta/moodle
Dan Poltawski [Mon, 16 May 2016 09:21:11 +0000 (10:21 +0100)]
Merge branch 'MDL-54593_master' of git://github.com/markn86/moodle
Dan Poltawski [Mon, 16 May 2016 09:17:39 +0000 (10:17 +0100)]
Merge branch 'wip-MDL-54129-master' of git://github.com/abgreeve/moodle
Dan Poltawski [Mon, 16 May 2016 08:31:45 +0000 (09:31 +0100)]
Merge branch 'wip-MDL-53923-master' of git://github.com/abgreeve/moodle
David Monllao [Mon, 16 May 2016 08:15:03 +0000 (16:15 +0800)]
Merge branch 'MDL-54584-master' of git://github.com/andrewnicols/moodle
David Monllao [Mon, 16 May 2016 07:25:52 +0000 (15:25 +0800)]
Merge branch 'MDL-54177_master' of git://github.com/markn86/moodle
David Monllao [Mon, 16 May 2016 06:39:43 +0000 (14:39 +0800)]
Merge branch 'MDL-53311-master-moregooderer' of git://github.com/cameron1729/moodle
Andrew Nicols [Mon, 16 May 2016 06:27:06 +0000 (14:27 +0800)]
Merge branch 'MDL-54566_master' of git://github.com/markn86/moodle
Jun Pataleta [Mon, 16 May 2016 05:54:07 +0000 (13:54 +0800)]
MDL-54119 tool_lp: Modifications for progress bars
Changes made in this patch include:
* Reverting to the original look of having the percentage label of the
progress bar inside it.
* Setting a minimum width for the progress bar so the percentage label
will still be visible even at 0%.
* Replaced the blank space between the percent text and the percent
sign with a non-breaking space.
* Added relevant aria attributes for the progress bars.
* I think that this is a good opportunity to use a single template for the
progress bars so I created one that is basically based from the core
template columns-1to2. Column 1 contains the progress text, while column2
contains the progress bar itself.
Cameron Ball [Tue, 17 May 2016 05:38:52 +0000 (13:38 +0800)]
MDL-53805 theme: Give search icon more space
Ryan Wyllie [Tue, 17 May 2016 03:55:46 +0000 (03:55 +0000)]
MDL-54164 upgradelib: Remove close button on success notification
Jun Pataleta [Tue, 17 May 2016 03:53:10 +0000 (11:53 +0800)]
MDL-54595 mod_assign: Remove btn-group class
Jun Pataleta [Tue, 17 May 2016 02:18:36 +0000 (10:18 +0800)]
MDL-54595 tool_lp: Remove btn-group classes