Simey Lameze
1954b9d5c9
MDL-56785 theme_boost: remove unnecessary styling
2016-11-10 15:48:30 +08:00
David Monllao
a6fa0d9c97
Merge branch 'MDL-56766-master' of git://github.com/danpoltawski/moodle
2016-11-10 13:54:09 +08:00
David Monllao
8b3a8fa707
Merge branch 'wip-mdl-56397' of https://github.com/rajeshtaneja/moodle
2016-11-10 13:46:37 +08:00
David Monllao
096a418d01
Merge branch 'MDL-56715-master' of https://github.com/xow/moodle
2016-11-10 13:19:01 +08:00
Andrew Nicols
3302e8bfa5
Merge branch 'MDL-56820-master' of https://github.com/snake/moodle
2016-11-10 12:20:17 +08:00
Andrew Nicols
002ea88630
Merge branch 'MDL-54646-master' of git://github.com/junpataleta/moodle
2016-11-10 11:46:59 +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
Andrew Nicols
3b77723701
Merge branch 'MDL-56051-master' of git://github.com/damyon/moodle
2016-11-10 11:45:01 +08:00
David Monllao
5473943cac
Merge branch 'MDL-56832-master' of git://github.com/danpoltawski/moodle
2016-11-10 11:43:51 +08:00
David Monllao
af49935a53
Merge branch 'MDL-56753-master' of git://github.com/lameze/moodle
2016-11-10 11:38:24 +08:00
John Okely
eea9f10900
MDL-56715 form: Allow password unmask fields to be cleared in FF49
2016-11-10 11:22:59 +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
Tomasz Muras
ff1fc4d9f4
MDL-54646 tags: Hide manage tags in menu if tags disabled.
2016-11-10 10:59:06 +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
b8af6c1ef0
Merge branch 'MDL-56585-master' of git://github.com/danpoltawski/moodle
2016-11-10 09:53:28 +08:00
Andrew Nicols
743f9c8c42
Merge branch 'wip-mdl-56840' of https://github.com/rajeshtaneja/moodle
2016-11-10 09:38:26 +08:00
Andrew Nicols
a6f85967e0
Merge branch 'MDL-56754-master' of git://github.com/jleyva/moodle
2016-11-10 08:29:04 +08:00
Dan Poltawski
757aef2334
MDL-56766 calendar: improve calendar export labels
2016-11-09 17:00:05 +00:00
Dan Poltawski
2c212753fe
MDL-56585 tool_lpimportcsv: adjust help popups
2016-11-09 16:11:41 +00:00
Dan Poltawski
bc2aaef4fa
MDL-56832 theme_boost: Mention CSS in setting description
2016-11-09 14:50:07 +00:00
Dan Poltawski
224789b79c
Merge branch 'MDL-56863-master' of git://github.com/jleyva/moodle
2016-11-09 14:38:26 +00:00
Juan Leyva
678555b499
MDL-56863 tool_mobile: Capture moodle_exception in get_autologin_key
2016-11-09 13:20:49 +00:00
Dan Poltawski
793fe29014
Merge branch 'MDL-48498-master-iv6-undefinedfix' of https://github.com/snake/moodle
2016-11-09 12:16:03 +00:00
Juan Leyva
82f5802a94
MDL-56754 course: Stealth sections should be handled
...
Right now this WS is returning all the sections without advising if is
a stealth section or not, this have some implications (in the mobile
app right now the stealth sections are displayed)
2016-11-09 09:38:46 +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
Damyon Wiese
b8396c335a
MDL-56662 boost: Don't mess with display, set min-height
...
Changing the display was messing with the layout of some things in the
file picker. Lets set the min-height instead which has less
side-effects.
2016-11-09 15:14:24 +08:00
Damyon Wiese
eacf30e61f
MDL-56051 blocks: Support drag and drop blocks in boost.
2016-11-09 14:42:18 +08:00
Andrew Nicols
55a3911408
Merge branch 'MDL-56726-master-cfgadmin' of git://github.com/mudrd8mz/moodle
2016-11-09 14:37:47 +08:00
David Monllao
4e2ae9caee
Merge branch 'MDL-56596-master-fix' of git://github.com/andrewnicols/moodle
2016-11-09 14:35:41 +08:00
David Monllao
33788800ec
Merge branch 'MDL-56133' of https://github.com/NeillM/moodle
2016-11-09 14:23:50 +08:00
David Monllao
3f066469af
Merge branch 'wip-mdl-56630-fix2' of git://github.com/rajeshtaneja/moodle
2016-11-09 14:14:51 +08:00
Andrew Nicols
f2dab83445
MDL-56596 tool_usertours: Update to tours v0.9.9
2016-11-09 14:10:31 +08:00
David Monllao
38b74ef717
Merge branch 'MDL-56662-master' of git://github.com/damyon/moodle
2016-11-09 13:58:01 +08:00
Rajesh Taneja
d514d25e0a
MDL-56630 behat: Click on link in specificed block/region
2016-11-09 13:56:49 +08:00
Damyon Wiese
f87084f8f1
MDL-56662 theme_boost: Filepickers have 0 height
...
We need to set a display value on the file picker body so the inline height is ignored.
2016-11-09 13:55:45 +08:00
Rajesh Taneja
26ca972e9e
MDL-56840 behat: Wait till pdf conversion progress is finished
2016-11-09 13:39:00 +08:00
Rajesh Taneja
bd955bfea7
MDL-56397 behat: updated composer.lock to use behat 3.2.2
...
Behat 3.2.2 fixes transformation issue
2016-11-09 13:31:22 +08:00
David Monllao
6e986b2919
Merge branch 'mdl-54852-master' of https://github.com/Dagefoerde/moodle
2016-11-09 13:07:26 +08:00
David Monllao
0c499e0a5c
Merge branch 'MDL-53481-master-uniqsqlparam' of git://github.com/mudrd8mz/moodle
2016-11-09 12:49:17 +08:00
David Monllao
7ecf7511f8
Merge branch 'MDL-56694-master' of git://github.com/lameze/moodle
2016-11-09 12:24:17 +08:00
Andrew Nicols
16f9660cfe
Merge branch 'MDL-56196-master' of git://github.com/damyon/moodle
2016-11-09 11:59:02 +08:00
Jake Dallimore
c02778ac30
MDL-48498 admin: fix get_setting return for mixedhostiplist setting
2016-11-09 11:32:58 +08:00
Damyon Wiese
50302c404a
MDL-56790 boost: Styling fixes for mod_feedback
...
Also fixed are problems with frozen select from elements showing raw
HTML. I checked the other form templates for similar problems and fixed
them all.
2016-11-09 11:29:58 +08:00
Andrew Nicols
cfa4b26231
Merge branch 'MDL-56792-master-v2' of git://github.com/lameze/moodle
2016-11-09 11:27:57 +08:00
Simey Lameze
cff1f90adf
MDL-56792 core_charts: clean html content from title and labels
...
This commit add cleanData() and call it from all places that has labels or title
to guarantee that html content will not be printed on the chart.
2016-11-09 10:41:12 +08:00
Andrew Nicols
43bdbbf682
Merge branch 'MDL-56607-master' of git://github.com/jleyva/moodle
2016-11-09 09:39:48 +08:00
Eloy Lafuente (stronk7)
6c5ee657a7
Merge branch 'MDL-56699-master' of git://github.com/damyon/moodle
2016-11-09 02:11:55 +01:00
David Monllao
0cbfb7ff2a
Merge branch 'MDL-56409-master' of git://github.com/ankitagarwal/moodle
2016-11-09 08:36:36 +08:00