Commit graph

80426 commits

Author SHA1 Message Date
Dan Poltawski
b885488c02 Merge branch 'MDL-55740-master' of git://github.com/jleyva/moodle 2016-10-03 11:16:09 +01:00
Dan Poltawski
c59a6ffd53 Merge branch 'MDL-55347-master' of git://github.com/jleyva/moodle 2016-10-03 10:31:52 +01:00
Dan Poltawski
3324250395 Merge branch 'wip-MDL-55911-master' of https://github.com/Beedell/moodle 2016-10-03 10:24:59 +01:00
Juan Leyva
649777fb8d MDL-55347 user: New WS core_user_set_users_preferences 2016-10-03 10:22:07 +01:00
Andrew Nicols
cd40761f63 Merge branch 'MDL-56003-master-int' of https://github.com/FMCorz/moodle 2016-10-03 15:57:46 +08:00
Frédéric Massart
13ca1c3101 MDL-56003 theme_boost: Update thirdpartylib.xml to reflect BS4 update 2016-10-03 09:48:37 +02:00
David Monllao
c41132f075 Merge branch 'MDL-55168-master' of git://github.com/danpoltawski/moodle 2016-10-03 14:33:24 +08:00
David Monllao
2e5a8fd7aa Merge branch 'wip-mdl-56210' of https://github.com/rajeshtaneja/moodle 2016-10-03 13:53:29 +08:00
David Monllao
6a9dc6b899 Merge branch 'MDL-55165-master' of git://github.com/danpoltawski/moodle 2016-10-03 13:31:36 +08:00
David Monllao
2f234a4af8 Merge branch 'MDL-56164-master' of git://github.com/danpoltawski/moodle 2016-10-03 13:07:01 +08:00
Rajesh Taneja
24c2dcada5
MDl-56210 behat: Ensure page is loaded, before checking button 2016-10-03 13:03:51 +08:00
David Monllao
7b7ddd97b9 Merge branch 'wip-MDL-55990-master' of git://github.com/marinaglancy/moodle 2016-10-03 13:00:08 +08:00
Andrew Nicols
dbab30b127 MDL-55767 competency: Deprecate langstring and replace 2016-10-03 12:59:32 +08:00
Andrew Nicols
aac3b0bebb Merge branch 'MDL-55767-master' of git://github.com/damyon/moodle 2016-10-03 12:55:06 +08:00
David Monllao
dae538606f Merge branch 'MDL-55964_master' of https://github.com/StudiUM/moodle 2016-10-03 12:40:25 +08:00
Damyon Wiese
9e14057444 MDL-55767 competencies: Better exceptions for persistent
The persistent exceptions "squash" all the details and only display
them to developers. This leads to generic "Invalid persistent" messages
with no explanation. Instead lets include the message detail always.
2016-10-03 12:01:56 +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
580d3fe780 Merge branch 'MDL-56003-master' of git://github.com/FMCorz/moodle 2016-10-03 10:51:43 +08:00
Andrew Nicols
5f21d5e8ab Merge branch 'MDL-39117' of git://github.com/mr-russ/moodle 2016-10-03 10:13:09 +08:00
Andrew Nicols
8bb7148a9a Merge branch 'MDL-56168-master' of git://github.com/FMCorz/moodle 2016-10-03 08:20:38 +08:00
John Beedell
b5cbcc4dfb MDL-55911 Quiz: Accessibility, Label blanks in DD questions 2016-09-30 09:43:59 +01:00
Dan Poltawski
e63d89a51d MDL-55168 assign: fix some incorrectly defined css transitions
The lint error suggests as though we were waiting 0s to do a
transiition of duration of 0s (i.e.  nothing), but thats not actually
the case.
2016-09-30 09:25:30 +01:00
Dan Poltawski
efd03a8e71 MDL-55168 report_competency: delete empty css file 2016-09-30 09:25:26 +01:00
Dan Poltawski
693652b78d MDL-55168 css: fix various errors detected by stylelint
Ignored properties, invalid propertiies, duplicates, invalid selectors..

Detected by stylelint rules:

http://stylelint.io/user-guide/rules/declaration-block-no-ignored-properties
http://stylelint.io/user-guide/rules/selector-type-no-unknown
http://stylelint.io/user-guide/rules/declaration-block-no-duplicate-properties
http://stylelint.io/user-guide/rules/max-line-length
http://stylelint.io/user-guide/rules/no-browser-hacks
2016-09-30 09:25:25 +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
e90cef839c MDL-55168 css: ignore some stylelint complains
1) Legacy css where it would not be a good use of time to
   update.

2) Ignored some long lines and added todo

3) Fixed some line length issues
2016-09-30 09:25:24 +01:00
Dan Poltawski
ed6aea6002 MDL-55168 css: fix spacing of selectors 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
Dan Poltawski
d5dff6316a MDL-55168 grunt: Add plain css linting 2016-09-30 09:25:23 +01:00
Dan Poltawski
195f42de40 MDL-56164 theme_boost: remove empty stylesheet 2016-09-30 08:55:06 +01:00
Dan Poltawski
ad9da28cb5 MDL-56164 theme_boost: remove empty stylesheet 2016-09-30 08:50:47 +01:00
Rajesh Taneja
eed52d64bb
MDL-56210 behat: Ensure behat waits for dependancy manager 2016-09-30 10:19:09 +08:00
Dan Poltawski
cdcfc4bcd2 MDL-55165 bootstrap: built css 2016-09-29 16:39:30 +01:00
Dan Poltawski
13e0d7f3e6 MDL-55165 stylelint: remove unset redundant properities rule
http://stylelint.io/user-guide/rules/shorthand-property-no-redundant-values/

Fred and I had discussed enabling this rule, but think it's better for
CSS newcomers to be disabled, so lets remove trace of it.
2016-09-29 16:39:30 +01:00
Dan Poltawski
07482105c1 MDL-55165 less: use lowercase hex codes for colours
And use shorthand where possible.

Detected by
http://stylelint.io/user-guide/rules/color-hex-case/
http://stylelint.io/user-guide/rules/color-hex-length/

When reviewing this change, you can hide the case changes by
reviewing with:
GIT_EXTERNAL_DIFF='diff -ipu   #' git diff --ext-diff
2016-09-29 16:39:30 +01:00
Dan Poltawski
65f9a71fbd MDL-55165 less: ensure no units on 0 length things
Detected by http://stylelint.io/user-guide/rules/length-zero-no-unit/
2016-09-29 16:39:30 +01:00
Dan Poltawski
62ce522cde MDL-55165 less: fix various errors in less
Detected by stylelint rules:

http://stylelint.io/user-guide/rules/declaration-block-no-ignored-properties/
http://stylelint.io/user-guide/rules/declaration-block-no-duplicate-properties/
http://stylelint.io/user-guide/rules/declaration-block-no-shorthand-property-overrides/
http://stylelint.io/user-guide/rules/value-keyword-case/
http://stylelint.io/user-guide/rules/selector-type-no-unknown/
http://stylelint.io/user-guide/rules/selector-type-no-unknown/
2016-09-29 16:39:30 +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
Dan Poltawski
ddd8dc0d1b weekly release 3.2dev 2016-09-29 12:42:50 +01:00
Dan Poltawski
e77a0e0922 Merge branch 'install_master' of https://git.in.moodle.com/amosbot/moodle-install 2016-09-29 12:42:48 +01:00
Frédéric Massart
36553104da MDL-56168 theme_boost: Make default accent colour match preset 2016-09-29 10:02:13 +02:00
Jun Pataleta
6c43d831f0 MDL-49609 mod_lti: Fixes for problems found in testing
* Load contentitem_return doc before processing
* Also use new AMD modal instead of the YUI one.
* Remove conversion of text columns in union queries
  - Since the value column in lti_types_config was changed to a
    text type, there is no need to use $DB->sql_compare_text()
    for the lti_types columns involved in the union queries in
    lti_get_type_config().
2016-09-29 11:13:50 +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
Rajesh Taneja
71ee163664
MDL-49609 behat: Replace deprecated step 2016-09-29 07:06:26 +08:00
Eloy Lafuente (stronk7)
b3823c4365 Merge branch 'MDL-56019-master' of git://github.com/dpalou/moodle 2016-09-28 20:08:31 +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