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
David Monllao
337b723b07
Merge branch 'MDL-56803-master' of git://github.com/damyon/moodle
2016-11-14 16:25:43 +08:00
Damyon Wiese
04165cd446
MDL-56803 glossary: More style fixes for glossary
...
Fix checkbox alignment for search on small screens, and put separation
between glossary items in a list.
2016-11-14 16:02:09 +08:00
Damyon Wiese
1093b461f6
MDL-56803 mod_glossary: Fix styles for boost theme
2016-11-14 15:43:58 +08:00
Damyon Wiese
f619064b9b
MDL-56719 boost: Style mod_chat for boost
...
I stayed away from big markup changes. This is a table layout so needs rewriting which is a big job.
2016-11-14 15:08:57 +08:00
David Monllao
fd887df697
Merge branch 'MDL-56888-master-workshop-leap2a' of git://github.com/mudrd8mz/moodle
2016-11-14 15:01:21 +08:00
Andrew Nicols
622c84f630
Merge branch 'MDL-56853-master' of git://github.com/damyon/moodle
2016-11-14 14:36:45 +08:00
Damyon Wiese
bf5dcc8abb
MDL-56724 mod_choice: coding style fixes
...
For the lines affected by this patch.
2016-11-14 11:38:36 +08:00
Damyon Wiese
eaf45bce09
MDL-56724 boost: Update mod_choice to use bootstrap classes for styles
2016-11-14 11:37:45 +08:00
Damyon Wiese
7d41ccf0fb
MDL-56794 boost: Styling for forum module
2016-11-14 11:30:17 +08:00
Damyon Wiese
0f76052836
MDL-56824 mod_lesson: Style fixes for theme_boost
2016-11-14 11:20:55 +08: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
3ecf492a75
Merge branch 'MDL-56811-master' of git://github.com/damyon/moodle
2016-11-11 12:13:30 +08:00
Andrew Nicols
a044ff57a1
Merge branch 'MDL-52216_master' of https://github.com/eugeneventer/moodle-fixes
2016-11-11 11:21:26 +08:00
Adrian Greeve
f65db49765
MDL-56363 mod_assign: Restrictions added for tutors.
...
If the grader does not have the accessallgroups capability,
or groups mode is set to separate groups and the user is not
a member of the group then no participants are shown.
2016-11-11 00:28:33 +01:00
Eugene Venter
dbd8cadb5c
MDL-52216 mod_lesson: prevent invalid view modes
2016-11-11 09:19:37 +13:00
Dan Poltawski
6063f62e7d
Merge branch 'MDL-56725-master' of git://github.com/damyon/moodle
2016-11-10 15:37:38 +00:00
Dan Poltawski
a3ead7172b
Merge branch 'MDL-55249_m32v1' of https://github.com/sbourget/moodle
2016-11-10 15:01:41 +00:00