3811 Commits

Author SHA1 Message Date
Eloy Lafuente (stronk7)
430740f65a Merge branch 'MDL-42392-master' of git://github.com/andrewnicols/moodle 2014-01-08 00:23:40 +01:00
Eloy Lafuente (stronk7)
382addccef Merge branch '23837-27' of git://github.com/samhemelryk/moodle 2014-01-07 23:42:55 +01:00
Dan Poltawski
4e5fb5bec1 Merge branch 'm27_MDL-40379_Prevent_Some_Mobile_Network_Providers_From_Modifying_Content' of https://github.com/scara/moodle 2014-01-07 12:42:33 +08:00
Sam Hemelryk
3d907759ad MDL-23837 enrol: restyled the role and group controls 2014-01-02 11:39:53 +13:00
Andrew Nicols
5b49f8b3a8 MDL-36334 JavaScript: Enable access to the gallery 2013-12-30 19:19:26 +08:00
Matteo Scaramuccia
c3a3f54053 MDL-40379 Files Prevent mobile network providers from modifying content. 2013-12-28 13:56:19 +01:00
Andrew Nicols
2fad76eb9b 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:33:35 +08:00
Sam Hemelryk
69f86e87a7 Merge branch 'wip-MDL-41788_master_3' of git://github.com/gjb2048/moodle 2013-12-24 12:52:22 +13:00
Gareth J Barnard
ce65578510 MDL-41788 theme_bootstrapbase: Custom menus - sub-menus breaking. 2013-12-19 12:08:50 +00:00
Andrew Nicols
052d64a478 MDL-43322 JavaScript: Correct cache-base entry in base rollup 2013-12-16 16:59:11 +08:00
Andrew Nicols
9a45ac14f0 MDL-43322 JavaScript: Include moodle-core-popuphelp in the mcore rollup
moodle-core-popuphelp is used on every page in Moodle, so it should be
included in the rollup by default to save a request each time.
2013-12-16 16:14:26 +13:00
Sam Hemelryk
d842685028 Merge branch 'MDL-43062-master-nomerge' of git://github.com/mouneyrac/moodle
Conflicts:
	theme/bootstrapbase/style/moodle.css
2013-12-16 15:40:40 +13:00
Sam Hemelryk
3c3eed7e01 Merge branch 'wip-MDL-43348_master' of git://github.com/gjb2048/moodle 2013-12-16 14:10:15 +13:00
Jerome Mouneyrac
41c2a197ba MDL-43062 course: Content of label is left-aligned, regardless of alignment chosen 2013-12-13 13:27:26 +08:00
Gareth J Barnard
fde0b8cd1b MDL-43348 theme: html <nav> element on the wrong content. 2013-12-12 11:07:03 +00:00
Sam Hemelryk
df1498f711 Merge branch 'MDL-42796-master' of git://github.com/andrewnicols/moodle 2013-12-11 11:13:32 +13:00
Marina Glancy
11ca8227b1 Merge branch 'mdl42487-master' of https://github.com/tlock/moodle 2013-12-10 13:56:49 +11:00
Sam Hemelryk
822f529014 Merge branch 'MDL-43152-master' of git://github.com/andrewnicols/moodle 2013-12-10 08:43:50 +13:00
Marina Glancy
40d5757441 Merge branch 'MDL-43092_master' of git://github.com/lazydaisy/moodle 2013-12-09 17:50:27 +11:00
Marina Glancy
3f189b5d49 Merge branch 'wip-MDL-40213_master' of git://github.com/gjb2048/moodle 2013-12-09 11:13:16 +11:00
Andrew Nicols
11dd4dadb4 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:20:10 +08:00
Andrew Nicols
7c64c102ad MDL-43152 JavaScript: Add update instructions for gallery-bootstrap 2013-12-06 09:19:45 +08:00
Andrew Nicols
3eb67d05b0 MDL-43152 JavaScript: Fix linting issues with moodle-theme_bootstrapbase 2013-12-06 09:19:42 +08:00
Gareth J Barnard
9124c1f2d3 MDL-40213 theme_clean: Layout "secure.php" missing settings. 2013-12-04 11:23:32 +00:00
Sam Hemelryk
5ba212b444 Merge branch 'MDL-43084-master' of git://github.com/phalacee/moodle 2013-12-04 15:29:00 +13:00
Dan Poltawski
d22147667d Merge branch 'wip-mdl-42597' of https://github.com/rajeshtaneja/moodle
Conflicts:
	theme/bootstrapbase/style/moodle.css
2013-12-04 08:53:25 +08:00
Jason Fowler
c8b0cb2640 MDL-43084 Themes: fixing dialog header in standard theme 2013-12-04 08:43:42 +08:00
Rajesh Taneja
f487a8f825 MDL-42597 Administration: Modified maintenance mode countdown to display nicely
Added Style and JS to display maintenance mode timer similar
to what is done on moodle demo site for rest.
2013-12-04 08:31:56 +08:00
Sam Hemelryk
2a336e2a36 Merge branch 'MDL-43065-master' of git://github.com/damyon/moodle
Conflicts:
	backup/util/ui/base_moodleform.class.php
2013-12-04 09:44:25 +13:00
Sam Hemelryk
db9c8f4c7d Merge branch 'MDL-42919-master' of git://github.com/damyon/moodle 2013-12-04 09:43:43 +13:00
Eloy Lafuente (stronk7)
75b296abf6 Merge branch 'MDL-43105-master' of git://github.com/andrewnicols/moodle 2013-12-03 19:15:05 +01:00
Mary Evans
126df92b94 MDL-43092 theme_afterburner: Activity or Resource dialog greyed-out for non-empty courses 2013-12-03 14:52:27 +00:00
Damyon Wiese
6b8c6278bc Merge branch 'MDL-43076-master' of git://github.com/phalacee/moodle
Conflicts:
	theme/bootstrapbase/style/moodle.css
2013-12-03 13:18:47 +08:00
Sam Hemelryk
12539749f4 Merge branch 'MDL-42918' of git://github.com/rwijaya/moodle
Conflicts:
	theme/bootstrapbase/style/moodle.css
2013-12-02 13:44:05 +13:00
Damyon Wiese
df9b573d85 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-29 14:27:34 +08:00
Damyon Wiese
6d55d0f5f0 MDL-42919 Renest bootstrap folding forms CSS in less 2013-11-29 14:16:16 +08:00
Tim Lock
f6c5ceca71 MDL-42487: Forced userprofile dl style to be displayed: inline-block. 2013-11-29 09:22:48 +10:30
Andrew Nicols
104d698ffd MDL-43105 JavaScript: Use the correct versions of our rollups 2013-11-28 12:31:51 +08:00
Jason Fowler
7d4e3575bc MDL-43076 Activity Chooser: Fixing the white bar at the bottom of the dialogue 2013-11-27 14:39:42 +08:00
Dan Poltawski
fb9c770d8d Merge branch 'MDL-42851' of git://github.com/rwijaya/moodle
Conflicts:
	theme/bootstrapbase/style/moodle.css
2013-11-26 14:48:21 +08:00
Damyon Wiese
e6b1d132cb 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:28:51 +08:00
rwijaya
e94d023225 MDL-42918: fixed fullscreen width for multichoice answers editor 2013-11-26 12:21:51 +08:00
Dan Poltawski
f5bc16cbd1 Merge branch 'MDL-42858' of git://github.com/rwijaya/moodle
Conflicts:
	theme/bootstrapbase/style/moodle.css
2013-11-25 10:48:33 +08:00
rwijaya
1b136466bf MDL-42851 frontpage: fix rtl in clean theme for course listings 2013-11-22 15:47:22 +08:00
rwijaya
3e57883c5c MDL-42858 Course Management: fix regression for subcategories visibility 2013-11-21 15:32:50 +08:00
Sam Hemelryk
3d2dc94bf1 MDL-42852 theme_bootstrapbase: fixed whitespace 2013-11-19 11:45:17 +13:00
Sam Hemelryk
d7a0da37d9 Merge branch 'wip-MDL-42852_master' of git://github.com/gjb2048/moodle
Conflicts:
	theme/bootstrapbase/style/moodle.css
2013-11-19 11:42:25 +13:00
Sam Hemelryk
1098226524 Merge branch 'MDL-42184-master-3' of git://github.com/mouneyrac/moodle 2013-11-19 10:15:33 +13:00
Sam Hemelryk
34592ffd98 Merge branch 'MDL-42853-master' of git://github.com/FMCorz/moodle
Conflicts:
	theme/bootstrapbase/style/moodle.css
2013-11-19 10:08:45 +13:00
Damyon Wiese
47578dbff4 MDL-42930 Add 2.6.0 upgrade line 2013-11-18 11:47:17 +08:00