Commit Graph

24767 Commits

Author SHA1 Message Date
Andrew Nicols aac3b0bebb Merge branch 'MDL-55767-master' of git://github.com/damyon/moodle 2016-10-03 12:55:06 +08:00
Jake Dallimore d5553254e9 MDL-56010 libraries: Upgrade loglevel.js to 1.4.1 - post-import changes 2016-10-03 12:25:42 +08:00
Jake Dallimore 0b8cdaf6cb MDL-56010 libraries: Upgrade loglevel.js to 1.4.1 - library import 2016-10-03 12:23:28 +08:00
Damyon Wiese 5e4fffa013 MDL-55767 tool_lpimportcsv: import/export competency fmwks 2016-10-03 11:47:07 +08:00
David Monllao c31610afde Merge branch 'MDL-56127' of git://github.com/stronk7/moodle 2016-10-03 11:09:16 +08:00
David Monllao 92e3294dfc Merge branch 'MDL-56167-master' of git://github.com/danpoltawski/moodle 2016-10-03 11:04:34 +08:00
Andrew Nicols 5f21d5e8ab Merge branch 'MDL-39117' of git://github.com/mr-russ/moodle 2016-10-03 10:13:09 +08:00
Daniel Neis Araujo fbcdb0d710 MDL-22078 course: add end date 2016-10-03 09:51:36 +08:00
John Beedell 905953909f MDL-31243 access/enrol libs: rename new groups functions 2016-09-30 09:27:59 +01:00
John Beedell 9121bb2d23 MDL-31243 access/enrol libs: new fns returning useful SQL fragments
Refactor similar SQL generation code from get_users_by_capability
and get_enrolled_uses to make get_with_capability_sql.
Modified files: accesslib.php, enrollib.php, grouplib.php, new tests.
2016-09-30 09:27:56 +01:00
John Beedell 9f5170e955 MDL-31243 access/enrol libs: move enrol functions 2016-09-30 09:27:53 +01:00
Dan Poltawski 99fe296eb2 MDL-55168 css: remove 0-length units 2016-09-30 09:25:25 +01:00
Dan Poltawski aea8eaecde MDL-55168 css: use shorthand colour props when possible 2016-09-30 09:25:24 +01:00
Dan Poltawski bc33e9bd3f MDL-55168 css: reformat plain css with stylefmt 2016-09-30 09:25:23 +01:00
Neill Magill c3e1c98f04 MDL-52317 Atto: Large resized images may display scroll bars
When an image was added via Atto and it was set to resize automatically
if the alignment was set to Top, Middle or Bottom when it was made
smaller then a vertical scroll bar would be displayed.

This was caused by the interaction of the margin settings on the image
and the 100% width set via the img-responsive css class. The width of
an element only includes the content area and not any borders, padding
or margins.

This change stops atto hardcoding the styles for image alignment into
the images style tag, it instead adds a class that defines the alignment
the image should have.

This change has the benefit that themers will now be able to adjust
how atto image alignments work if they wish.

Images added before this patch will continue to have the issue
until they are edited by the plugin, at which time their legacy style
will be removed and the new alignment method will be added.

Thanks to Andrew Nicols who provided a refactor for the Alignment
and style detection code.
2016-09-30 08:48:33 +01:00
Rajesh Taneja c2b0213b08 MDL-55986 behat: Re-factor exiting api's
Return all features and contexts, so they can
be filtered well at one place
2016-09-30 13:32:20 +08:00
Rajesh Taneja eed52d64bb MDL-56210 behat: Ensure behat waits for dependancy manager 2016-09-30 10:19:09 +08:00
Jake Dallimore 20df227e22 MDL-56011 libraries: upgrade mustache.php to 2.11.1 2016-09-30 08:40:41 +08:00
Deepa Jayaprakash 9b24ebd665 MDL-55861 course: Click drag&drop icon, incorrect activities shown 2016-09-29 16:42:10 +01:00
Dan Poltawski 81c9e018b4 MDL-56172 admin: remove cssoptimiser config options 2016-09-29 16:41:29 +01:00
Dan Poltawski d52ebf11d3 MDL-56172 css: remove css optimiser
This functionality no longer makes sense inside Moodle now that we have
external tools like stylelint to help us with this. It was not able to
be used by any core themes.

The code was always marked as not for external use.
2016-09-29 16:40:40 +01:00
Eloy Lafuente (stronk7) 83edfba240 MDL-56127 forms: multiple select dependencies fixed
This is a fix for a regressions introduced by MDL-54778. It
seems that escaped all our tests because there isn't any case
of such a dependency in core, but Daniele Cordella was facing
it within his surveypro module.
2016-09-29 16:53:08 +02:00
Juan Leyva 80adabef0e MDL-55100 course: New Web Service get_courses_by_field 2016-09-29 12:20:49 +01:00
Simey Lameze 48dc4059da MDL-56000 lib: upgrade PHPMailer to 5.2.16 2016-09-29 15:09:10 +08:00
Eloy Lafuente (stronk7) d231f3cb0d Merge branch 'MDL-53870-master' of git://github.com/jleyva/moodle 2016-09-29 01:45:02 +02:00
Eloy Lafuente (stronk7) d0deb28c24 Merge branch 'MDL-55804_master' of git://github.com/dmonllao/moodle 2016-09-29 01:14:33 +02:00
Eloy Lafuente (stronk7) 1138bbc69e Merge branch 'wip-mdl-55879' of https://github.com/rajeshtaneja/moodle 2016-09-28 20:05:08 +02:00
Dan Poltawski 2b53e97cd3 MDL-56167 setup: bail out on lower version requirements in all cases
It's quite possible to get incomrehensible errors otherwise
2016-09-28 15:35:34 +01:00
Dan Poltawski 8793ebdd15 Merge branch 'MDL-55071-master-behat-fixes-is-back' of https://github.com/FMCorz/moodle 2016-09-28 12:00:17 +01:00
Frédéric Massart 17a6f94749 MDL-55071 behat: Action menus can be opened without Javascript
Standard action menus expand automatically when Javascript is disabled
thus there is no need to open them. In Boost, they expand when they're
hovered or when the focus is set on their trigger.
2016-09-28 11:50:09 +02:00
Frédéric Massart a82c49473b MDL-55071 behat: Adapting form_row selector to reflect recent changes
Labels are no longer used for static elements. The form row selector
has been changed to include "labels" from static elements.
2016-09-28 11:13:53 +02:00
Frédéric Massart d8f90ec628 MDL-56042 output: Post process with tree structure always returns CSS
A certain combination of booleans could cause some of the processes
not to take effect as the tree was not converted back into a string.
2016-09-28 09:58:47 +01:00
Juan Leyva 5635ead8e6 MDL-53870 mod_quiz: New access rule for allowing offline attempts 2016-09-28 09:25:18 +01:00
David Monllao e1555a7b36 Merge branch 'MDL-56070-master' of git://github.com/jleyva/moodle 2016-09-28 11:20:00 +08:00
David Monllao bdab41d71b Merge branch 'MDL-56072-master' of git://github.com/cameron1729/moodle 2016-09-28 08:37:48 +08:00
Eloy Lafuente (stronk7) ccc777032d MDL-46946 user: Document user_not_fully_set_up() changes 2016-09-28 02:18:43 +02:00
Eloy Lafuente (stronk7) 4dbddd0874 Merge branch 'MDL-46946-master-reqcusfield' of git://github.com/mudrd8mz/moodle 2016-09-28 02:12:59 +02:00
Eloy Lafuente (stronk7) b58bbbd4f1 Merge branch 'MDL-55951-master' of git://github.com/crazyserver/moodle 2016-09-27 23:59:21 +02:00
Dan Poltawski 8a28a2a393 Merge branch 'MDL-56013-master' of git://github.com/lameze/moodle 2016-09-27 17:30:02 +01:00
Dan Poltawski 76ff730228 Merge branch 'MDL-55987-master-grademem' of git://github.com/mudrd8mz/moodle 2016-09-27 11:23:51 +01:00
David Monllao 80180e0f92 MDL-55804 forms: Return exported data through _prepareValue 2016-09-27 08:11:56 +08:00
Dan Poltawski 62398cd807 Merge branch 'wip-MDL-55519-master' of git://github.com/abgreeve/moodle 2016-09-26 15:23:32 +01:00
Frédéric Massart afde59d26b MDL-55071 admin: Remove reference to former localisedtext class 2016-09-26 10:28:47 +01:00
Stephen Bourget 02ce2e413c MDL-45890 Blog: add additional events 2016-09-25 15:06:54 -04:00
Juan Leyva d44e2e42dc MDL-56070 user: New Web Service core_user_update_picture 2016-09-23 12:54:23 +01:00
Damyon Wiese e584e6ae46 MDL-55071 theme/output: PHPCS fixes for new theme branch
Part of MDL-55071
2016-09-23 10:57:36 +01:00
Damyon Wiese e8272e748c MDL-55071 theme_boost: Fix relevant JS warnings
Part of MDL-55071
2016-09-23 10:57:36 +01:00
Frederic Massart 8a40bc36a6 MDL-51948 admin: Guess RTL compatibility of settings using PARAM_ types
Part of MDL-55071
2016-09-23 10:57:35 +01:00
Damyon Wiese 5d9f0bb3fe MDL-55071 psr4: Use psr4 classloader for scss, rtlcss and cssparser
Part of MDL-55071
2016-09-23 10:57:35 +01:00
Damyon Wiese ff392efc89 MDL-55071 forms: Add upgrade.txt note about submitlink
We are deprecating submitlink because it was added a long time ago
and never used in Moodle. We can't test it or maintain it.

Part of MDL-55071
2016-09-23 10:57:13 +01:00