80378 Commits

Author SHA1 Message Date
Frédéric Massart
5f22879c3d MDL-56257 theme_boost: Killing that typo monster 2016-10-04 11:37:37 +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
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
Eloy Lafuente (stronk7)
7bc32ebccd Merge branch 'MDL-55785-master' of git://github.com/jleyva/moodle 2016-09-28 19:59:20 +02:00
Dan Poltawski
cf1d2cb073 Merge branch 'MDL-55420-master' of git://github.com/FMCorz/moodle 2016-09-28 14:03:52 +01:00
Frédéric Massart
89d9895b8c MDL-55420 theme_boost: Migrate CSS added since Boost development started 2016-09-28 14:51:29 +02: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
74804b57a4 MDL-53870 mod_quiz: Return sequence and time information for questions 2016-09-28 09:25:19 +01:00
Juan Leyva
5635ead8e6 MDL-53870 mod_quiz: New access rule for allowing offline attempts 2016-09-28 09:25:18 +01:00
Juan Leyva
8a972ab377 MDL-53870 mod_quiz: New settings for quiz attempts in the mobile app 2016-09-28 09:25:18 +01:00
Dan Poltawski
14d6945e65 Merge branch 'MDL-56102-master' of https://github.com/xow/moodle 2016-09-28 08:16:28 +01:00
John Okely
8e55ffc6c3 MDL-56102 enrol_lti: Removed unused lines in unit test 2016-09-28 14:54:04 +08: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