moodle/moodle
3
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-08-11 03:46:42 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
66299 commits 37 branches 544 tags 1.3 GiB
Commit graph

3860 commits

Author SHA1 Message Date
Dan Poltawski
6719aa5ec5 Merge branch 'MDL-39603-26' of git://github.com/FMCorz/moodle into MOODLE_26_STABLE 
Conflicts:
	theme/bootstrapbase/style/moodle.css
 2014-01-13 12:34:58 +08:00
Dan Poltawski
d9dcb97bbe Merge branch '41226-26' of git://github.com/samhemelryk/moodle into MOODLE_26_STABLE 2014-01-13 11:11:12 +08:00
Dan Poltawski
51bced46a7 Merge branch '40821-26' of git://github.com/samhemelryk/moodle into MOODLE_26_STABLE 2014-01-13 11:03:37 +08:00
Dan Poltawski
a893680091 Merge branch '40693-26' of git://github.com/samhemelryk/moodle into MOODLE_26_STABLE 2014-01-13 10:07:54 +08:00
Dan Poltawski
67a75acaff Merge branch 'MDL-41152-26' of git://github.com/FMCorz/moodle into MOODLE_26_STABLE 
Conflicts:
	theme/bootstrapbase/style/moodle.css
 2014-01-13 10:03:47 +08:00
Sam Hemelryk
6060234de5 MDL-40205 theme: fixed overflow of block headers 
Conflicts:
	theme/bootstrapbase/style/moodle.css
 2014-01-13 09:41:25 +08:00
Dan Poltawski
892173b3f3 Merge branch 'MDL-40705-26' of git://github.com/FMCorz/moodle into MOODLE_26_STABLE 
Conflicts:
	theme/bootstrapbase/style/moodle.css
 2014-01-13 09:36:12 +08:00
Sam Hemelryk
cdd7fe6a48 MDL-40821 theme_bootstrapbase: fixed positioning of profile controls 
Conflicts:
	theme/bootstrapbase/style/moodle.css

Conflicts:
	theme/bootstrapbase/style/moodle.css
 2014-01-13 08:17:12 +13:00
Sam Hemelryk
fe7bf6425a MDL-40821 theme_bootstrapbase: show the current lang in the menu 2014-01-13 08:16:04 +13:00
Sam Hemelryk
495a02bb5a MDL-40693 theme_bootstrapbase: changed navbar separator to official separator 2014-01-13 08:15:39 +13:00
Frederic Massart
9a093f57a1 MDL-41152 theme_bootstrapbase: Optimise width for gradebook tree view 2014-01-09 10:44:40 +01:00
Frederic Massart
bc936e8ac8 MDL-39603 theme_bootstrapbase: Alignment of filter form elements on enrol page 2014-01-08 10:45:13 +01:00
Eloy Lafuente (stronk7)
ebe415f889 Merge branch 'MDL-42392-26' of git://github.com/andrewnicols/moodle into MOODLE_26_STABLE 2014-01-08 00:33:48 +01:00
Frederic Massart
bf6527407d MDL-40705 theme_bootstrapbase: Handling of long words in block content 2014-01-06 15:45:19 +01:00
Matteo Scaramuccia
a9df6656b8 MDL-40379 Files Prevent mobile network providers from modifying content. 2013-12-28 14:02:18 +01:00
Andrew Nicols
e9ca5e144c MDL-42392 Blocks: Do not hide blocks if JS is disabled 
With JS disabled, it is not possible to change the block visibility
user preference and therefore not possible to show content which was
hidden.

Since the block hiding functionality is a nicety, and we have no controls
to show and hide the blocks when JS is disabled, we should instead show the
block content regardless of the user preference.
 2013-12-28 08:42:02 +08:00
Sam Hemelryk
5ac473e356 Merge branch 'wip-MDL-41788_M26_3' of git://github.com/gjb2048/moodle into MOODLE_26_STABLE 2013-12-24 12:52:02 +13:00
Gareth J Barnard
997731210c MDL-41788 theme_bootstrapbase: Custom menus - sub-menus breaking. 2013-12-19 12:11:15 +00:00
Sam Hemelryk
e9623e55e3 Merge branch 'MDL-43062-26' of git://github.com/mouneyrac/moodle into MOODLE_26_STABLE 
Conflicts:
	theme/bootstrapbase/style/moodle.css
 2013-12-16 15:40:25 +13:00
Sam Hemelryk
e646b89f8b Merge branch 'wip-MDL-43348_M26' of git://github.com/gjb2048/moodle into MOODLE_26_STABLE 2013-12-16 14:09:52 +13:00
Jerome Mouneyrac
834f172c77 MDL-43062 course: Content of label is left-aligned, regardless of alignment chosen 
Conflicts:
	theme/bootstrapbase/style/moodle.css
 2013-12-13 13:55:51 +08:00
Gareth J Barnard
f10d0d2745 MDL-43348 theme: html <nav> element on the wrong content. 2013-12-12 16:14:50 +00:00
Sam Hemelryk
5fbc32ebdb Merge branch 'MDL-42796-26' of git://github.com/andrewnicols/moodle into MOODLE_26_STABLE 2013-12-11 11:12:55 +13:00
Marina Glancy
08f6d5de07 Merge branch 'mdl42487-moodle26' of https://github.com/tlock/moodle into MOODLE_26_STABLE 2013-12-10 13:57:20 +11:00
Sam Hemelryk
8eb717f993 Merge branch 'MDL-43152-26' of git://github.com/andrewnicols/moodle into MOODLE_26_STABLE 2013-12-10 08:43:36 +13:00
Marina Glancy
64c03072a9 Merge branch 'MDL-43092_M26' of git://github.com/lazydaisy/moodle into MOODLE_26_STABLE 2013-12-09 17:50:53 +11:00
Gareth J Barnard
45d1c530d2 MDL-40213 theme_clean: Layout "secure.php" missing settings. 2013-12-09 11:14:07 +11:00
Andrew Nicols
e6caeefe0c MDL-42796 ActionMenu: Add additional keyboard event handling 
Add additional handling for up/down/escape key presses and consolidate them
with the existing tab/shift+tab handling.
 2013-12-06 16:21:13 +08:00
Andrew Nicols
d33dffe53a MDL-43152 JavaScript: Add update instructions for gallery-bootstrap 2013-12-06 09:20:05 +08:00
Andrew Nicols
19b1ff816f MDL-43152 JavaScript: Fix linting issues with moodle-theme_bootstrapbase 2013-12-06 09:20:02 +08:00
Jason Fowler
62f68371df MDL-43084 Themes: fixing dialog header in standard theme 2013-12-04 15:32:31 +13:00
Sam Hemelryk
f5a134213d Merge branch 'MDL-43065-26' of git://github.com/damyon/moodle into MOODLE_26_STABLE 
Conflicts:
	backup/util/ui/base_moodleform.class.php
 2013-12-04 09:43:24 +13:00
Sam Hemelryk
7ac9576825 Merge branch 'MDL-42919-26' of git://github.com/damyon/moodle into MOODLE_26_STABLE 2013-12-04 09:42:34 +13:00
Eloy Lafuente (stronk7)
1abaa0c22e Merge branch 'MDL-43105-26' of git://github.com/andrewnicols/moodle into MOODLE_26_STABLE 2013-12-03 19:16:08 +01:00
Mary Evans
a108795999 MDL-43092 theme_afterburner: Activity or Resource dialog greyed-out for non-empty courses 2013-12-03 15:04:02 +00:00
Jason Fowler
b136969308 MDL-43076 Activity Chooser: Fixing the white bar at the bottom of the dialogue 
Conflicts:

	theme/bootstrapbase/style/moodle.css
 2013-12-03 13:30:15 +08:00
Sam Hemelryk
f098ca6d97 Merge branch 'MDL-42918_m26' of git://github.com/rwijaya/moodle into MOODLE_26_STABLE 
Conflicts:
	theme/bootstrapbase/style/moodle.css
 2013-12-02 13:39:51 +13:00
Tim Lock
2153633aac MDL-42487: Forced userprofile dl style to be displayed: inline-block. 2013-11-29 09:26:52 +10:30
Andrew Nicols
6dae822543 MDL-43105 JavaScript: Use the correct versions of our rollups 2013-11-28 12:32:18 +08:00
rwijaya
4c1ac80799 MDL-42918: fixed fullscreen width for multichoice answers editor 2013-11-26 18:34:55 +08:00
Damyon Wiese
b451ddf416 MDL-43065 Backup: Prevent any responsiveness in backup/restore forms 
Adding 'unresponsive' class to any moodle form will prevent the default
collapsing on screens < 1200px.
 2013-11-26 14:50:21 +08:00
Dan Poltawski
46d1d519f8 Merge branch 'MDL-42851_m26' of git://github.com/rwijaya/moodle into MOODLE_26_STABLE 
Conflicts:
	theme/bootstrapbase/style/moodle.css
 2013-11-26 14:48:38 +08:00
Damyon Wiese
f5af9b62e8 MDL-41919 Forms: Add a class to form elements with an empty label 
This means they can be styled properly when the form is folded with
the labels above the form fields.
 2013-11-26 13:32:11 +08:00
Dan Poltawski
9e2bc0490f Merge branch 'MDL-42858_m26' of git://github.com/rwijaya/moodle into MOODLE_26_STABLE 
Conflicts:
	theme/bootstrapbase/style/moodle.css
 2013-11-25 10:49:02 +08:00
rwijaya
aa5b71c005 MDL-42851 frontpage: fix rtl in clean theme for course listings 2013-11-22 15:49:06 +08:00
rwijaya
2834f79e73 MDL-42858 Course Management: fix regression for subcategories visibility 2013-11-21 15:34:40 +08:00
Sam Hemelryk
8bd0487a4b MDL-42852 theme_bootstrapbase: fixed whitespace 2013-11-19 11:44:50 +13:00
Gareth J Barnard
600ad57d35 MDL-42852 lib: Blocks disappear in Clean in RTL. 
Conflicts:
	theme/bootstrapbase/style/moodle.css
 2013-11-19 11:42:56 +13:00
Jerome Mouneyrac
7628ac73f4 MDL-42184 bootstrapbase: popup should have no header 2013-11-19 10:16:35 +13:00
Sam Hemelryk
64b4fbebd8 Merge branch 'MDL-42853-master' of git://github.com/FMCorz/moodle into MOODLE_26_STABLE 
Conflicts:
	theme/bootstrapbase/style/moodle.css
 2013-11-19 10:09:18 +13:00