mirror_php/moodle
1
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-01-18 14:03:52 +01:00
Code Issues Projects Releases Wiki Activity
72,195 Commits 36 Branches 519 Tags
Commit Graph

4230 Commits

Author SHA1 Message Date
David Monllao
fa42965c2a Merge branch 'm29_MDL-48805' of git://github.com/totara/moodle 2015-02-10 15:26:49 +08:00
David Monllao
912ec5c7c2 Merge branch 'm29_MDL-49064' of git://github.com/totara/moodle 2015-02-10 11:56:52 +08:00
Eloy Lafuente (stronk7)
ea4630411e Merge branch '39459-29' of git://github.com/samhemelryk/moodle 2015-02-09 13:17:32 +01:00
Brian Barnes
1d66182d65 MDL-49064 bootstrapbase: fixed rtl alignment of leftalign CSS class 2015-02-09 08:21:41 +13:00
Dan Poltawski
80f8372926 Revert "Merge branch 'MDL-37477-master' of git://github.com/jethac/moodle" 
This reverts commit f13e8ad04168574574d5be2995502d849109d3f9, reversing
changes made to c6bcbad07a7fd437991ee7a2a1a98973949fac43.
 2015-02-05 08:07:29 +00:00
Andrew Nicols
06569b71ac MDL-48160 theme: Add deprecation notice for legacy RTL styles 2015-02-04 09:18:22 +08:00
Andrew Nicols
0e642ea578 Merge branch 'wip-MDL-48160_master' of git://github.com/lazydaisy/moodle 2015-02-04 08:47:44 +08:00
Sam Hemelryk
7fa57e0341 MDL-39459 cache: mode included in stats output 
The cache store mode is now included in the performance stats
printed at the bottom of the page.
It is represented as either [a] [s] or [r] and a title is used
to actually state the mode.
 2015-02-04 09:35:21 +13:00
Mary Evans
73b425be07 MDL-48160 theme: Improve all block region layouts when coded for RTL. 2015-02-03 18:19:14 +00:00
Dan Poltawski
8c506dfacd Merge branch 'MDL-48933-master' of git://github.com/FMCorz/moodle 2015-02-03 15:09:33 +00:00
Eloy Lafuente (stronk7)
336314812f Merge branch 'MDL-48328_M29' of git://github.com/lazydaisy/moodle 
Conflicts:
	theme/bootstrapbase/style/moodle.css
 2015-02-03 11:42:41 +01:00
Andrew Nicols
f13e8ad041 Merge branch 'MDL-37477-master' of git://github.com/jethac/moodle 2015-02-03 13:48:54 +08:00
Jetha Chan
49faeef6bb MDL-37477 output: Add support for table captions 2015-02-03 13:38:24 +08:00
Mary Evans
76edd23810 MDL-48328 theme_bootstrapbase: Added update info to /readme_moodle.txt 2015-02-03 01:32:25 +00:00
Frederic Massart
cf4a17cb9b MDL-48933 core_message: New dialog to send a message to a user 2015-02-02 11:03:38 +08:00
Mary Evans
d439eeb0fc MDL-48328 theme_bootstrapbase: lessc is failing to compile our less. 2015-01-30 23:28:25 +00:00
Gareth J Barnard
eb1861983a MDL-46728 themes: WOFF2 fonts are not supported. 2015-01-29 16:11:43 +00:00
Brian Barnes
c430c2c246 MDL-48805 theme: Collapse now collapses all data-target 2015-01-26 11:34:33 +13:00
Dan Poltawski
b79dca85b7 Merge branch 'MDL-44907-master' of git://github.com/FMCorz/moodle 2015-01-12 11:28:12 +00:00
Frederic Massart
1920eebcaa MDL-44907 admin: Better styling of admin settings validation errors 2015-01-08 14:14:38 +08:00
Andrew Nicols
ac667aa0b7 Merge branch 'MDL-45930-master' of git://github.com/danpoltawski/moodle 2015-01-07 12:05:01 +08:00
Andrew Nicols
0a149cf019 Merge branch 'MDL-46183-master' of git://github.com/FMCorz/moodle 2015-01-05 11:56:26 +08:00
Dan Poltawski
41284e89f1 MDL-45930 filemanager: Don't display filesize when unknown 
Thanks to Marina Glancy for the patch
 2014-12-30 14:16:49 +00:00
Frederic Massart
7f63c934a2 MDL-46183 theme_more: Background is seen through the activity chooser 2014-12-23 17:15:49 +08:00
Mary Evans
c58891f14d MDL-40864 theme: Tidy up Bootstrapbase / Clean / More home links. 2014-12-19 01:12:06 +00:00
David Monllao
ceb7769a29 Merge branch 'MDL-48243_master' of git://github.com/lazydaisy/moodle 
Conflicts:
	theme/bootstrapbase/style/moodle.css
 2014-12-17 11:48:42 +08:00
Dan Poltawski
f5360dd16b Merge branch 'MDL-43902-master' of git://github.com/FMCorz/moodle 2014-12-16 18:52:40 +00:00
Dan Poltawski
524cbf743a Merge branch 'm28_MDL-45955a' of https://github.com/totara/moodle 2014-12-16 10:44:16 +00:00
David Monllao
a87494c46f Merge branch 'MDL-48539_master' of git://github.com/StudiUM/moodle 2014-12-16 15:01:31 +08:00
Gilles-Philippe Leblanc
96b839b8a8 MDL-48539 filepicker: Missing file view_icon_selected in the file picker 2014-12-11 09:07:29 -05:00
Brian Barnes
bbb0733297 MDL-45955 forms: replaced labels in static text elements 2014-12-10 17:28:09 +13:00
Frederic Massart
ba55be9151 MDL-43902 output: Final deprecation of classes r0/r1 in table rows 2014-12-09 14:52:30 +08:00
Jetha Chan
6d8eba1a59 MDL-48169 themes: extra upgrade notes 2014-12-08 14:07:52 +08:00
Dan Poltawski
50944630bd Merge branch 'm29_MDL-48317' of https://github.com/totara/moodle 2014-12-04 11:37:53 +00:00
Mary Evans
d0508fdc09 MDL-48243 theme_bootstrapbase: Fixed inconsistancy between LTR/RTL LESS 2014-12-01 17:11:48 +00:00
Eloy Lafuente (stronk7)
4ef19b1789 Merge branch 'MDL-48277-master' of git://github.com/danpoltawski/moodle 2014-11-25 18:38:24 +01:00
Sam Hemelryk
406712e989 Merge branch 'MDL-48246-M29' of git://github.com/lazydaisy/moodle 
Conflicts:
	theme/bootstrapbase/style/moodle.css
 2014-11-25 10:52:42 +13:00
Brian Barnes
270a8f1bf0 MDL-48317 groups: Removed table from User groups page 2014-11-24 10:43:15 +13:00
Dan Poltawski
17d4ff23ee Revert "MDL-46531 Make atto foreground colors and background colors configurable" 
This reverts commit cb6e1d527093bb955946498850ef8a51276a13a4.

This reverts commit 7a5e6054248ef18f05a228ab0db4d05e5d782180, reversing
changes made to 7b9fb265d20e53580a64dcd2be8546ff5b49bd26.

This reverts commit 06404b01180a2965804fab9e47715fdc2b6bdfb4, reversing
changes made to 0f87473fed2da15a8ba72ac9a578734fe2548f10.

Conflicts:
	theme/bootstrapbase/style/moodle.css
 2014-11-20 07:04:41 +00:00
Eloy Lafuente (stronk7)
4067991016 Merge branch '48206-29' of git://github.com/samhemelryk/moodle 
Conflicts:
	theme/bootstrapbase/style/moodle.css
 2014-11-19 21:28:51 +01:00
Dan Poltawski
03e93abad8 MDL-48277 css: enable duplicate definitions lint rule 
And remove duplicates found in code which were detected by this rule
(leaving the last rule defined as this would take precidence).

https://github.com/CSSLint/csslint/wiki/Disallow-duplicate-properties
 2014-11-18 22:11:36 +00:00
Dan Poltawski
9ec6c460e6 MDL-48277 css: remove invalid @-ms-keyframes rule 
This is directly copied from bootstrap, but was added to a beta version
of IE10, but never the production version so is uncessary.

Refs:
http://blogs.msdn.com/b/ie/archive/2012/06/06/moving-the-stable-web-forward-in-ie10-release-preview.aspx
https://github.com/CSSLint/csslint/issues/295
 2014-11-18 22:11:35 +00:00
Dan Poltawski
4b4974881b MDL-48277 css: remove empty CSS files 
To avoid tools moaning and uncessary file loads
* course/style.css was mistakenly added empty in 01e0e7044
* theme/canvas/style/question.css has been empty since 2.1 481dc639
 2014-11-18 22:11:35 +00:00
Mary Evans
a263396486 MDL-47915 theme: use id='page-content' rather than 'content'. 
Also added JS fallback for themes using copied layouts in scorm
 2014-11-18 17:49:57 +00:00
Dan Poltawski
8d3fba4ce4 Merge branch 'm28_MDL-48041' of https://github.com/totara/moodle 
Conflicts:
	theme/bootstrapbase/style/moodle.css
 2014-11-18 13:10:57 +00:00
Sam Hemelryk
06404b0118 Merge branch 'MDL-46531-master' of git://github.com/andrewnicols/moodle 
Conflicts:
	theme/bootstrapbase/style/moodle.css
 2014-11-18 10:48:31 +13:00
Dan Poltawski
34a0b00d4a Merge branch 'MDL-48199-master' of git://github.com/lazydaisy/moodle 
Conflicts:
	theme/bootstrapbase/style/moodle.css
 2014-11-17 16:42:34 +00:00
Dan Poltawski
296e292413 Merge branch 'm29_MDL-48023_Theme_Setting_Files_Cacheable_By_Both_Browsers_And_Proxies' of https://github.com/scara/moodle 2014-11-17 15:20:17 +00:00
Mary Evans
82b5f58f57 MDL-48246 theme: Fixed typo in 'hidepanelicon' 2014-11-17 14:58:37 +00:00
Dan Poltawski
96ac6cb964 Merge branch 'MDL-42756' of git://github.com/aolley/moodle 2014-11-17 13:52:39 +00:00