David Monllao
f59bab60c0
Merge branch 'wip-mdl-57168' of https://github.com/rajeshtaneja/moodle
2016-11-28 12:59:11 +08:00
Rajesh Taneja
47b03b9170
MDL-57168 behat: Fixed xpath to ensure active link is checked
2016-11-28 12:57:56 +08:00
Rajesh Taneja
d442a3169c
MDL-57168 behat: Return link is the existing category
2016-11-28 12:57:56 +08:00
Rajesh Taneja
3df6e801b5
MDL-57168 behat: Ensure drawer is open before clicking the link
2016-11-28 12:57:55 +08:00
David Monllao
920778eb93
Merge branch 'MDL-56619-master' of git://github.com/ryanwyllie/moodle
2016-11-28 12:45:46 +08:00
David Monllao
d826c64c57
Merge branch 'wip-mdl-57147' of https://github.com/rajeshtaneja/moodle
2016-11-28 12:40:27 +08:00
David Monllao
085e077fa3
Merge branch 'MDL-57146-master' of git://github.com/damyon/moodle
2016-11-28 12:15:30 +08:00
Ryan Wyllie
341da3e3fb
MDL-56619 theme: filemanager_selectlayout bootstrap 4 form styling
2016-11-28 03:42:40 +00:00
David Monllao
dd106016ee
Merge branch 'MDL-57122-master' of git://github.com/ankitagarwal/moodle
2016-11-28 11:31:05 +08:00
Ankit Agarwal
2adf5ef946
MDL-57122 boost: Don't escape strings twice
...
Strings should always be escaped in templates not before
2016-11-28 08:22:41 +05:30
Ankit Agarwal
6c4aba1e7e
MDL-57122 boost: Add context docs to login template
2016-11-28 08:22:41 +05:30
Rajesh Taneja
96813571b1
MDL-57147 phpunit: Check if time is greater than or equal to
...
Some windows only have 1/100 microtime resolution
so a lot of times it does not advance enough.
2016-11-28 09:40:21 +08:00
Dan Poltawski
39f621305d
Merge branch 'MDL-57134-master' of git://github.com/lameze/moodle
2016-11-25 12:35:17 +00:00
Dan Poltawski
1f5fbd1696
Merge branch 'wip-mdl-56659' of https://github.com/rajeshtaneja/moodle
2016-11-25 11:17:36 +00:00
Dan Poltawski
cdef9e91a3
Merge branch 'MDL-56800-master-radio' of git://github.com/mudrd8mz/moodle
2016-11-25 10:44:19 +00:00
David Monllao
3eabedbb92
Moodle release 3.2rc3
v3.2.0-rc3
2016-11-25 15:58:02 +08:00
David Monllao
9441af9596
NOBUG: Fixed file access permissions
2016-11-25 15:58:02 +08:00
David Monllao
c08a263134
Merge branch 'install_master' of https://git.in.moodle.com/amosbot/moodle-install
2016-11-25 15:58:01 +08:00
Marina Glancy
392367c4f7
MDL-56586 behat: fix behat tests to work with new add block
2016-11-25 14:04:10 +08:00
Rajesh Taneja
350d0ae6b7
MDL-56659 core: Enable password field when label is clicked
2016-11-25 12:09:37 +08:00
Rajesh Taneja
dfa707c994
MDL-56659 core: No need for noscript tag and set size later
...
1. BrowserKitDriver::setValue only checks if the element is
disabled. It still is able to set value on hidden elements
So there is no need for noscript tag in password unmask
2. Set size on hidden field is not valid html, so set it later
when text element is displayed
2016-11-25 12:09:37 +08:00
David Monllao
0d9d55a3ad
Merge branch 'MDL-56584-master-fix1' of http://github.com/damyon/moodle
2016-11-25 11:15:32 +08:00
David Monllao
b4f82837ba
Merge branch 'MDL-55324-master-fix' of git://github.com/cameron1729/moodle
2016-11-25 11:11:20 +08:00
David Monllao
bae517c616
Merge branch 'MDL-57094-int-patch-1' of github.com:ryanwyllie/moodle
2016-11-25 10:52:00 +08:00
David Monllao
b68af8e6f8
Merge branch 'MDL-56801-master' of git://github.com/lameze/moodle
2016-11-25 10:40:39 +08:00
Ryan Wyllie
af46d1dd23
MDL-57094 admin_tool: fix subscription behat tests
2016-11-25 02:24:33 +00:00
David Monllao
b35c209d76
MDL-56551 calendar: Update behat test according to DOM changes
2016-11-25 10:06:36 +08:00
Damyon Wiese
a1e8265d48
MDL-57146 boost: New tabbed settings page missing branch links
...
Branches that are also links were not showing as links.
2016-11-25 10:00:22 +08:00
David Monllao
b71149c9ac
Merge branch 'MDL-56761-master' of git://github.com/ryanwyllie/moodle
2016-11-25 09:36:17 +08:00
Damyon Wiese
262253f624
MDL-56584 boost: Use tabindex-1 on nav drawer
...
Also use aria-hidden on unicode symbol for hamburger.
2016-11-25 09:27:17 +08:00
David Monllao
c15f993cde
Merge branch 'wip-mdl-56898-fix4' of https://github.com/rajeshtaneja/moodle
2016-11-25 09:24:24 +08:00
Rajesh Taneja
d2a44a71ac
MDL-56898 behat: Focus only works with JS
2016-11-25 09:20:52 +08:00
David Monllao
92fa8b8fde
Merge branch 'MDL-57126-master' of https://github.com/snake/moodle
2016-11-25 09:18:26 +08:00
David Monllao
29c96d214b
Merge branch 'MDL-55857-master' of git://github.com/danpoltawski/moodle
2016-11-25 08:46:04 +08:00
Marina Glancy
1adf21fc1d
MDL-57019 behat: corrections to the selectors, adding waiting
2016-11-25 08:38:24 +08:00
Jake Dallimore
d714aeb4f5
MDL-57126 core: add 'scss' to list of core filetypes.
...
This allows filetype restrictions to work when uploading additional
preset files on the Boost admin settings page.
2016-11-25 07:53:59 +08:00
David Mudrák
c03f1de198
MDL-56800 theme_boost: Clean up rendering of the radio buttons
...
The <input type="radio"> element does not support the size attribute so
there is no point of rendering it. Also fixed the example data as the
field name must not contain any whitespace.
2016-11-24 23:50:21 +01:00
David Mudrák
edd837038a
MDL-56800 theme_boost: Display frozen form's radios as disabled
...
For frozen (read-only) forms, the radio widget was not displayed at all
and only the legend text was displayed. So it was not possible to see
which one of the radios in a group was selected.
This patch mimics the original quick form rendering and displays the
radio as disabled.
2016-11-24 23:47:39 +01:00
Dan Poltawski
ad76556b76
Merge branch 'MDL-56948-master' of https://github.com/lucisgit/moodle
2016-11-24 15:58:05 +00:00
Dan Poltawski
9cc9690575
Merge branch 'MDL-57102-master' of git://github.com/jleyva/moodle
2016-11-24 10:43:21 +00:00
Dan Poltawski
b001cd4b17
Merge branch 'MDL-56431-filter-fix' of git://github.com/abgreeve/moodle
2016-11-24 09:45:53 +00:00
Dan Poltawski
74b8557661
Merge branch 'MDL-57013_master' of https://github.com/nadavkav/moodle
2016-11-24 09:44:32 +00:00
Adrian Greeve
72a5842bd7
MDL-56431 messaging: Added aria label to filter.
...
Added an aria label to the course filter in the
messaging page.
2016-11-24 17:33:22 +08:00
Dan Poltawski
304e8a8d0c
Merge branch 'wip-MDL-56586-master-2' of git://github.com/marinaglancy/moodle
2016-11-24 09:30:29 +00:00
Dan Poltawski
c5c8f3a6f5
Merge branch 'MDL-57118-master' of git://github.com/damyon/moodle
2016-11-24 09:26:52 +00:00
Marina Glancy
86ac6a3763
MDL-57019 behat: make tab navigation compatible with boost
2016-11-24 16:47:00 +08:00
Simey Lameze
539de849cd
MDL-57134 core_badges: add missing badgeslib.php include
2016-11-24 16:45:17 +08:00
David Monllao
68dde67d9f
Merge branch 'MDL-57094-master' of git://github.com/ryanwyllie/moodle
2016-11-24 15:53:26 +08:00
David Monllao
8b81daf4dd
Merge branch 'MDL-56429-master' of git://github.com/ryanwyllie/moodle
2016-11-24 15:47:31 +08:00
David Monllao
4de871f4ca
Merge branch 'MDL-57001-master' of git://github.com/damyon/moodle
2016-11-24 15:29:04 +08:00