18613 Commits

Author SHA1 Message Date
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
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
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
David Mudrák
48ea715da0 MDL-56888 workshop: Fix Leap2A export of the workshop submission
The whole story described in the tracker. Shortly, Mahara seems to have
a bug (or undocumented feature) that it expects the Leap2A content
wrapped in a single container.
2016-11-10 15:30:11 +01:00
Damyon Wiese
930ce60550 MDL-56725 mod_data: better field alignment
Labels containing only accesshide text should have the accesshide class
on the label, not the content so the label does not push the content
down.
2016-11-10 16:25:48 +08:00
Damyon Wiese
398be7c897 MDL-56725 mod_data: coding style
Fixes from lines in the previous commit.
2016-11-10 16:21:01 +08:00
Damyon Wiese
e85fda95c6 MDL-56725 mod_data: Style fixes for boost theme 2016-11-10 16:21:01 +08:00
Damyon Wiese
16076f1e3d MDL-56811 forum: Auto create the latest news forum
When a course is created or updated, create a news forum if the
newsitems setting is > 0.
2016-11-10 13:51:02 +08:00
Andrew Nicols
3302e8bfa5 Merge branch 'MDL-56820-master' of https://github.com/snake/moodle 2016-11-10 12:20:17 +08:00
Jake Dallimore
700ef87691 MDL-56820 themes: Fix user search drop down on grading page for boost
Fixes a problem where the drop down list is cut off by overflow.
2016-11-10 11:45:59 +08:00
David Monllao
af49935a53 Merge branch 'MDL-56753-master' of git://github.com/lameze/moodle 2016-11-10 11:38:24 +08:00
Simey Lameze
763f7b05ae MDL-56753 mod_assign: behat tests for groups and grouping counting 2016-11-10 11:09:37 +08:00
Andrew Nicols
96eba6b982 Merge branch 'MDL-55883_m32v1' of https://github.com/sbourget/moodle 2016-11-10 11:06:11 +08:00
Simey Lameze
426bb5ae0f MDL-56753 mod_assign: fix groups and submitted counting on grading summary
This also fixes a coding error that was displayed when a group was not part of
assignment grouping.
2016-11-10 10:58:29 +08:00
Andrew Nicols
743f9c8c42 Merge branch 'wip-mdl-56840' of https://github.com/rajeshtaneja/moodle 2016-11-10 09:38:26 +08:00
Juan Leyva
6406431537 MDL-56839 upgrade.txt: Fix incorrect information in lib/upgrade.txt 2016-11-09 21:00:33 +00:00
Andrew Nicols
a2567336df Merge branch 'MDL-56755-m' of https://github.com/micaherne/moodle 2016-11-09 15:42:32 +08:00
Andrew Nicols
4cc6477198 Merge branch 'MDL-56790-master' of git://github.com/damyon/moodle 2016-11-09 15:40:16 +08:00