mirror_php/moodle
1
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-01-19 06:18:28 +01:00
Code Issues Projects Releases Wiki Activity
82,438 Commits 36 Branches 519 Tags
Commit Graph

5191 Commits

Author SHA1 Message Date
Dan Poltawski
92e20a1fa5 Merge branch 'MDL-57074-master' of https://github.com/snake/moodle 2016-12-13 09:26:10 +00:00
Andrew Nicols
08f96ac9d7 Merge branch 'MDL-57056_master' of https://github.com/nadavkav/moodle 2016-12-13 10:37:38 +08:00
Dan Poltawski
6d23f14a94 Merge branch 'MDL-55782-master-test' of git://github.com/ryanwyllie/moodle 2016-12-12 13:17:48 +00:00
Dan Poltawski
4d8c059cfa Merge branch 'wip-mdl-57325' of https://github.com/rajeshtaneja/moodle 2016-12-12 12:23:22 +00:00
Dan Poltawski
1b846b8ed6 Merge branch 'MDL-57171-master-2' of git://github.com/junpataleta/moodle 2016-12-12 10:31:16 +00:00
Jake Dallimore
c5b70d12f9 MDL-57074 Filepicker: Fix alias and link icons in RTL mode 
Fixed alignment of the images in RTL mode. Also fixed a z-index problem
in which the icons were displayed above the open drawer on narrow
screens.
 2016-12-12 08:24:16 +08:00
Rajesh Taneja
2700a9aff1
MDL-57325 behat: Fixed backup/restore steps to use proper api 2016-12-09 09:30:18 +08:00
Ryan Wyllie
568c785fda MDL-55782 groups: wrap long group names (theme: boost) 
In the groups UI if a group name is very long it now no longer underlaps
the user column on its right hand side.
 2016-12-08 06:36:19 +00:00
Marina Glancy
ef0d68e9b5 MDL-56614 behat: add missing wait for page is ready 2016-12-08 10:50:04 +08:00
=
efafa567e4 MDL-55782 groups: wrap long group names 
In the groups UI if a group name is very long it now no longer underlaps the user
column on its right hand side.
 2016-12-07 09:34:46 +01:00
Andrew Nicols
75af0aa680 Merge branch 'MDL-57266' of git://github.com/stronk7/moodle 2016-12-07 09:53:16 +08:00
Dan Poltawski
b864c7fa1d Merge branch 'MDL-57284-master' of git://github.com/ankitagarwal/moodle 2016-12-06 15:50:36 +00:00
Dan Poltawski
94d950601c Merge branch 'MDL-56778_master' of https://github.com/nadavkav/moodle 2016-12-06 12:30:28 +00:00
Nadav Kavalerchik
4b80e95c73 MDL-57056 Theme/Boost: Fix "Skip to" link when Tab key pressed 2016-12-06 09:55:11 +02:00
Ankit Agarwal
59def6f397 MDL-57284 boost: Fix booktool_print icons 2016-12-06 11:51:02 +05:30
Andrew Nicols
5b67c9ecd1 Merge branch 'wip-MDL-56614-master-2' of https://github.com/marinaglancy/moodle 2016-12-06 13:37:33 +08:00
Marina Glancy
e5287f9b3b MDL-56614 behat: navigate without navigation and admin blocks 2016-12-06 11:49:14 +08:00
Marina Glancy
ebcff7e256 MDL-56614 behat: new steps for navigation without blocks 2016-12-06 11:49:11 +08:00
Eloy Lafuente (stronk7)
75c57a08fb MDL-57266 upgrade: add 3.2.0 separation line to all upgrade scripts 2016-12-05 17:10:20 +01:00
Simey Lameze
3eefa8a59f MDL-56759 themes: fix badge list alignment issues 2016-12-05 15:19:18 +08:00
David Monllao
76e337ab96 Merge branch 'MDL-57232-master' of git://github.com/damyon/moodle 2016-12-02 14:20:17 +08:00
Damyon Wiese
9d1402abd8 MDL-57232 blocks: Split undeletableblocktypes 
There are 2 kinds of blocks that are undeletable. Those required by the
theme and those protected via the admin page ui. We only want the theme
ones to be auto created site wide if they don't exist - so we need to
rename the theme ones and split the logic.
 2016-12-02 12:32:03 +08:00
Jun Pataleta
5920f6338d MDL-57171 admin: Make environment check table look better 
* Use Bootstrap label classes for the text under the status column.
* theme_bootstrapbase:
  - Cleanup unnecessary classes and make .error styles consistent
    with .warn styles
* theme_boost:
  - Set font color appropriate for success, warning and error strings.
* Enclose report text in div so that the feedback texts will be
  displayed right below it.
 2016-12-01 22:55:10 +08:00
Dan Poltawski
063d5c28cf Merge branch 'MDL-57220-master' of git://github.com/damyon/moodle 2016-12-01 13:20:15 +00:00
David Monllao
2b114798b9 Merge branch 'MDL-57210-master' of git://github.com/ryanwyllie/moodle 2016-12-01 16:12:25 +08:00
Andrew Nicols
8f5de6f268 Merge branch 'MDL-56553-master-2' of git://github.com/ryanwyllie/moodle 2016-12-01 14:31:45 +08:00
Ryan Wyllie
3cc12bd747 MDL-57210 theme_boost: fix header buttons on smaller resolutions 2016-12-01 02:21:25 +00:00
Damyon Wiese
ef06bc18b0 MDL-57220 boost: Fix for date selector inline template 
It was putting the label on a separate line.
 2016-12-01 09:48:59 +08:00
Damyon Wiese
52ee200368 MDL-57220 boost: minimal fix for radio button template 
It still does not match
http://v4-alpha.getbootstrap.com/components/forms/#radios
but I don't want to make radical changes before 3.2 release.
 2016-12-01 09:48:06 +08:00
Ryan Wyllie
3eb3d916cb MDL-56553 tool_usertours: allow tours to be shipped with Moodle 2016-12-01 00:36:02 +00:00
Dan Poltawski
ce7149b10c MDL-57197 js: fix AMD module warnings 
In 3.2 we are free of AMD lint warnings, unfortunately we can't expose
them through grunt yet due to
"File ignored because of a matching ignore pattern. Use "--no-ignore" to
override"

ps. this isn't related to MDL-57197 at all, i'm just a Rebel
 2016-11-30 13:50:38 +00:00
David Monllao
99d2667f5c Merge branch 'MDL-57072-master' of git://github.com/junpataleta/moodle 2016-11-30 13:36:32 +08:00
Andrew Nicols
a57699ead8 Merge branch 'MDL-57177-master' of git://github.com/cameron1729/moodle 2016-11-30 13:15:58 +08:00
David Monllao
4495ddcf9f Merge branch 'MDL-56955-master' of git://github.com/lameze/moodle 2016-11-30 11:34:29 +08:00
Simey Lameze
45cd101f80 MDL-56955 theme_boost: fix login failure displaying on user menu 2016-11-30 11:32:38 +08:00
David Monllao
449b730e09 Merge branch 'MDL-57095-master' of git://github.com/ryanwyllie/moodle 2016-11-30 09:26:07 +08:00
Jun Pataleta
8ace7b6c34 MDL-57072 theme_boost: Render action menu for category management 2016-11-30 09:11:32 +08:00
Eloy Lafuente (stronk7)
04649747a4 MDL-57197 versions: bump all versions and requires near release 
version = 2016120500 release version
requires= 2016112900 current rc4 version
 2016-11-29 22:57:05 +01:00
David Mudrák
1270616023 MDL-56800 theme_boost: Radios should not have name if soft frozen, too 2016-11-29 11:32:28 +00:00
Andrew Nicols
06ded0ed5f MDL-56800 theme_boost: Remove name from hardFrozen radio 2016-11-29 08:11:31 +00:00
Ryan Wyllie
c22141bd0c MDL-57095 theme: fix content styling for notification page 2016-11-29 07:14:05 +00:00
Andrew Nicols
220f3ac711 MDL-56858 theme_boost: Correct bad merge conflict 2016-11-29 13:49:18 +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
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
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
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
Ryan Wyllie
12f7202177 MDL-57158 theme: add margin for icon in pull right menu 2016-11-29 00:34:44 +00:00