David Monllao
1e102ca3ca
Merge branch 'wip-mdl-57168-m1' of git://github.com/rajeshtaneja/moodle
2016-11-29 13:41:55 +08:00
Andrew Nicols
805659e1fa
Merge branch 'MDL-56919-master' of git://github.com/junpataleta/moodle
2016-11-29 12:06:56 +08:00
Jun Pataleta
01dc1c11ec
MDL-56919 mod_forum: Assign check icon for selected subscription mode
2016-11-29 12:03:34 +08:00
Rajesh Taneja
9eb8f6ec56
MDL-57168 behat: Don't press continue as it will go to Annotate PDF
...
This might cause random failures as the draft files are being accessed by other user
2016-11-29 10:53:02 +08:00
David Monllao
dc3e3c0831
Merge branch 'MDL-57097-master' of git://github.com/lameze/moodle
2016-11-29 10:51:10 +08:00
Dan Poltawski
ad76556b76
Merge branch 'MDL-56948-master' of https://github.com/lucisgit/moodle
2016-11-24 15:58:05 +00:00
Andrew Nicols
9a102866be
Merge branch 'MDL-56564-master-2' of git://github.com/junpataleta/moodle
2016-11-24 15:22:12 +08:00
Marina Glancy
b0842f61f4
MDL-57019 behat: new step to navigate to gradebook section
2016-11-24 12:46:27 +08:00
Simey Lameze
b6f549d139
MDL-57097 mod_assign: add event listener to avoid form submit
2016-11-24 11:24:25 +08:00
Jun Pataleta
144c149704
MDL-56564 mod_lti: Reset fields before updating tool matches
2016-11-24 11:09:03 +08:00
Dan Poltawski
c8012422eb
Merge branch 'MDL-35949' of https://github.com/timhunt/moodle
2016-11-23 12:31:22 +00:00
Dan Poltawski
68153d5cbc
Merge branch 'MDL-56564-master-2' of git://github.com/junpataleta/moodle
2016-11-23 11:27:20 +00:00
Dan Poltawski
93b68886e9
Merge branch 'MDL-57093-master' of git://github.com/ryanwyllie/moodle
2016-11-23 10:32:01 +00:00
Dan Poltawski
19d8b0f9e1
Merge branch 'MDL-56182-master' of git://github.com/FMCorz/moodle
2016-11-23 08:26:38 +00:00
Andrew Nicols
2a58fef860
Merge branch 'MDL-57059-master' of git://github.com/lameze/moodle
2016-11-23 14:15:42 +08:00
Simey Lameze
bea19e0dec
MDL-57059 theme_boost: add rule to fix slot number misalignment
2016-11-23 13:37:55 +08:00
Jun Pataleta
1b669ebeba
MDL-56564 mod_lti: External tool form fixes
...
* Revert disabling of the Preconfigured tool field on edit mode
* Reset LTI tool configuration fields when selecting a different
preconfigured tool.
* Behat fixes for UI changes.
2016-11-23 13:10:51 +08:00
Andrew Nicols
44cf94a877
Merge branch 'wip-MDL-57019-master' of git://github.com/marinaglancy/moodle
2016-11-23 11:54:16 +08:00
Ryan Wyllie
52aeda247c
MDL-57093 forum: less specific unread styling
...
Changed the CSS for unread styling to no longer use ids because the
rules are too specific and override other elements with the .unread
class on the forum pages.
2016-11-23 03:40:30 +00:00
Frederic Massart
6b7e523b5d
MDL-56182 mod_lti: Include the query string when comparing type URLs
2016-11-23 10:16:50 +08:00
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
Marina Glancy
fc14932c40
MDL-57019 core_grades: change default navigation to tabs
...
without navigation block in boost it is not easy to navigation between gradebook sections
2016-11-21 09:31:49 +08: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
Tony Butler
40e0baf08e
MDL-56948 mod_assign: Don't call get_grade_item() unless we have one
2016-11-18 15:37:09 +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
