mirror_php/moodle
1
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-03-09 10:19:56 +01:00
Code Issues Projects Releases Wiki Activity
66,106 Commits 36 Branches 523 Tags
Commit Graph

3826 Commits

Author SHA1 Message Date
Dan Poltawski
d1426e2843 Merge branch 'MDL-33952-master' of git://github.com/damyon/moodle 
Conflicts:
	mod/assignment/lang/en/assignment.php
 2014-01-13 12:55:36 +08:00
Dan Poltawski
dbfdd1a4f9 Merge branch 'MDL-39603-master' of git://github.com/FMCorz/moodle 
Conflicts:
	theme/bootstrapbase/style/moodle.css
 2014-01-13 12:34:53 +08:00
Dan Poltawski
f9276172a2 Merge branch '41226-27' of git://github.com/samhemelryk/moodle 2014-01-13 11:11:10 +08:00
Dan Poltawski
58c8f0290f Merge branch '40821-27' of git://github.com/samhemelryk/moodle 2014-01-13 11:02:18 +08:00
Dan Poltawski
e41761a5e9 Merge branch '40693-27' of git://github.com/samhemelryk/moodle 2014-01-13 10:07:53 +08:00
Dan Poltawski
fb9360db3a Merge branch 'MDL-41152-master' of git://github.com/FMCorz/moodle 
Conflicts:
	theme/bootstrapbase/style/moodle.css
 2014-01-13 10:03:51 +08:00
Sam Hemelryk
ee749e50be MDL-40205 theme: fixed overflow of block headers 2014-01-13 09:40:38 +08:00
Dan Poltawski
b5c8e7cbc3 Merge branch 'MDL-40705-master' of git://github.com/FMCorz/moodle 
Conflicts:
	theme/bootstrapbase/style/moodle.css
 2014-01-13 09:35:50 +08:00
Sam Hemelryk
3fa787ae4e MDL-40821 theme_bootstrapbase: fixed positioning of profile controls 
Conflicts:
	theme/bootstrapbase/style/moodle.css
 2014-01-13 08:17:24 +13:00
Sam Hemelryk
73d7e6eba9 MDL-40821 theme_bootstrapbase: show the current lang in the menu 2014-01-13 08:16:11 +13:00
Sam Hemelryk
73fc183d3a MDL-40693 theme_bootstrapbase: changed navbar separator to official separator 2014-01-13 08:15:46 +13:00
Frederic Massart
138eb08746 MDL-41152 theme_bootstrapbase: Optimise width for gradebook tree view 2014-01-09 10:25:53 +01:00
Frederic Massart
86048e8136 MDL-39603 theme_bootstrapbase: Alignment of filter form elements on enrol page 2014-01-08 10:37:41 +01:00
Damyon Wiese
40cb48792a MDL-33952 Assignment - bon voyage! 
mod_assignment has been replaced with a stub that only exists to support restoring and
auto upgrading to mod_assign. If you require mod_assignment for some old plugin, then
overwrite with the 2.6 version manually.
 2014-01-08 14:51:06 +08:00
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
Frederic Massart
f802fe7d7f MDL-40705 theme_bootstrapbase: Handling of long words in block content 2014-01-06 15:43:26 +01: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