Commit graph

18649 commits

Author SHA1 Message Date
Dan Poltawski
4b631c2d87 Merge branch 'wip-mdl-56898-fix2' of https://github.com/rajeshtaneja/moodle 2016-11-21 15:07:49 +00:00
Dan Poltawski
9446cb507c Merge branch 'MDL-56318-master' of git://github.com/damyon/moodle 2016-11-21 09:55:09 +00:00
Damyon Wiese
21a5c3c447 MDL-56318 assign: Polish for assign grading in boost
These styles mostly remove the responsiveness from the grading form.
2016-11-21 16:59:39 +08:00
Dan Poltawski
05551a935a Merge branch 'MDL-56849-master' of git://github.com/damyon/moodle 2016-11-21 08:36:27 +00:00
Dan Poltawski
f7d76254fd Merge branch 'MDL-56994-master-2' of git://github.com/junpataleta/moodle 2016-11-21 07:30:58 +00:00
Damyon Wiese
28f2458448 MDL-56849 mod_wiki: Update styles for boost
Make sure all form field have bootstrap styles. Use bootstrap tables on
tables. Remove custom styling. Prefer left-aligned text.
2016-11-21 15:19:16 +08:00
Rajesh Taneja
d9a9a87835
MDL-56898 behat: Ensure the page is stable before executing 2016-11-21 14:16:48 +08:00
Andrew Nicols
2380daba7b Merge branch 'MDL-57054-master' of git://github.com/jleyva/moodle 2016-11-21 12:38:05 +08:00
Andrew Nicols
23bb1871b3 Merge branch 'MDL-55275' of https://github.com/tobiasreischmann/moodle 2016-11-21 11:01:40 +08:00
Jun Pataleta
25bfa25190 MDL-56994 mod_forum: Auto-create news forum if course format supports it 2016-11-21 10:05:05 +08:00
Juan Leyva
8abfb7b1bb MDL-57054 mod_quiz: check_updates_since not returning questionids 2016-11-19 17:44:48 +00:00
David Monllao
aab30ea828 Merge branch 'MDL-55869_m32v1' of https://github.com/sbourget/moodle 2016-11-18 09:16:06 +08:00
David Monllao
74c21d51d0 Merge branch 'MDL-55566_m32v1' of https://github.com/sbourget/moodle 2016-11-18 09:05:13 +08: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
3d15dfc9d2 Merge branch 'MDL-56221' of https://github.com/bostelm/moodle 2016-11-17 13:31:33 +08:00
Henning Bostelmann
9574320a36 MDL-56221 mod_assign: Suppress unwanted grade notifications
* Quick grading: Properly recognize unchanged grades
* Individual grading: Amend JS that transfers checkbox state
2016-11-16 21:53:33 +00:00
Tobias Reischmann
1cca9a3479 MDL-55275 assign: Prevent exception under admin role assignment.
In group mode the submission status was displayed to admins.
This caused an exception when the admins were enrolled as teachers
in a course while being the only member of a group.
2016-11-16 16:55:22 +01:00
Dan Poltawski
7d3a7bbd1f Merge branch 'MDL-33960-lti-scroll' of https://github.com/gabrielrosset/moodle 2016-11-16 13:03:38 +00:00
David Monllao
e3cb80f10c Merge branch 'wip-MDL-56847-master' of git://github.com/marinaglancy/moodle 2016-11-16 19:38:08 +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
Andrew Nicols
4642a8c593 Merge branch 'MDL-56193-master' of git://github.com/damyon/moodle 2016-11-16 09:52:55 +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
6027eaebc5 Merge branch 'MDL-55848-master' of git://github.com/lameze/moodle 2016-11-15 16:33:26 +00:00
gabrielrosset
d030347bce MDL-33960 mod_lti: fix page scroll 2016-11-15 14:40:21 +01:00
Dan Poltawski
efe57105d6 Merge branch 'MDL-56903-master-enfix' of git://github.com/mudrd8mz/moodle 2016-11-15 10:42:36 +00:00
Helen Foster
7f6accd448 MDL-56903 lang: Merge English strings from the en_fix language pack 2016-11-15 11:19:48 +01:00
Damyon Wiese
998432c2c9 MDL-56724 mod_choice: Improve alignment and checkboxes on dates 2016-11-15 09:07:42 +00:00
Andrew Nicols
ebba556af7 Merge branch 'MDL-56844-master' of git://github.com/damyon/moodle 2016-11-15 09:07:38 +00:00
Eloy Lafuente (stronk7)
7a677348e4 Merge branch 'MDL-56724-master' of git://github.com/damyon/moodle 2016-11-15 09:07:34 +00:00
David Monllao
5a9a2c61b9 Merge branch 'MDL-56824-master' of git://github.com/damyon/moodle 2016-11-15 09:07:33 +00:00
Andrew Nicols
2fd423721f Merge branch 'MDL-56846-master' of git://github.com/damyon/moodle 2016-11-15 09:07:31 +00:00
Dan Poltawski
4f1ba09334 Merge branch 'MDL-54871' of https://github.com/bostelm/moodle 2016-11-15 09:07:31 +00:00
Dan Poltawski
6dad38deed Merge branch 'MDL-56913' of git://github.com/timhunt/moodle 2016-11-15 09:07:29 +00:00
Marina Glancy
5e5ce443fd MDL-56847 tags: exclude modules that are being deleted
we don't check any access for admins for performance reasons, course modules
that are in the process of deletion should be filtered out on the early stage
2016-11-15 14:34:18 +08:00
Damyon Wiese
f25185d7b0 MDL-56844 scorm: Review styles in boost theme
The main change is that in boost we get rid of the random centered text.
To compensate we use "container" which is fixed with with auto margins -
but the text is still left aligned.
2016-11-15 11:19:33 +08:00
Eloy Lafuente (stronk7)
de7e277e1f Merge branch 'MDL-56724-master' of git://github.com/damyon/moodle 2016-11-15 02:17:10 +01:00
Simey Lameze
3745973281 MDL-55848 assignfeedback_editpdf: remove problematic class_exists check
Due to a bug on opcache, this check had to be removed along the empty class to avoid
error on assignment grading interface.
2016-11-15 09:05:42 +08:00
David Monllao
3a14f060d1 Merge branch 'MDL-56824-master' of git://github.com/damyon/moodle 2016-11-15 09:03:52 +08:00
Andrew Nicols
181b5922ce Merge branch 'MDL-56846-master' of git://github.com/damyon/moodle 2016-11-15 08:05:54 +08:00
Dan Poltawski
493ec714fd Merge branch 'MDL-54871' of https://github.com/bostelm/moodle 2016-11-14 16:27:42 +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
Dan Poltawski
8d857d0ecc Merge branch 'MDL-56839-master' of git://github.com/jleyva/moodle 2016-11-14 13:06:48 +00:00
Eloy Lafuente (stronk7)
2dcb3746b0 Merge branch 'MDL-56794-master' of git://github.com/damyon/moodle 2016-11-14 12:28:29 +01:00
Dan Poltawski
4af34676f7 MDL-56719 mod_chat: clarify 'course theme' change
Plus remove some pointless code.
2016-11-14 11:09:23 +00:00
Dan Poltawski
e7bba8ce4d Merge branch 'MDL-56719-master' of git://github.com/damyon/moodle 2016-11-14 11:06:22 +00:00
Eloy Lafuente (stronk7)
95bfa52549 Merge branch 'MDL-56882-master' of git://github.com/crazyserver/moodle 2016-11-14 11:14:37 +01:00
Pau Ferrer Ocaña
0ffe8d2f0c MDL-56882 assign: Enable revert outcomes to No outcome 2016-11-14 09:56:35 +01:00