Commit graph

80568 commits

Author SHA1 Message Date
John Okely
8e55ffc6c3 MDL-56102 enrol_lti: Removed unused lines in unit test 2016-09-28 14:54:04 +08:00
David Mudrák
17f6270175 MDL-56143 theme_boost: Fix a typo in the readme string 2016-09-28 08:30:02 +02: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
303d122ae5 Merge branch 'MDL-55963-master' of git://github.com/lazydaisy/moodle 2016-09-28 09:34:52 +08:00
David Monllao
d830f1518a MDL-49609 mod_lti behat: Removing unexisting components 2016-09-28 09:03:09 +08:00
David Monllao
f747e45411 Merge branch 'MDL-49609-master-5' of git://github.com/junpataleta/moodle 2016-09-28 08:59:22 +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)
df4de02f17 Merge branch 'MDL-55866-master' of git://github.com/andrewnicols/moodle 2016-09-28 02:29:45 +02: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
Rajesh Taneja
2ee249ac90
MDL-55957 behat: Set some text before selecting in Atto 2016-09-28 07:35:26 +08: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
AMOS bot
3388603eda Automatically generated installer lang files 2016-09-28 00:04:32 +08:00
Dan Poltawski
f4760ed4bf Merge branch 'MDL-55071-master-behat-fixes' of https://github.com/FMCorz/moodle 2016-09-27 16:42:06 +01:00
Frédéric Massart
ce1a09f124 MDL-55071 mod_quiz: Fix behat selector for question chooser
The chooser template now re-uses a core one which caused the
IDs of the fields to be changed. The behat tests have been changed
to target the new IDs. Note: using the label values did not work
because more than one matched due to loose checking.
2016-09-27 17:39:46 +02:00
Frédéric Massart
b3d0a8b4a7 MDL-55071 behat: Normalise space on multi-field admin elements 2016-09-27 17:39:29 +02:00
Frédéric Massart
adbe0fcb70 MDL-55071 mod_quiz: Action menu items were hidden
The CSS rule was too vague and cause the menu items to be
hidden rather than just the first item.
2016-09-27 17:39:12 +02:00
Dan Poltawski
f6acae933c Merge branch 'MDL-56103-master' of git://github.com/dpalou/moodle 2016-09-27 16:17:57 +01:00
Dani Palou
7f98de7d9d MDL-56103 wiki: Return version in get_page_contents 2016-09-27 16:19:23 +02:00
Dan Poltawski
ec91fe32c3 Merge branch 'MDL-56040-master' of https://github.com/StudiUM/moodle 2016-09-27 14:57:18 +01:00
Dan Poltawski
6036184fab Merge branch 'MDL-56045-master' of git://github.com/jleyva/moodle 2016-09-27 12:24:59 +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
Dan Poltawski
6027b0de05 Merge branch 'MDL-54793-master' of git://github.com/cameron1729/moodle 2016-09-27 11:13:35 +01:00
Dan Poltawski
03b2e3a04d Merge branch 'MDL-55957-master-workshopfiles' of git://github.com/mudrd8mz/moodle 2016-09-27 10:37:06 +01:00
David Monllao
d656122f8a Merge branch 'MDL-37669-master' of git://github.com/andrewnicols/moodle 2016-09-27 17:34:24 +08:00
Dan Poltawski
13a18809e6 Merge branch 'MDL-55760-master' of https://github.com/StudiUM/moodle 2016-09-27 10:18:35 +01:00
David Monllao
f258a958a4 MDL-55804 tool_uploadcourse: strftime only to user input
Default value already comes as a timestamp.
2016-09-27 08:11:56 +08:00
David Monllao
80180e0f92 MDL-55804 forms: Return exported data through _prepareValue 2016-09-27 08:11:56 +08:00
Dan Poltawski
6e181725ca Merge branch 'MDL-55472-assign-extend-ignored-validation' of https://github.com/ilya-catalyst/moodle 2016-09-26 15:31:30 +01:00
Dan Poltawski
62398cd807 Merge branch 'wip-MDL-55519-master' of git://github.com/abgreeve/moodle 2016-09-26 15:23:32 +01:00
Dan Poltawski
c90ad348f1 MDL-55071 theme_boost: fix import-bootswatch.php phpdocs 2016-09-26 13:14:46 +01:00
Frédéric Massart
afde59d26b MDL-55071 admin: Remove reference to former localisedtext class 2016-09-26 10:28:47 +01:00
Dan Poltawski
dd460c22ed Merge branch 'MDL-55071-rebased' of git://github.com/danpoltawski/moodle 2016-09-26 10:28:12 +01:00
Stephen Bourget
02ce2e413c MDL-45890 Blog: add additional events 2016-09-25 15:06:54 -04:00
Ilya Tregubov
ffcfffbe64 MDL-55472 assign: Show userlist on extension form error page 2016-09-25 11:29:43 +10:00
lazydaisy
3299dab377 MDL-55963 theme_bootstrapbase: Remove depreciated Legacy CSS in 3.2 2016-09-24 12:47:00 +01:00
AMOS bot
4f660cea7d Automatically generated installer lang files 2016-09-24 00:04:25 +08:00
Issam Taboubi
22690d6d71 MDL-55760 tool_lp: Wrong rating display when more than one scale set 2016-09-23 11:01:32 -04:00
Jean-Philippe Gaudreau
32a904e0a5 MDL-56040 behat: Fixing missing "|" in tables 2016-09-23 09:19:35 -04:00
Juan Leyva
d44e2e42dc MDL-56070 user: New Web Service core_user_update_picture 2016-09-23 12:54:23 +01:00
Frédéric Massart
5142f56402 MDL-56063 theme_boost: Check and remove extraneous !important rules
Progress bar styling has been removed as they do not appear to
be used anywhere, though MDL-56095 has been created to style them
as (with or without the styles) they remain unstyled.

The file responsive.scss has been removed, it was not used.

Part of MDL-55071
2016-09-23 11:04:33 +01:00
Dan Poltawski
5cb8ca8610 MDL-55071 theme_boost: fixup bootswatch thirdpartylibs
Allow longhand colour codes for asthetics..
2016-09-23 10:57:54 +01:00
Dan Poltawski
d5d0a8028d MDL-55071 theme_boost: prevent phpcs complaints
The commenting rule is a bit weird, but we can get round it easily.
2016-09-23 10:57:54 +01:00
Dan Poltawski
dd9dd09587 MDL-55071 less: fix some lint issues we touched
(These will all be gone soon!)
2016-09-23 10:57:54 +01:00
Dan Poltawski
59652db27f MDL-55071 css: fix some lint issues 2016-09-23 10:57:53 +01:00
Dan Poltawski
0b2dc2751f MDL-55071 css: reformat some css files we touch with stylefmt 2016-09-23 10:57:36 +01:00
Dan Poltawski
46c1713c40 MDL-55071 theme_boost: fix stylelint detected issues in scss
Duplicate properties, star hacks
2016-09-23 10:57:36 +01:00
Frédéric Massart
f8ac90a753 MDL-56061 core: Permit usage of REM in CSS
Part of MDL-55071
2016-09-23 10:57:36 +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