3969 Commits

Author SHA1 Message Date
Eloy Lafuente (stronk7)
75c57a08fb MDL-57266 upgrade: add 3.2.0 separation line to all upgrade scripts 2016-12-05 17:10:20 +01:00
Eloy Lafuente (stronk7)
f200f74552 Merge branch 'wip-MDL-57234-master' of https://github.com/Beedell/moodle 2016-12-01 17:58:51 +01:00
John Beedell
6c45e525fc MDL-57234 Quiz report: fix exception in Responses for all users 2016-12-01 16:23:18 +00:00
Eloy Lafuente (stronk7)
04649747a4 MDL-57197 versions: bump all versions and requires near release
version = 2016120500 release version
requires= 2016112900 current rc4 version
2016-11-29 22:57:05 +01:00
Dan Poltawski
c8012422eb Merge branch 'MDL-35949' of https://github.com/timhunt/moodle 2016-11-23 12:31:22 +00:00
Simey Lameze
bea19e0dec MDL-57059 theme_boost: add rule to fix slot number misalignment 2016-11-23 13:37:55 +08:00
Andrew Nicols
2380daba7b Merge branch 'MDL-57054-master' of git://github.com/jleyva/moodle 2016-11-21 12:38:05 +08:00
=
8c3882f369 MDL-53814 quiz: Question type column in manual grading
In the list of questions of the quiz manual grading
the question number (Q#) and the question name is displayed along
with an icon representing the question type.
2016-11-20 18:51:04 +01:00
Tim Hunt
030d8f22c2 MDL-35949 quiz accessibility: move input outside label 2016-11-20 16:59:00 +00:00
Juan Leyva
8abfb7b1bb MDL-57054 mod_quiz: check_updates_since not returning questionids 2016-11-19 17:44:48 +00:00
David Monllao
98f43f1b08 Merge branch 'MDL-56826-master' of git://github.com/damyon/moodle 2016-11-17 14:24:59 +08:00
Damyon Wiese
12d6dfc1ce MDL-56826 questions: Add styling for boost theme
Changes include:
* question: Add bootstrap classes to buttons and selects so they look consistent.

* mod_quiz: Add bootstrap styles to report form elements

* question: Add bootstrap classes to question form elements

* And remove the success/fail styles from boost because they conflict badly
with the quiz plugin styles (making unreadable text).

* quiz: nav block buttons had black background

* quiz: Add bootstrap styles to quiz navigation buttons

* qtype_ddmarker: Remove bullets from list

Edit form coordinates preview had list bullets for each coordinate.

* boost: Prevent menu scrolling on quiz edit

* mod_quiz: Add bootstrap styles to edit quiz fields

Pagination and max grades forms.

* quiz: Undo some custom styles on review options

These checkboxes were laid out in a fake grid with no responsiveness
that conflicts with the bootstrap form-inline templates. Reset the
custom style to bootstrap default.

* quiz: Fix unit tests for boost changes

* qtype_ddwtos: Accurate positioning of drop targets

* questions: Make the review page responsive

* question: bootstrap 4 compatibility

.alert in bs4 contains no colours by default, you need to mix it with
one of the context classes to get some change in colours, borders etc.
2016-11-17 14:20:52 +08:00
Andrew Nicols
901c0ea7de Merge branch 'wip_MDL-48055_master_quiz_activity_report_grade_visibility' of https://github.com/POETGroup/moodle 2016-11-16 10:08:13 +08:00
Mike Churchward
930570b410 MDL-48055 q_u_outline, q_u_complete: added checks for grade visibility. 2016-11-15 12:35:38 -05:00
Dan Poltawski
6dad38deed Merge branch 'MDL-56913' of git://github.com/timhunt/moodle 2016-11-15 09:07:29 +00:00
Dan Poltawski
8bcc2cbd8a Merge branch 'MDL-56913' of git://github.com/timhunt/moodle 2016-11-14 13:58:47 +00:00
Dan Poltawski
20f576629b Merge branch 'wip_MDL-48055_master_quiz_activity_report_grade_visibility' of https://github.com/POETGroup/moodle 2016-11-14 13:39:56 +00:00
Dan Poltawski
585ba846da Merge branch 'mdl-56831-master' of https://github.com/Dagefoerde/moodle 2016-11-14 13:21:35 +00:00
Jan Dageförde
c2e123355d MDL-56831 quiz: Declare YUI dependencies explicitly where needed 2016-11-13 23:07:00 +01:00
Tim Hunt
f31d0fff2e MDL-56913 quiz: teachers should see a review link for a preview
So what they see is like what students see.
2016-11-11 16:51:54 +00:00
David Monllao
d72c9774ae Merge branch 'wip-mdl-56630' of git://github.com/rajeshtaneja/moodle 2016-11-08 14:47:25 +08:00
Rajesh Taneja
dc90838aaa
MDL-56630 behat: Click on link in specificed block/region 2016-11-08 14:45:43 +08:00
Rajesh Taneja
eaefd5bc57
MDL-55215 behat: autocomplete field requires javascript 2016-11-08 14:21:52 +08:00
Andrew Nicols
0e5db67d8e Merge branch 'MDL-55215-master' of git://github.com/damyon/moodle 2016-11-07 09:04:34 +08:00
David Monllao
e14f5db6a0 Merge branch 'wip-MDL-55930-master' of https://github.com/Beedell/moodle 2016-11-02 12:49:46 +08:00
Mike Churchward
a620c573bc MDL-48055 q_u_outline, q_u_complete: added checks for grade visibility. 2016-11-01 14:14:51 -04:00
John Beedell
7983265241 MDL-55930 Quiz: "Next page button" showing in sequential mode 2016-11-01 11:22:39 +00:00
Eloy Lafuente (stronk7)
a1f6a27c80 Merge branch 'MDL-47162' of git://github.com/merrill-oakland/moodle 2016-10-31 22:45:37 +01:00
Dan Poltawski
f2263f7c06 Merge branch 'MDL-56542-master-enfix' of git://github.com/mudrd8mz/moodle 2016-10-31 15:15:09 +00:00
Damyon Wiese
f7ed5cee30 MDL-56171 javascript: Make searchableselector wrap autocomplete
One less yui module.

Conflicts:
	lib/upgrade.txt
2016-10-28 13:13:22 +08:00
Amanda Doughty
cc350fd9c8 MDL-47162 core_message: Add course id to message eventdata 2016-10-27 18:11:27 +02:00
David Mudrák
98892c0467 MDL-56542 lang: Use the reworded string in the Behat scenario 2016-10-25 20:23:56 +02:00
Helen Foster
c9636ddd51 MDL-56542 lang: Merge English strings from the en_fix language pack 2016-10-25 20:12:52 +02:00
David Monllao
26aa08b2f8 Merge branch 'MDL-56307-master' of git://github.com/jleyva/moodle 2016-10-25 17:33:08 +08:00
Juan Leyva
65b2669d98 MDL-56307 course: Return time updated and times updated 2016-10-25 10:10:55 +01:00
Juan Leyva
02a73d767c MDL-56307 course: New course_check_module_updates_since method 2016-10-25 10:10:52 +01:00
Damyon Wiese
ba5c5083c5 MDL-55074 theme_boost: Behat fixes for latest theme changes
Fix I edit profile steps
Apply fixed header in css
Remove transitions from menus for behat
Be more specific about some "I follow" steps
Navigation path changes
"Current course" node removed from nav tree
Adapt tests because there are no default blocks
Force some space between action menu items
2016-10-21 16:06:54 +08:00
Rajesh Taneja
fbaf5d17d8 MDL-27072 behat: Removed wrong tag from feature 2016-10-13 19:32:08 +02:00
Rajesh Taneja
25b225a995 MDL-27072 behat: Fixed table separators 2016-10-13 19:32:07 +02:00
Eloy Lafuente (stronk7)
db43b23848 Merge branch 'wip-MDL-27072-master' of https://github.com/Beedell/moodle 2016-10-11 02:42:02 +02:00
John Beedell
10c4fce520 MDL-27072 Quiz: Remove get_users_by_capability from quiz reports 2016-10-10 11:05:15 +01:00
Dan Poltawski
41a9a9219a MDL-56303 quiz: lack of quiz filtering
Also, correctly feed completiongradeitemnumber with grade item numbers
and not with grade item ids.
2016-10-06 22:24:57 +02:00
Cameron Ball
2ce9628484
MDL-54802 mod_quiz: Improve validation when editing a quiz uusing require passing grade
When editing a quiz that is using the require passing grade completion method,
the grade to pass cannot be zero. Since the completion method is locked we
cannot recommend that the completion method is changed (as we do when the quiz
is being created). Instead we have to inform the user that the grade to pass
must not be zero.
2016-10-05 19:21:40 +08:00
Cameron Ball
26cb467b47
MDL-54802 mod_quiz: Move grade to pass error to require passing grade element
When using a passing grade of zero, with the required passing grade
option, an error was displayed on the "grade to pass" element.
This was confusing as the error message is referring to the
"Require passing grade" element. This patch moves the message to
the "Require passing grade" element.

Additionaly this patch fixes a small typo in a comment.
2016-10-05 17:14:00 +08: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
Juan Leyva
c8743f62b4 MDL-55728 webservice: Return editor files in Web Services 2016-10-03 16:49:13 +01:00
Dan Poltawski
2d71da6851 Merge branch 'MDL-54802-master' of git://github.com/lameze/moodle 2016-10-03 14:46:43 +01: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
aea8eaecde MDL-55168 css: use shorthand colour props when possible 2016-09-30 09:25:24 +01:00