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
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
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
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
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
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
Cameron Ball [Mon, 16 May 2016 16:39:05 +0000 (00:39 +0800)]
MDL-53962 webservices: Make XML-RPC backwards compatible
Damyon Wiese [Thu, 12 May 2016 02:57:06 +0000 (10:57 +0800)]
MDL-54544 file: Use shared tmp storage for unoconv document conversions
Marina Glancy [Mon, 16 May 2016 07:17:57 +0000 (15:17 +0800)]
MDL-54108 mod_feedback: separate upgrade sql for mysql
Marina Glancy [Wed, 11 May 2016 05:38:01 +0000 (13:38 +0800)]
MDL-54108 mod_feedback: add unique index on values for completed items
Stephen Bourget [Mon, 16 May 2016 22:39:42 +0000 (18:39 -0400)]
MDL-54131 Behat: Fix hide all courses test
Dan Poltawski [Mon, 16 May 2016 10:04:32 +0000 (11:04 +0100)]
MDL-52599 rss block: clarifty sql and make style more moodley
Clement Smith [Thu, 28 Apr 2016 15:08:02 +0000 (10:08 -0500)]
MDL-52599 blocks/rss_client: Fix RSS block config page
This fixes an error where the RSS block config page would display
'Array' where the multiselect list of feeds should be when
accessed by a user who has not saved any RSS feed urls and yet the
block has been previously configured by another user.
Dan Poltawski [Mon, 16 May 2016 07:25:10 +0000 (08:25 +0100)]
MDL-54573 testing: don't uppercase dbtype
Mark Nelson [Mon, 16 May 2016 06:42:41 +0000 (14:42 +0800)]
MDL-54593 tool_lp: added missing 'alert' CSS class
Adrian Greeve [Wed, 11 May 2016 04:49:55 +0000 (12:49 +0800)]
MDL-54129 mod_lti: Show in course checkbox works properly.
The show in course setting for LTI would always be set to true
regardless of what was set.
Adrian Greeve [Mon, 9 May 2016 05:59:33 +0000 (13:59 +0800)]
MDL-53923 mod_assign: Movement of functions to file_storage.
Simey Lameze [Tue, 3 May 2016 08:04:16 +0000 (16:04 +0800)]
MDL-53923 mod_assign: test unoconv path
Mark Nelson [Fri, 13 May 2016 08:26:10 +0000 (16:26 +0800)]
MDL-54566 tool_lp: added message when no competencies present
Mark Nelson [Fri, 13 May 2016 03:29:57 +0000 (11:29 +0800)]
MDL-54177 enrol_lti: improved lang strings
Also removed unused strings.
Andrew Nicols [Mon, 16 May 2016 05:06:05 +0000 (13:06 +0800)]
Merge branch 'MDL-53221_master-information' of https://github.com/dmonllao/moodle
David Monllao [Fri, 13 May 2016 12:10:16 +0000 (20:10 +0800)]
MDL-53221 search: Renaming search areas
AMOS BEGIN
CPY [modulename,mod_folder],[search:activity,mod_folder]
CPY [modulename,mod_label],[search:activity,mod_label]
CPY [modulename,mod_page],[search:activity,mod_page]
CPY [modulename,mod_resource],[search:activity,mod_resource]
CPY [modulename,mod_url],[search:activity,mod_url]
AMOS END
David Monllao [Mon, 16 May 2016 04:50:13 +0000 (12:50 +0800)]
Merge branch 'MDL-54117-master' of https://github.com/barbararamiro/moodle
Andrew Nicols [Mon, 16 May 2016 04:21:20 +0000 (12:21 +0800)]
Merge branch 'MDL-54550_master' of git://github.com/markn86/moodle
Mark Nelson [Thu, 12 May 2016 09:11:08 +0000 (17:11 +0800)]
MDL-54550 enrol_lti: show plugin description and warning
- Updated and added plugin description to the settings page.
- Added warning when the auth_lti plugin is not enabled.
- Moved existing 'Allow frame embedding' warning above the
'User default values' heading.
Andrew Nicols [Mon, 16 May 2016 04:11:19 +0000 (12:11 +0800)]
Merge branch 'MDL-54560_master' of git://github.com/dmonllao/moodle
Andrew Nicols [Mon, 16 May 2016 04:05:34 +0000 (12:05 +0800)]
Merge branch 'wip-mdl-54588' of https://github.com/rajeshtaneja/moodle
David Monllao [Mon, 16 May 2016 04:03:07 +0000 (12:03 +0800)]
Merge branch 'MDL-54133_m31v1' of https://github.com/sbourget/moodle
David Monllao [Mon, 16 May 2016 04:01:37 +0000 (12:01 +0800)]
Merge branch 'MDL-54131_m31v3' of https://github.com/sbourget/moodle
Andrew Nicols [Mon, 16 May 2016 03:56:16 +0000 (11:56 +0800)]
Merge branch 'MDL-54128_masterv2' of https://github.com/snake/moodle
David Monllao [Mon, 16 May 2016 03:52:02 +0000 (11:52 +0800)]
Merge branch 'MDL-54026-master' of git://github.com/andrewnicols/moodle
David Monllao [Mon, 16 May 2016 03:31:41 +0000 (11:31 +0800)]
Merge branch 'MDL-54130_m31v2' of https://github.com/sbourget/moodle
Andrew Nicols [Mon, 16 May 2016 03:07:38 +0000 (11:07 +0800)]
MDL-54584 repository: Set a default filename in prepare_file
vpisabeywardana [Thu, 17 Mar 2016 16:00:19 +0000 (21:30 +0530)]
MDL-52815 theme: group select overlapping issue
Gave minimum width for select tags which are under 'groups' and 'members' classes
David Monllao [Mon, 16 May 2016 02:38:14 +0000 (10:38 +0800)]
MDL-54560 search: Search box aligned with .usermenu on .navbar
Eric Merrill [Thu, 12 May 2016 18:27:45 +0000 (14:27 -0400)]
MDL-54560 search: Fix menu item to be correct height
Conflicts:
theme/bootstrapbase/style/moodle.css
Jake Dallimore [Fri, 13 May 2016 06:28:07 +0000 (14:28 +0800)]
MDL-54128 mod_lti: Add help for custom LTI tools in activity picker
Rajesh Taneja [Mon, 16 May 2016 01:13:29 +0000 (09:13 +0800)]
MDL-54588 behat: Button has been replaced with link
Adding a scale has been modified to use link
on outcome page
AMOS bot [Sat, 14 May 2016 16:04:36 +0000 (00:04 +0800)]
Automatically generated installer lang files
Stephen Bourget [Sat, 14 May 2016 02:05:33 +0000 (22:05 -0400)]
MDL-54131 Behat: tests for the course list block
Stephen Bourget [Sat, 14 May 2016 01:40:34 +0000 (21:40 -0400)]
MDL-54133 Behat: tests for the course overview block
Dan Poltawski [Fri, 13 May 2016 13:43:09 +0000 (14:43 +0100)]
MDL-54573 testing: use dbtype rather dbvendor for diagnostics
So that we can differentiate between drivers
David Monllao [Fri, 13 May 2016 10:33:23 +0000 (18:33 +0800)]
on-demand release 3.1beta+
David Monllao [Fri, 13 May 2016 10:33:22 +0000 (18:33 +0800)]
NOBUG: Fixed SVG browser compatibility
David Monllao [Fri, 13 May 2016 10:16:30 +0000 (18:16 +0800)]
NOBUG: ensure build number doesn't go backwards
(Due to reverts happening in MDL-45390 and MDL-52815)
Andrew Nicols [Fri, 13 May 2016 06:45:24 +0000 (14:45 +0800)]
Merge branch 'MDL-54073-master-2' of git://github.com/junpataleta/moodle
Andrew Nicols [Fri, 13 May 2016 05:34:45 +0000 (13:34 +0800)]
Merge branch 'wip-mdl-54561' of https://github.com/rajeshtaneja/moodle
Jun Pataleta [Fri, 13 May 2016 06:06:06 +0000 (14:06 +0800)]
MDL-54073 tool_lp: Unescape additional properties
* LP Blocks (Competency name)
* User evidence competency picker (User learning plan name)
* Template competencies (Course full name)
Andrew Nicols [Fri, 13 May 2016 04:24:28 +0000 (12:24 +0800)]
Merge branch 'MDL-50063' of git://github.com/stronk7/moodle
Andrew Nicols [Fri, 13 May 2016 04:13:35 +0000 (12:13 +0800)]
MDL-52253 scales: Correct doc
Damyon Wiese [Tue, 10 May 2016 08:26:08 +0000 (16:26 +0800)]
MDL-52253 scales: Prevent deletion of the last global scale
Damyon Wiese [Tue, 10 May 2016 08:15:28 +0000 (16:15 +0800)]
MDL-52253 scales: Add new competence scale
Damyon Wiese [Mon, 9 May 2016 05:51:40 +0000 (13:51 +0800)]
MDL-52253 scales: Install the separate and connected scale
Dan Poltawski [Thu, 12 May 2016 13:04:55 +0000 (14:04 +0100)]
Merge branch 'MDL-54101_master' of git://github.com/markn86/moodle
Dan Poltawski [Thu, 12 May 2016 12:58:08 +0000 (13:58 +0100)]
Merge branch 'MDL-54546-master' of git://github.com/junpataleta/moodle
Dan Poltawski [Thu, 12 May 2016 12:33:18 +0000 (13:33 +0100)]
Merge branch 'wip-mdl-54543' of https://github.com/rajeshtaneja/moodle
Andrew Nicols [Thu, 12 May 2016 05:35:53 +0000 (13:35 +0800)]
Merge branch 'MDL-54073-master' of git://github.com/junpataleta/moodle
Barbara Ramiro [Mon, 9 May 2016 05:56:44 +0000 (13:56 +0800)]
MDL-53822 editpdf: Much nicer icons for new drag-to-scroll feature
David Monllao [Thu, 12 May 2016 00:44:19 +0000 (08:44 +0800)]
Merge branch 'MDL-53822-master' of git://github.com/damyon/moodle
David Monllao [Wed, 11 May 2016 23:37:35 +0000 (07:37 +0800)]
Merge branch 'MDL-54098-master' of git://github.com/FMCorz/moodle
Cameron Ball [Thu, 28 Apr 2016 07:43:48 +0000 (15:43 +0800)]
MDL-53311 behat: Update behat navigation steps
