David Monllao
1e102ca3ca
Merge branch 'wip-mdl-57168-m1' of git://github.com/rajeshtaneja/moodle
2016-11-29 13:41:55 +08:00
David Monllao
7621fe8399
Merge branch 'MDL-57158-int-fix-1' of github.com:ryanwyllie/moodle
2016-11-29 13:36:52 +08:00
Damyon Wiese
0d5f5f7357
MDL-57124 boost: I want really tiny logos.
...
Said no-one ever.
Use max-height so very small logos will not be scaled up.
2016-11-29 13:21:35 +08:00
Marina Glancy
7d94f001e2
MDL-56829 media_videojs: play inline on iPhone with ios 10
2016-11-29 13:02:31 +08:00
Frederic Massart
e37c128686
MDL-57101 filter: Always set-up the page for filters
2016-11-29 12:36:28 +08:00
Frederic Massart
a174f2474f
MDL-57101 media_videojs: Set-up player on dynamically loaded content
2016-11-29 12:36:26 +08:00
Andrew Nicols
805659e1fa
Merge branch 'MDL-56919-master' of git://github.com/junpataleta/moodle
2016-11-29 12:06:56 +08:00
Jun Pataleta
01dc1c11ec
MDL-56919 mod_forum: Assign check icon for selected subscription mode
2016-11-29 12:03:34 +08:00
Andrew Nicols
740dbe77a2
Merge branch 'MDL-56858_master-alt-2' of git://github.com/markn86/moodle
2016-11-29 11:52:32 +08:00
David Monllao
8b516a6a55
Merge branch 'MDL-57163_master' of git://github.com/dmonllao/moodle
2016-11-29 11:46:55 +08:00
David Monllao
4a1165ba39
MDL-57163 install: Check curl availability before curl_version()
2016-11-29 11:46:06 +08:00
David Herney
5634310997
MDL-57169 backup: ensure images in category descriptions are shown
2016-11-29 11:40:47 +08:00
Rajesh Taneja
9eb8f6ec56
MDL-57168 behat: Don't press continue as it will go to Annotate PDF
...
This might cause random failures as the draft files are being accessed by other user
2016-11-29 10:53:02 +08:00
David Monllao
dc3e3c0831
Merge branch 'MDL-57097-master' of git://github.com/lameze/moodle
2016-11-29 10:51:10 +08:00
Cameron Ball
d91cbe1e62
MDL-57177 theme_boost: Use regular ! for advanced form fields
...
Previously we used U+2757 on advanced form fields, which was problematic
as it's part of emoji and displays differently on different platforms.
This is a problem since we explicitly style it to be blue, but, for
example on OS X it's red (since it gets replaced with their emoji).
2016-11-29 10:48:38 +08:00
Mark Nelson
8599ac9e56
MDL-57174 mod_lesson: show settings menu on edit.php page
2016-11-29 10:24:55 +08:00
Damyon Wiese
4d41cec8db
MDL-57124 boost: Show pageheaderbutton when no navbar
...
Even if there is no navbar - if there is a pageheaderbutton we need to
show it (E.g. Customise this page on dashboard).
2016-11-29 10:07:16 +08:00
David Mudrák
5e45c34221
MDL-57133 lang: Reword the strings in Behat tests too
2016-11-29 01:59:31 +01:00
Helen Foster
67823776a0
MDL-57133 lang: Merge English strings from the en_fix language pack
2016-11-29 01:49:28 +01:00
Ryan Wyllie
12f7202177
MDL-57158 theme: add margin for icon in pull right menu
2016-11-29 00:34:44 +00:00
Rajesh Taneja
8392a86068
MDL-57168 behat: Check for button not text
2016-11-29 07:36:43 +08:00
Mark Nelson
dc801cb6b9
MDL-56858 theme_boost: separate input description and label
...
Also added missing advanced and required form symbols.
2016-11-28 18:24:16 +08:00
Mark Nelson
4a8c6b4259
MDL-56682 mod_assign: ensure the variable is not null
2016-11-28 16:47:00 +08:00
Dan Poltawski
1cbc346092
Merge branch 'MDL-57176-master' of git://github.com/damyon/moodle
2016-11-28 08:30:37 +00:00
David Monllao
c56c23720b
Merge branch 'MDL-57124-master' of git://github.com/damyon/moodle
2016-11-28 15:22:46 +08:00
Damyon Wiese
7ad1d2da47
MDL-57124 Boost: Login page styles (and signup)
...
Center logo / site name.
Add padding to logo / site name.
Serve retina images and resize with css.
Add a line under the logo / site name.
Don't show site name if there is a logo.
Obey nonavbar option in core_renderer.
2016-11-28 15:20:35 +08:00
Ankit Agarwal
3d1be67752
MDL-57090 hubs: Replace smart select with searchableselect
2016-11-28 12:22:25 +05:30
Damyon Wiese
58ec5a315b
MDL-57176 blocks: Never never never dup blocks
...
Dont create duplicate blocks 'requiredbytheme' for any reason.
2016-11-28 14:48:02 +08:00
David Monllao
6ee691d71b
Merge branch 'MDL-57158-master' of git://github.com/ryanwyllie/moodle
2016-11-28 14:39:22 +08:00
Ryan Wyllie
60ff24c0f1
MDL-57158 theme: fix icon margin in action menus
2016-11-28 06:37:08 +00:00
David Monllao
c811356efb
Merge branch 'MDL-57156-master' of https://github.com/snake/moodle
2016-11-28 14:00:50 +08:00
John Okely
59b9c4d47a
MDL-54921 signup: Only clear wanturl when necessary
...
Thanks to Juho Jaakkola for original patch idea.
2016-11-28 13:54:52 +08:00
Vladimir Zhirov
acefc7d963
MDL-57163 installation: fixed "Call to undefined function curl_version"
2016-11-28 13:25:41 +08:00
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
Jake Dallimore
0395ec28e2
MDL-57156 themes: override caption alignment in theme boost
2016-11-28 11:35:11 +08: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
Jun Pataleta
894b1825f6
MDL-56919 boost: Render non-action menu items as disabled action links
2016-11-28 10:20:18 +08:00
Jun Pataleta
27a3843d05
MDL-56919 templates: action_link template fixes when disabled
...
For the case where the action_link template is shown as disabled:
* Allow extra classes to be set on on the class attribute.
* Allow extra attributes to be set.
2016-11-28 10:20:18 +08:00
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
AMOS bot
c1722505e1
Automatically generated installer lang files
2016-11-27 00:05:45 +08:00
Dan Poltawski
39f621305d
Merge branch 'MDL-57134-master' of git://github.com/lameze/moodle
2016-11-25 12:35:17 +00:00
