Andrew Nicols
a4bf84ebda
Merge branch 'wip-MDL-31243-master' of https://github.com/Beedell/moodle
2016-10-04 09:19:42 +08:00
Andrew Nicols
c8379882b8
Merge branch 'MDL-56198' of git://github.com/timhunt/moodle
2016-10-04 09:01:25 +08:00
Andrew Nicols
2e80ff16dd
MDL-53777 tool_mobile: Adjust langstring
2016-10-04 08:53:19 +08:00
Andrew Nicols
27ed5be84f
Merge branch 'MDL-53777-master' of git://github.com/jleyva/moodle
2016-10-04 08:51:24 +08:00
Eloy Lafuente (stronk7)
b8c241b1fd
Merge branch 'MDL-56172-master' of git://github.com/danpoltawski/moodle
2016-10-04 00:53:02 +02:00
Eloy Lafuente (stronk7)
8f900947e9
Merge branch 'MDL-56166-master' of git://github.com/FMCorz/moodle
2016-10-04 00:41:00 +02:00
Eloy Lafuente (stronk7)
ed66d725e6
Merge branch 'MDL-56160-master' of git://github.com/dpalou/moodle
2016-10-04 00:39:06 +02:00
Dan Poltawski
e22ce8ab82
Merge branch 'MDL-56181-master-czechia' of git://github.com/mudrd8mz/moodle
2016-10-03 16:43:52 +01:00
Dan Poltawski
b9c3211c92
Merge branch 'MDL-56143-master-typo-boost' of git://github.com/mudrd8mz/moodle
2016-10-03 16:42:39 +01:00
Dan Poltawski
4e0f7f98ec
Merge branch 'MDL-52317' of https://github.com/NeillM/moodle
2016-10-03 16:09:25 +01:00
Tim Hunt
9bee35d5ad
MDL-56198 assignment: improve grading info responsiveness
2016-10-03 16:09:21 +01:00
Dan Poltawski
8ba8b13bd9
Merge branch 'MDL-55786-master' of git://github.com/jleyva/moodle
2016-10-03 15:44:40 +01:00
Dan Poltawski
2d71da6851
Merge branch 'MDL-54802-master' of git://github.com/lameze/moodle
2016-10-03 14:46:43 +01:00
Juan Leyva
afb7799a6d
MDL-55786 rating: New Web Service core_rating_add_rating
2016-10-03 12:22:29 +01:00
Juan Leyva
a497458c89
MDL-55786 rating: Move common code to new function
2016-10-03 12:17:09 +01:00
Dan Poltawski
5e0e9f3674
MDL-55740 mod_assign: bump version
2016-10-03 11:18:43 +01:00
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
Juan Leyva
0a90f6247d
MDL-53777 tool_mobile: New script for launching the mobile app
2016-10-03 10:02:33 +01:00
Juan Leyva
c951f1fe58
MDL-53777 tool_mobile: New setting typeoflogin, including WS
2016-10-03 10:02:33 +01:00
Juan Leyva
8a0a7414b2
MDL-53777 tool_mobile: Move mobile settings to the admin tool
2016-10-03 10:02:32 +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
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
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