Commit graph

82291 commits

Author SHA1 Message Date
David Monllao
92ba7648fe Merge branch 'MDL-56905-master' of git://github.com/jleyva/moodle 2016-11-15 09:07:37 +00:00
Andrew Nicols
2d45ac279d Merge branch 'MDL-56823' of git://github.com/aolley/moodle 2016-11-15 09:07:36 +00:00
David Monllao
1cc10f3f67 Merge branch 'MDL-56895-master' of git://github.com/danpoltawski/moodle 2016-11-15 09:07:35 +00:00
David Monllao
0fef835188 Merge branch 'MDL-56739-master' of git://github.com/jleyva/moodle 2016-11-15 09:07:35 +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
Eloy Lafuente (stronk7)
2589802489 Merge branch 'MDL-56910-master' of git://github.com/danpoltawski/moodle 2016-11-15 09:07:33 +00:00
David Monllao
5a9a2c61b9 Merge branch 'MDL-56824-master' of git://github.com/damyon/moodle 2016-11-15 09:07:33 +00:00
David Monllao
39e7d46d89 Merge branch 'MDL-56834-master-fix1' of http://github.com/damyon/moodle 2016-11-15 09:07:32 +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
642bbbdd10 Merge branch 'MDL-54782_master' of git://github.com/markn86/moodle 2016-11-15 09:07:30 +00:00
Dan Poltawski
4678592332 Merge branch 'MDL-56426_master' of git://github.com/markn86/moodle 2016-11-15 09:07:29 +00:00
Dan Poltawski
6dad38deed Merge branch 'MDL-56913' of git://github.com/timhunt/moodle 2016-11-15 09:07:29 +00:00
Dan Poltawski
d82aa0a2d9 MDL-56910 filepicker: fix eranously removed styles
No idea what happened to my testing of this change, but it was wrong.
2016-11-15 08:27:03 +00:00
Ankit Agarwal
dc48cc0a79 MDL-56911 themes: Resolve settings before calling parser 2016-11-15 13:34:52 +05:30
Damyon Wiese
fcd412470a MDL-56939 boost: Fix for bootstrap select reset
Bootstrap makes select form elements not using custom-select broken when
they have a size. The contents overflow the field.
2016-11-15 15:41:19 +08:00
Damyon Wiese
d9a1d6834c MDL-56193 theme_boost: Make the enrol users modal wider 2016-11-15 15:12:19 +08: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
946281d282 MDL-56958 ajax: Prefer the general renderer 2016-11-15 12:44:59 +08:00
Damyon Wiese
ae9bbd9847 MDL-56193 enrol_manual: Bootstrap styles for assign roles
Use a bootstrap popover for the assign roles form.
2016-11-15 11:29:49 +08:00
Damyon Wiese
f10ae4676d MDL-56193 enrol: Modernise the enrol users popup
This just injects bootstrap classes into the old yui2 thing. It needs
rewriting.
2016-11-15 11:29: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
David Monllao
b09db258e5 Merge branch 'MDL-56905-master' of git://github.com/jleyva/moodle 2016-11-15 10:55:20 +08:00
Andrew Nicols
857a0ab60e Merge branch 'MDL-56952-master' of git://github.com/damyon/moodle 2016-11-15 10:18:01 +08:00
Andrew Nicols
d7978641dc Merge branch 'MDL-56823' of git://github.com/aolley/moodle 2016-11-15 10:04:21 +08:00
David Monllao
6f0efcc891 Merge branch 'MDL-56895-master' of git://github.com/danpoltawski/moodle 2016-11-15 09:51:07 +08:00
David Monllao
d163d37593 Merge branch 'MDL-56739-master' of git://github.com/jleyva/moodle 2016-11-15 09:40:17 +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
Eloy Lafuente (stronk7)
852264ad23 Merge branch 'MDL-56910-master' of git://github.com/danpoltawski/moodle 2016-11-15 02:13:40 +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
Damyon Wiese
204413187e MDL-56952 plugininfo: You can uninstall theme_base 2016-11-15 08:55:41 +08:00
David Monllao
4b96878ab6 Merge branch 'MDL-56834-master-fix1' of http://github.com/damyon/moodle 2016-11-15 08:52:34 +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
729132fa6a Merge branch 'MDL-54782_master' of git://github.com/markn86/moodle 2016-11-14 16:23:33 +00:00
Dan Poltawski
f6dabb3194 MDL-56910 filepicker: give button BS styling 2016-11-14 15:46:49 +00:00
Dan Poltawski
cead8a8138 Merge branch 'MDL-56426_master' of git://github.com/markn86/moodle 2016-11-14 14:03:10 +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
55e54953a4 Merge branch 'MDL-56916-master-normalizedoc' of git://github.com/mudrd8mz/moodle 2016-11-14 13:09:48 +00:00
Dan Poltawski
8d857d0ecc Merge branch 'MDL-56839-master' of git://github.com/jleyva/moodle 2016-11-14 13:06:48 +00:00
Dan Poltawski
0b96b9c5c2 Merge branch 'MDL-56618-master' of git://github.com/damyon/moodle 2016-11-14 12:38:32 +00:00
Juan Leyva
449e15f092 MDL-56942 login: Add missing required lib in complete_user_login 2016-11-14 12:07:54 +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)
dd24216a3b Merge branch 'MDL-56880-m' of https://github.com/micaherne/moodle 2016-11-14 12:04:25 +01:00
Dan Poltawski
ed81eab309 Merge branch 'MDL-56935-master' of git://github.com/junpataleta/moodle 2016-11-14 10:49:23 +00:00