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
60,925 Commits 36 Branches 519 Tags
Commit Graph

3239 Commits

Author SHA1 Message Date
Dan Poltawski
0da03bf4e2 MDL-39278 - test change to less which is ungenerated 
My sincere apologies for polluting the history this way, but this
is the best way we can be sure.

TO BE CLEAR: this commit will shorlty be reverted.
 2013-04-29 14:23:51 +01:00
Dan Poltawski
4eaa353245 Merge branch 'MDL-39158-master' of git://github.com/damyon/moodle 2013-04-29 14:20:39 +01:00
Damyon Wiese
b38218cfb0 Merge branch 'w17_MDL-39371_m25_cleandep' of git://github.com/skodak/moodle 2013-04-29 14:52:40 +08:00
Damyon Wiese
c59a99df30 Merge branch 'w17_MDL-39174_m25_themedocs' of git://github.com/skodak/moodle 2013-04-29 12:22:23 +08:00
Sam Hemelryk
0c5d8ccb9a Merge branch 'w17_MDL-39336_m25_install' of git://github.com/skodak/moodle 2013-04-29 11:15:05 +12:00
Petr Škoda
aa95e38a0d MDL-39371 add dependency of clean theme on bootstrapbase 2013-04-27 15:27:29 +02:00
Petr Škoda
574909efce MDL-39174 fix phpdocs packages in themes 2013-04-27 13:22:59 +02:00
Mary Evans
07403fdaf4 MDL-39364 theme_clean: Changed 'simple' to 'clean'. 2013-04-26 22:18:26 +01:00
Petr Škoda
45951bbe7c MDL-39336 fix incorrect use on join() in simple theme 2013-04-26 21:33:15 +02:00
Eloy Lafuente (stronk7)
88bcc5fabe MDL-39278 rebuild moodle.css with everything in place 2013-04-26 11:13:09 +02:00
Eloy Lafuente (stronk7)
a86103e09b Merge branch 'MDL-39278-master' of git://github.com/damyon/moodle 
Conflicts:
	theme/bootstrap/style/generated.css
	theme/bootstrap/style/moodle.css
	theme/bootstrapbase/less/moodle/recess.txt
	theme/bootstrapbase/style/generated.css
 2013-04-26 11:10:09 +02:00
Dan Poltawski
1c97061a35 MDL-39341 boostrapbase: fix some missing renames 2013-04-26 09:54:21 +01:00
David Scotson
3161400447 MDL-39158 Increase form label width on wider screens 2013-04-26 13:50:04 +08:00
Damyon Wiese
4f1008202d MDL-39341 Themes Rename bootstrap to bootstrapbase 2013-04-26 13:01:06 +08:00
Damyon Wiese
36f33e3c2c MDL-39278 Bootstrap - Change generated.css to moodle.css 
The filename generated.css comes from moodle.less - so this is more obvious.
 2013-04-26 11:38:43 +08:00
Mary Evans
b0ba8d9843 MDL-39250 theme_clean: Removed 2 instances of id="region-pre" from aside tags in layout/general.php. 2013-04-25 03:13:53 +01:00
Eloy Lafuente (stronk7)
e9f9bb7532 MDL-39276 theme_clean: Move favicon from old simple 2013-04-25 00:28:30 +02:00
Eloy Lafuente (stronk7)
ac8b3d845e Merge branch 'MDL-39276_clean' of git://github.com/lazydaisy/moodle 2013-04-25 00:27:03 +02:00
Eloy Lafuente (stronk7)
e4083853c4 MDL-39138 theme_bootstrap: whitespace line 2013-04-25 00:01:32 +02:00
Eloy Lafuente (stronk7)
4017b1f76a Merge branch 'wip-MDL-39138-master' of git://github.com/ds125v/moodle 
Conflicts:
	theme/bootstrap/style/generated.css
 2013-04-25 00:00:23 +02:00
Mary Evans
109cdf6bd8 MDL-39276 theme_clean: Renamed Simple theme to Clean theme. 2013-04-24 21:35:15 +01:00
David Scotson
68ce389682 MDL-39138 theme_bootstrap: Revert Settings/Nav styles 2013-04-24 14:01:34 +01:00
Sam Hemelryk
c31978b8ff MDL-39326 css: removed unused chunk array search 2013-04-24 14:02:57 +12:00
Sam Hemelryk
13b0140a87 MDL-39326 css: no passed the no svg key to chunking when required 2013-04-24 14:02:52 +12:00
Eloy Lafuente (stronk7)
bdeda339b4 Merge branch 'wip-MDL-38441-m25' of git://github.com/samhemelryk/moodle 2013-04-23 23:41:47 +02:00
Dan Poltawski
789ce8202b Merge branch 'MDL-39148-uninstall' of git://github.com/mudrd8mz/moodle 
Conflicts:
	theme/bootstrap/style/generated.css
 2013-04-22 14:33:28 +01:00
Dan Poltawski
a745806063 MDL-39178 theme_nimble: fix whitespace 2013-04-22 14:00:53 +01:00
Dan Poltawski
90a470abbc MDL-39178 theme_magazine: fix whitespace 2013-04-22 13:59:28 +01:00
Dan Poltawski
9bc5a6b9d8 Merge branch 'w16_MDL-39178_m25_themesettings' of git://github.com/skodak/moodle 2013-04-22 13:57:57 +01:00
Sam Hemelryk
6b39eee9fd Merge branch 'wip-MDL-38893-master' of git://github.com/phalacee/moodle 
Conflicts:
	theme/bootstrap/style/generated.css
 2013-04-22 15:34:17 +12:00
Sam Hemelryk
851ef997df Merge branch 'MDL-38918-master' of git://github.com/lazydaisy/moodle 2013-04-22 15:25:46 +12:00
Sam Hemelryk
92809986aa Merge branch 'MDL-39231_master' of git://github.com/bmbrands/moodle 2013-04-22 15:24:58 +12:00
Damyon Wiese
924225f38b MDL-38898 theme_simple: Copy fixes for block dnd from bootstrap 2013-04-22 10:07:53 +08:00
Jason Fowler
c01404f99a MDL-38893 - Fixing layout of the debug boxes for cache information under bootstrap - patch provided by David Scotson <david.scotson@glasgow.ac.uk> 2013-04-22 10:04:43 +08:00
Damyon Wiese
80333fd96f Merge branch 'MDL-38898_master' of git://github.com/lazydaisy/moodle 2013-04-22 09:52:09 +08:00
Sam Hemelryk
b88338f647 Merge branch 'MDL-38854_master' of git://github.com/bmbrands/moodle 
Conflicts:
	theme/bootstrap/style/generated.css
 2013-04-22 12:12:58 +12:00
Sam Hemelryk
6801246c50 Merge branch 'wip-MDL-38900-master' of git://github.com/ds125v/moodle 
Conflicts:
	theme/bootstrap/style/generated.css
 2013-04-22 11:10:51 +12:00
Sam Hemelryk
311c034744 MDL-38874 theme_bootstrap: tidy up whitespace 2013-04-22 10:43:38 +12:00
Sam Hemelryk
9fdb1c1a63 Merge branch 'MDL-38874_master' of git://github.com/lazydaisy/moodle 
Conflicts:
	theme/bootstrap/style/generated.css
 2013-04-22 10:35:52 +12:00
David Scotson
16d795a4d3 MDL-39196 theme_bootstrap: improved display of login errors 2013-04-22 10:27:11 +12:00
Mary Evans
232affc96a MDL-38874 theme_bootstrap: added back CSS rules to fix advanced elements show/hide toggle in admin forms. 
While doing this I got a compile error so not sure but I am guessing the changes to fix that error will show up in the commit diff.
 2013-04-21 18:02:08 +01:00
Petr Škoda
abea8b437c MDL-39178 add missing update callback for all theme settings 2013-04-20 22:06:55 +02:00
Mary Evans
c9ff4d0e0f MDL-38898 theme_bootstrap: Made changes to layout/general.php to enable drag-n-drop support in Bootstrap theme. 2013-04-20 02:10:11 +01:00
David Scotson
13cb4ee0b4 MDL-38900 Change highlighted course section color 2013-04-19 16:39:29 +01:00
David Mudrák
9074e47871 MDL-39148 Highlight plugin status at the overview screen 
Plugins that are to be installed and plugins that are missing from disk
are now highlighted at the Plugins overview screen. Other statuses (such as
of plugin to be upgraded) should not be needed at this page as those
are primarily intended for the Plugins checks screen during the upgrade.
 2013-04-19 13:21:39 +02:00
Mary Evans
082ebd6e51 MDL-38918 theme_simple: Added favicon.ico to theme/simple/pix directory. 2013-04-19 10:46:33 +01:00
BA CodeMonkey
f0e683ecb3 MDL-38854: Bootstrap theme - text input in a block is wider than the block 2013-04-19 11:07:04 +02:00
BA CodeMonkey
2135cec6e8 MDL-39231: Rename region-bs-main to region-main in layout files for theme bootstrap and theme simple 2013-04-19 10:52:03 +02:00
Damyon Wiese
35490f6357 Merge branch 'MDL-39163-master' of git://github.com/FMCorz/moodle 2013-04-19 15:49:16 +08:00
Sam Hemelryk
459699105c Merge branch 'MDL-39206_master' of git://github.com/lazydaisy/moodle 2013-04-19 16:37:31 +12:00