Commit graph

19407 commits

Author SHA1 Message Date
Dan Poltawski
e43bab742d Merge branch 'MDL-55129-master' of git://github.com/jleyva/moodle 2016-10-05 08:08:11 +01:00
Andrew Nicols
3cf1fea55a MDL-56270 mod_book: Add next/prev chapter to attributes
This adds the details of the next/previous chapter to the image
attributes and link for the in-page chapter-to-chapter navigation.
2016-10-05 11:38:18 +08:00
David Monllao
c7fc66f2ac Merge branch 'MDL-45969-master' of git://github.com/damyon/moodle 2016-10-05 09:42:17 +08:00
Juan Leyva
30cdddb017 MDL-55129 mod_assign: Allow plugins to handle configs for external
Until now in the get_assignments WS all the settings for assignment
plugins (submission and feedback) are returned, this was bad because:

- It was returning settings for plugins that may not be enabled
- It was returning settings that would be a security risk (a third
party plugin including a password or credentials for connecting a
remote site)
- Some values was returned "raw" without further processing, for
example, maxsubmissionsizebytes returned 0 when using the plugin
default value instead a valid size
- Assignment plugins implemented an API for communication with the
external API, see for example: get_external_parameters, it didn’t make
sense had an API for the received parameters and not the returned data.
2016-10-04 20:28:38 +01:00
Eloy Lafuente (stronk7)
461e98cdd7 Merge branch 'MDL-56069' of git://github.com/timhunt/moodle 2016-10-04 16:34:50 +02:00
Dan Poltawski
917a59a1a0 Merge branch 'MDL-55728-master' of git://github.com/jleyva/moodle 2016-10-04 10:15:37 +01:00
Andrew Nicols
c8379882b8 Merge branch 'MDL-56198' of git://github.com/timhunt/moodle 2016-10-04 09:01:25 +08:00
Juan Leyva
c8743f62b4 MDL-55728 webservice: Return editor files in Web Services 2016-10-03 16:49:13 +01:00
Tim Hunt
9bee35d5ad MDL-56198 assignment: improve grading info responsiveness 2016-10-03 16:09:21 +01:00
Dan Poltawski
2d71da6851 Merge branch 'MDL-54802-master' of git://github.com/lameze/moodle 2016-10-03 14:46:43 +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
David Monllao
c41132f075 Merge branch 'MDL-55168-master' of git://github.com/danpoltawski/moodle 2016-10-03 14:33:24 +08:00
Rajesh Taneja
24c2dcada5
MDl-56210 behat: Ensure page is loaded, before checking button 2016-10-03 13:03:51 +08:00
Tim Hunt
67c8c9b493 MDL-56069 quiz: nav buttons don't scroll to the right question
When there is more than one question on a page, say questions 2, 3 & 4.
Then when you click the navigation button for Q4, then it should load
the next page scrolled down so that Q4 is visible. That was not working.
2016-09-30 15:05:02 +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
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
bc33e9bd3f MDL-55168 css: reformat plain css with stylefmt 2016-09-30 09:25:23 +01:00
Damyon Wiese
f5ba9ac995 MDL-45969 editpdf: The logic for showing a previous attempt is wrong
It originally was only ever going to show static pdfs for older versions,
but this doesn't make sense in the UI for 3.1.
2016-09-30 13:15:00 +08: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
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)
7bc32ebccd Merge branch 'MDL-55785-master' of git://github.com/jleyva/moodle 2016-09-28 19:59:20 +02: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
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
Eloy Lafuente (stronk7)
df4de02f17 Merge branch 'MDL-55866-master' of git://github.com/andrewnicols/moodle 2016-09-28 02:29:45 +02:00
Rajesh Taneja
2ee249ac90
MDL-55957 behat: Set some text before selecting in Atto 2016-09-28 07:35:26 +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
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
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
6e181725ca Merge branch 'MDL-55472-assign-extend-ignored-validation' of https://github.com/ilya-catalyst/moodle 2016-09-26 15:31:30 +01:00
Ilya Tregubov
ffcfffbe64 MDL-55472 assign: Show userlist on extension form error page 2016-09-25 11:29:43 +10: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
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
Damyon Wiese
890c260307 MDL-55071 phpunit: Fix failing tests due to changes in default output
Part of MDL-55071
2016-09-23 10:57:13 +01:00
Frederic Massart
137c289a19 MDL-55593 theme_noname: Post-prod on preset default styling
Some styles were moved to be part of the core SCSS rules. Extra
variables were removed, and other styles where adapted.

Part of MDL-55071
2016-09-23 10:55:18 +01:00
Frederic Massart
9189888989 MDL-55797 mod_quiz: Convert question chooser to template
Part of MDL-55071
2016-09-23 10:55:17 +01:00