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

82 Commits

Author SHA1 Message Date
Sam Hemelryk
754fa10916 Merge branch 'wip-MDL-39820_master_2' of git://github.com/gjb2048/moodle 
Conflicts:
	theme/bootstrapbase/style/moodle.css
 2013-06-12 08:48:00 +12:00
Dan Poltawski
e2ac6a848b Merge branch 'wip-MDL-40087_master' of git://github.com/gjb2048/moodle 
Conflicts:
	theme/bootstrapbase/style/moodle.css
 2013-06-11 16:00:18 +08:00
Dan Poltawski
fd6f924c08 Merge branch 'wip-MDL-39746-master' of git://github.com/phalacee/moodle 
Conflicts:
	theme/bootstrapbase/style/moodle.css
 2013-06-11 11:24:31 +08:00
Dan Poltawski
c6898e629b Merge branch 'MDL-39338_master' of git://github.com/lazydaisy/moodle 
Conflicts:
	theme/bootstrapbase/style/moodle.css
 2013-06-10 16:06:22 +08:00
Mary Evans
034710e8ee MDL-39016 theme_bootstrapbase: Added login info and home link to footer in both boostrapbase & clean layout/general.php 2013-06-10 16:05:25 +12:00
Dan Poltawski
07bac478b6 Merge branch 'wip-MDL-39824-m26' of http://github.com/samhemelryk/moodle 2013-06-10 10:54:22 +08:00
Sam Hemelryk
111f5291f9 Merge branch 'wip-MDL-39608-master' of git://github.com/phalacee/moodle 
Conflicts:
	theme/bootstrapbase/style/moodle.css
 2013-06-10 14:26:04 +12:00
Gareth J Barnard
3355b72e3b MDL-40087 theme_bootstrapbase: Turn editing on button misaligned on nav bar. 2013-06-07 18:20:05 +01:00
Jason Fowler
41d6483066 MDL-39746 - Themes - Hiding the user picture on the forum page when the screensize is too small to allow for it 2013-06-07 14:35:08 +08:00
Sam Hemelryk
8bfd530bc1 MDL-39824 theme_bootstrapbase: converted $PAGE use to new $OUTPUT methods. 2013-06-07 17:32:44 +12:00
Sam Hemelryk
28700dea3c MDL-40089 theme_bootstrapbase: moved general to columns3.php as prep 2013-06-07 17:32:06 +12:00
Mary Evans
f84ad1bb0a MDL-39338 core_question: Make history box a .well 2013-06-06 22:49:27 +01:00
Dan Poltawski
c05660fc35 Merge branch 'MDL-39977' of git://github.com/lazydaisy/moodle 
Conflicts:
	theme/bootstrapbase/style/moodle.css
 2013-06-05 10:11:42 +08:00
Eloy Lafuente (stronk7)
796b57ea0b Merge branch 'MDL-39968-master' of git://github.com/danpoltawski/moodle 2013-06-05 02:32:29 +02:00
Gareth J Barnard
321e7cb52d MDL-39820 theme_bootstrapbase: Fix form button alignment for badges. 2013-06-04 11:12:37 +01:00
Dan Poltawski
93ab081025 Merge branch 'wip-MDL-39819_master' of git://github.com/gjb2048/moodle 
Conflicts:
	theme/bootstrapbase/style/moodle.css
 2013-06-04 14:37:55 +08:00
Dan Poltawski
31e9ffe0ac MDL-39931 less: recompile with whitespace removed 2013-06-04 14:08:28 +08:00
Dan Poltawski
42d00d3638 Merge branch 'MDL-39931' of github.com:lazydaisy/moodle 2013-06-04 13:31:34 +08:00
Mary Evans
c14964cacb MDL-39987 theme_bootstrapbase: Fixed menunode text in renderers/core_renderer.php. 2013-06-02 23:04:17 +01:00
Mary Evans
58183f9b01 MDL-39977 theme_bootstrapbase: Changes the way Clean theme's login takes its navbar styles from Bootstrapbase. 2013-06-01 18:42:09 +01:00
Gareth J Barnard
873dfb3608 MDL-39819 theme_bootstrapbase: Fix icon alignment in filepicker. 2013-05-31 22:30:26 +01:00
Dan Poltawski
e807dadb55 MDL-39968 bootstrapbase: uses non-standard browser sniffing 
Also theme_clean does the same sniffing, but is not necessary as its
included by bootstrapbase
 2013-05-31 15:55:47 +08:00
Mary Evans
947483327f MDL-39931 theme_bootstrapbase: ported invisiblefieldset css rules from theme/base/core.css to less/moodle/core.css 2013-05-30 15:26:13 +01:00
Eloy Lafuente (stronk7)
33b9fecd19 Merge branch 'wip-MDL-39836_master' of git://github.com/gjb2048/moodle 
Conflicts:
	theme/bootstrapbase/style/moodle.css
 2013-05-28 01:23:27 +02:00
Damyon Wiese
1833a3c449 Merge branch 'MDL-39680_master' of git://github.com/lazydaisy/moodle 
Conflicts:
	theme/bootstrapbase/style/moodle.css
 2013-05-27 16:24:34 +08:00
Dan Poltawski
2226ac117b MDL-39806 theme_bootstrapbase: run less with --compress 2013-05-27 14:44:11 +08:00
Gareth J Barnard
af9c2dcf24 MDL-38856 theme_bootstrapbase: Inverse user name text unreadable on nav bar 2013-05-27 02:14:19 +01:00
Mary Evans
38c96b9545 MDL-39680 theme_bootstrapbase: Fixed footer alignment in less/moodle/debug.less 
Squashed commit of the following:

commit 58f5e063a8b333c184ca83ece7f61ec40d2a5080
Author: Mary Evans <lazydaisy@visible-expression.co.uk>
Date:   Sun May 26 13:45:11 2013 +0100

    MDL-39680 theme_bootstrapbase: Fixed footer alignment in less/moodle/debug.less

commit 575594257a9f4fab75977d2334d07659abea0b65
Author: Mary Evans <lazydaisy@visible-expression.co.uk>
Date:   Sun May 26 02:07:00 2013 +0100

    MDL-39680 theme_bootstrapbase: Centralised text in footer.
 2013-05-26 14:07:36 +01:00
Mary Evans
7eff2edc96 MDL-39806 theme_bootstrapbase: Fix for coursesearchbox label alignment. 2013-05-25 16:47:52 +01:00
Damyon Wiese
49125bc509 Merge branch 'MDL-39697' of git://github.com/lazydaisy/moodle 2013-05-22 09:06:29 +08:00
Mary Evans
4cb70acbb4 MDL-39758 theme_bootatrapbase: Added missing layout/embedded.php. 2013-05-20 12:42:43 +01:00
Mary Evans
67202e2f27 MDL-39697 theme_bootstrapbase: Updated $THEME->layouts in config.php to match those in Base theme. 2013-05-16 01:06:26 +01:00
Damyon Wiese
6693089b90 MDL-39573 theme: bootstrap - always show pre and post regions when editing 2013-05-13 14:55:29 +08:00
Mary Evans
0d57b4cbf2 MDL-39595 theme_bootstrapbase: Renamed renderers/core.php to renderers/core_renderer.php 2013-05-13 14:51:26 +08:00
Jason Fowler
bfb1c6d4d2 MDL-39608 - Bootstrap - Chaning the thresholds and width values for the Form labels 2013-05-13 10:23:51 +08:00
Eloy Lafuente (stronk7)
ab0cb7cde6 Merge branch 'MDL-39003-master' of git://github.com/damyon/moodle 2013-05-10 02:36:30 +02:00
Eloy Lafuente (stronk7)
b87572e860 Merge branch 'wip-MDL-39424-master' of git://github.com/ds125v/moodle 2013-05-09 22:18:58 +02:00
Damyon Wiese
c8f7f2b5f3 Merge branch 'wip-MDL-39436-master' of git://github.com/marinaglancy/moodle 
Conflicts:
	theme/bootstrapbase/style/moodle.css
 2013-05-09 11:29:33 +08:00
Marina Glancy
d58f998eb4 MDL-39436 fixing RTL in filemanager - contextmenu icon 2013-05-09 12:40:51 +10:00
Damyon Wiese
38398bebc3 MDL-39003 README for bootstrap less - more clarification and details 2013-05-09 09:15:07 +08:00
Jason Fowler
e473358ef1 MDL-39003 - Bootstrap Theme - Changing less README to point to the dev docs for LESS 2013-05-09 09:13:06 +08:00
Dan Poltawski
036aab5daa MDL-38979 bootstrap: fix previous TODO bugnumber.. 
grrr! Sorry for that.
 2013-05-08 13:34:49 +01:00
Dan Poltawski
69b9a894a1 MDL-38979 bootstrap: add note about duplicated logic 2013-05-08 13:32:48 +01:00
Dan Poltawski
0249631131 Merge branch 'MDL-38979-master' of git://github.com/ds125v/moodle 2013-05-08 13:27:42 +01:00
David Scotson
906b5731aa MDL-39424 bootstrapbase: add basic text styles to editor.css 2013-05-08 11:54:39 +01:00
Marina Glancy
8c288b261a MDL-38594 change course listing heading font size back to default 2013-05-08 15:14:56 +08:00
Marina Glancy
bb7368a29b MDL-39388 corrected tabs renderer to deal with old code 2013-05-08 14:58:17 +08:00
Damyon Wiese
9a2cc7b6c8 Merge branch 'MDL-39388-master' of git://github.com/ds125v/moodle 
Conflicts:
	theme/bootstrapbase/style/moodle.css
 2013-05-08 14:57:49 +08:00
Dan Poltawski
38a6ec6a3a Merge branch 'wip-MDL-39436-master' of git://github.com/marinaglancy/moodle 
Conflicts:
	theme/bootstrapbase/style/moodle.css
 2013-05-07 15:12:58 +01:00
Sam Hemelryk
e4e8d577cd Merge branch 'wip-MDL-39499-master' of git://github.com/ds125v/moodle 
Conflicts:
	theme/bootstrapbase/style/moodle.css
 2013-05-07 17:11:28 +12:00