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

3338 Commits

Author SHA1 Message Date
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
Dan Poltawski
5bb85e4bf6 Merge branch 'MDL-39508_master' of git://github.com/lazydaisy/moodle 2013-05-07 14:42:44 +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
Sam Hemelryk
d5cdfbc288 Merge branch 'MDL-39364_clean' of git://github.com/lazydaisy/moodle 2013-05-07 16:13:06 +12:00
Damyon Wiese
a135128390 Merge branch 'wip-MDL-39130-master' of git://github.com/ds125v/moodle 
Conflicts:
	theme/bootstrapbase/style/moodle.css
 2013-05-07 11:25:35 +08:00
Damyon Wiese
e0fc61f993 Merge branch 'MDL-39162' of git://github.com/totara/openbadges 
Conflicts:
	theme/bootstrapbase/style/moodle.css
 2013-05-07 10:41:44 +08:00
Mary Evans
b4d70ce2e1 MDL-39508 theme_canvas: Fixed dropdown navigation menu in SCORM player view. 2013-05-07 01:58:11 +01:00
Yuliya Bozhko
f8ba185ac5 MDL-39162: Add badges CSS to bootstrap theme 2013-05-06 16:20:02 +12:00
Damyon Wiese
4c2a46e507 Merge branch 'MDL-39399-master' of git://github.com/FMCorz/moodle 
Conflicts:
	theme/bootstrapbase/style/moodle.css
 2013-05-06 12:13:27 +08:00
Mary Evans
3a61956f66 MDL-39364 theme_clean: remove all references to the Simple theme from Clean theme. 2013-05-04 02:34:44 +01:00
David Scotson
c57a883080 MDL-39499 bootstrapbase: Make two .singlebuttons line up 2013-05-03 16:28:07 +01:00
David Scotson
ed88a6f32a MDL-30130 bootstrapbase: Bring back Quiz answer feedback 2013-05-03 15:47:15 +01:00
Marina Glancy
dde6bdf973 MDL-39436 fixing RTL in filemanager 2013-05-03 11:30:33 +10:00
Marina Glancy
69bbd2a7cd MDL-38594 Core themes changed for the new course listings styles 2013-05-03 11:16:16 +10:00
Marina Glancy
d891aaba73 MDL-39318 CSS bug on mouse hover of paging bar in some themes 2013-05-03 11:14:49 +10:00
David Scotson
9c2ec10b27 MDL-39388 bootstrapbase: Add bootstrap tab renderer 
This adds a renderer that outputs standard bootstrap HTML for tabs,
deletes styles that were previously required to make Moodle tab HTML
superficially resemble Bootstrap, and tweak the responsive code that
makes tabs stack on phones to account for the change too.
 2013-05-02 15:59:53 +01:00
David Scotson
ea951c5924 MDL-38979 Add lang menu to empty custommenu 
Show custom menu even when no custom menu items if lang menu needs
to be shown.
 2013-05-02 15:01:08 +01:00
Damyon Wiese
f85fba3eeb Merge branch 'MDL-39355-m-2' of git://github.com/andrewnicols/moodle 
Conflicts:
	theme/bootstrapbase/style/moodle.css
 2013-05-02 13:54:59 +08:00
Andrew Nicols
323aa3248c MDL-39355: Correct the z-index for moodle-dialogue 2013-05-01 18:34:04 +01:00
Eloy Lafuente (stronk7)
cedb0aab5a MDL-39434 Bump all versions near 2.5 release 2013-05-01 18:03:29 +02:00
Dan Poltawski
5f5843f84b Merge branch 'w17_MDL-39402_m25_themedep' of git://github.com/skodak/moodle 2013-05-01 09:53:18 +01:00
Petr Škoda
a824d7d4ac MDL-39402 fix wrong binarius dependency 
Credit goes to Frédéric Massart, thanks.
 2013-05-01 10:36:30 +02:00
Damyon Wiese
a6b274b232 Merge branch 'wip-MDL-39312-m25' of git://github.com/samhemelryk/moodle 
Conflicts:
	theme/bootstrapbase/style/moodle.css
 2013-05-01 10:04:50 +08:00
Sam Hemelryk
fdba83df89 Merge branch 'MDL-39355-m-2' of git://github.com/andrewnicols/moodle 2013-05-01 10:24:13 +12:00
Dan Poltawski
8926c9fbcd Merge branch 'w17_MDL-39402_m25_themedep' of git://github.com/skodak/moodle 2013-04-30 09:57:29 +01:00
Damyon Wiese
b587727065 MDL-39354 Theme - Keep base and bootstrapbase in-sync 
Add 7px margin-right to checkboxes and radio buttons
 2013-04-30 16:24:14 +08:00
Damyon Wiese
89dc06570d Merge branch 'MDL-39354' of git://github.com/timhunt/moodle 2013-04-30 16:24:07 +08:00
Andrew Nicols
b72d78d847 MDL-39355: Set tooltip zindex for bootstrap theme 2013-04-30 08:45:53 +01:00
Sam Hemelryk
acf49f4b9a MDL-39312 cache: interfaces for managing lock instances. 
Bug: There was no way to create an instance of a lock plugin for use
within Moodle.
Solution: Implemented management interfaces as part of cache/admin.php
to allow for instances to be added and deleted.
This was done in along the same lines of adding store instances.
 2013-04-30 16:26:34 +12:00
Sam Hemelryk
3e9406bc17 Merge branch 'MDL-38896_master' of git://github.com/lazydaisy/moodle 2013-04-30 09:57:00 +12:00
Sam Hemelryk
e76a515f31 Merge branch 'MDL-39377' of git://github.com/colchambers/moodle 2013-04-30 09:48:18 +12:00
Tim Hunt
42d8287083 MDL-39354 put back a bit of margin on checkboxes. 2013-04-29 19:13:13 +01:00
Dan Poltawski
d727e9d66a Revert "MDL-39278 - test change to less which is ungenerated" 
This reverts commit 0da03bf4e268e38cbb2be8254270ca38538b86e9.
 2013-04-29 14:33:07 +01:00
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
Petr Škoda
51a230af6a MDL-39402 add missing theme dependencies 2013-04-29 09:20:57 +02: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
Frederic Massart
a0d8b5114e MDL-39399 theme: RTL styles for collapse/expand in forms 2013-04-29 12:40:42 +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