mirror_php/moodle
1
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-03-26 18:42:40 +01:00
Code Issues Projects Releases Wiki Activity
66,205 Commits 36 Branches 527 Tags
Commit Graph

3848 Commits

Author SHA1 Message Date
Damyon Wiese
ce3b8b0e71 Merge branch 'MDL-26680-master' of git://github.com/micaherne/moodle 
Conflicts:
	theme/bootstrapbase/style/moodle.css
 2014-01-22 09:52:38 +08:00
Michael Aherne
41dcfbf1af MDL-26680 my page My Moodle "reset to default" button 2014-01-21 22:36:24 +00:00
Dan Poltawski
73cb5874b6 Merge branch 'MDL-41506-master' of git://github.com/FMCorz/moodle 
Conflicts:
	theme/bootstrapbase/style/moodle.css
 2014-01-21 23:29:20 +08:00
Dan Poltawski
0296662a22 Merge branch 'MDL-42955_b' of git://github.com/rwijaya/moodle 2014-01-21 10:37:01 +08:00
Eloy Lafuente (stronk7)
b0512f418b Merge branch 'MDL-39684-master' of git://github.com/FMCorz/moodle 
Conflicts:
	theme/bootstrapbase/style/moodle.css
 2014-01-21 00:20:28 +01:00
Eloy Lafuente (stronk7)
1816a46d11 Merge branch 'MDL-40533-master' of git://github.com/FMCorz/moodle 2014-01-21 00:17:31 +01:00
Eloy Lafuente (stronk7)
221e6adaa5 Merge branch 'MDL-41362-master' of git://github.com/FMCorz/moodle 
Conflicts:
	theme/bootstrapbase/style/moodle.css
 2014-01-20 23:59:27 +01:00
Dan Poltawski
8e57617654 Merge branch '42682-27' of git://github.com/samhemelryk/moodle 2014-01-20 15:25:46 +08:00
Rossiani Wijaya
e4a25e6ff1 MDL-42955: Removed scrollbar from block's action menu 2014-01-20 14:00:29 +08:00
Dan Poltawski
3ab0a93347 Merge branch 'MDL-42980' of git://github.com/rwijaya/moodle 
Conflicts:
	theme/bootstrapbase/style/moodle.css
 2014-01-20 12:56:17 +08:00
Damyon Wiese
6d7d401711 Merge branch 'MDL-39683-master' of git://github.com/FMCorz/moodle 
Conflicts:
	theme/bootstrapbase/style/moodle.css
 2014-01-20 11:27:07 +08:00
Dan Poltawski
34e91c304c Merge branch 'MDL-40752-master' of git://github.com/phalacee/moodle 
Conflicts:
	theme/bootstrapbase/style/moodle.css
 2014-01-20 09:24:53 +08:00
rwijaya
f3f180863f MDL-42980 clean theme: fixed add/cancel buttons position for safari on iPhone with ios7. 2014-01-17 16:12:26 +08:00
Sam Hemelryk
35620f63f0 MDL-42682 theme_bootstrapbase: fixed styling of discussion selector 2014-01-17 10:25:36 +13:00
Sam Hemelryk
bfaee803af MDL-42682 theme_bootstrapbase: fixed forum search alignment 2014-01-17 10:25:33 +13:00
Frederic Massart
f15aff3802 MDL-40533 block_html: Remove styles specific to the block 2014-01-14 19:00:31 +01:00
Frederic Massart
810a3da133 MDL-41506 theme_bootstrapbase: Implement highlight class 2014-01-14 11:19:43 +01:00
Nadav Kavalerchik
0954819fc7 MDL-40752 Login RTL: Swapping the panels on two-panel login pages for RTL 
Additions to the patch by Jason Fowler <phalacee@gmail.com>
 2014-01-14 09:19:42 +08:00
Frederic Massart
70a0ae96aa MDL-41362 theme_bootstrapbase: Alignment of User Selector controls 2014-01-13 18:35:59 +01:00
Frederic Massart
fdbb039713 MDL-39684 theme: RTL align of restrictions label in file manager 2014-01-13 16:15:12 +01:00
Frederic Massart
2fca44ad65 MDL-39683 message: RTL alignment of messages in theme_base 2014-01-13 15:40:10 +01:00
Nadav Kavalerchik
cb0f81c210 MDL-39683 Messages, Themes: Fix "my" and "other person" message alignment in RTL mode (theme/clean) 2014-01-13 15:22:57 +01:00
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