mirror_php/moodle
1
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-03-12 03:40:04 +01:00
Code Issues Projects Releases Wiki Activity
61,908 Commits 36 Branches 523 Tags
Commit Graph

3382 Commits

Author SHA1 Message Date
Sam Hemelryk
49eef7d82d Merge branch 'wip-MDL-40204_master' of git://github.com/gjb2048/moodle 
Conflicts:
	theme/bootstrapbase/style/moodle.css
 2013-06-25 11:35:57 +12:00
Sam Hemelryk
a1d472d8c6 Merge branch 'MDL-40304_master' of git://github.com/kordan/moodle 2013-06-25 10:59:29 +12:00
Sam Hemelryk
10a741cc64 Merge branch 'wip-MDL-40065-master_4' of git://github.com/gjb2048/moodle 2013-06-25 09:59:24 +12:00
Eloy Lafuente (stronk7)
283dd00b7e Merge branch 'MDL-34610' of git://github.com/timhunt/moodle 2013-06-24 20:21:22 +02:00
Eloy Lafuente (stronk7)
b662b8576d Merge branch 'MDL-40255_master' of git://github.com/lazydaisy/moodle 2013-06-24 19:25:53 +02:00
Gareth J Barnard
2e3fb23ff7 MDL-40065 theme_bootstrapbase theme_clean: Simplify column lyts / fix blocks. 2013-06-24 17:06:12 +01:00
kordan
2c724a63cd MDL-40304 theme_formal_white: improved the compliancy to coding rules in formal_white 2013-06-24 15:36:32 +02:00
Sam Hemelryk
4ba45e3955 Merge branch 'MDL-39779' of git://github.com/rwijaya/moodle 2013-06-24 14:43:00 +12:00
Mary Evans
7f773d0bcd MDL-40255 theme_boxxie/theme_formfactor: Added block-region class to layout files to enable dnd file uploader to work. 2013-06-22 20:34:44 +01:00
Tim Hunt
3f6a09d42d MDL-34610 remove legacy IE CSS. It breaks form layout 2013-06-21 21:57:44 +01:00
Dan Poltawski
a6ef66d919 fix permissions 2013-06-21 13:24:44 +08:00
Sam Hemelryk
0f8d5064f1 Merge branch 'wip-MDL-38318_master' of git://github.com/gjb2048/moodle 2013-06-18 14:47:25 +12:00
Dan Poltawski
0afca44627 Merge branch 'MDL-40180_master' of https://github.com/nadavkav/moodle 2013-06-18 10:42:33 +08:00
Eloy Lafuente (stronk7)
b515f8001d MDL-40137 Whitespace fix 2013-06-18 01:47:13 +02:00
Eloy Lafuente (stronk7)
421e6decf4 Merge branch 'wip-MDL-40137-m26' of git://github.com/samhemelryk/moodle 2013-06-18 01:43:57 +02:00
Sam Hemelryk
e667bd9db0 Merge branch 'MDL-39626_master' of git://github.com/kordan/moodle 
Conflicts:
	theme/formal_white/style/course.css
 2013-06-18 11:03:21 +12:00
Rossiani Wijaya
47e00c342f MDL-39779 wiki module: fix the alignment for required label to display inline on mobile devices 2013-06-17 11:26:11 +08:00
Sam Hemelryk
d85f228f18 MDL-40137 theme_clean: corrected lib.php function names 2013-06-17 09:39:23 +12:00
Gareth J Barnard
a31445a854 MDL-40204 theme_bootstrapbase & theme_clean: Fix RTL 3 column lyt with 1 blk. 2013-06-16 19:14:43 +01:00
Gareth J Barnard
a5c167486b MDL-38318 theme_mymobile: Upgrade to jQueryMobile 1.3.1. 2013-06-15 14:58:02 +01:00
Nadav Kavalerchik
d0dde5cef7 MDL-40180 - RTL/Clean theme: Misalignment of student name and profile image in grader (fixed by Mary Evans) 2013-06-14 10:35:31 +03:00
Dan Poltawski
1f782c4181 MDL-39824: theme_bootstrap: initalise array before use 
This causes warnings when no navigation items are returned.

Also fixed some bad whitespace.
 2013-06-13 14:22:59 +08:00
Marina Glancy
128e9315d6 Merge branch 'MDL-37459-master-fix2' of git://github.com/damyon/moodle 2013-06-12 16:53:49 +10:00
Damyon Wiese
459e3c88ca MDL-37459 admin: Default styles for flags for admin settings 2013-06-12 10:06:06 +08:00
Dan Poltawski
1899145c50 Merge branch 'MDL-39773_b' of git://github.com/rwijaya/moodle 
Conflicts:
	theme/bootstrapbase/style/moodle.css
 2013-06-12 09:33:23 +08:00
Sam Hemelryk
6e49802071 MDL-39629 theme_formal_white: added missing pluginfile func 2013-06-12 09:58:55 +12:00
Sam Hemelryk
ac547b717a Merge branch 'MDL-39629_master' of git://github.com/kordan/moodle 2013-06-12 09:48:56 +12:00
Sam Hemelryk
ec18f333bd Merge branch 'wip-MDL-39798_master' of git://github.com/gjb2048/moodle 
Conflicts:
	theme/bootstrapbase/style/moodle.css
 2013-06-12 08:51:59 +12:00
Sam Hemelryk
754fa10916 Merge branch 'wip-MDL-39820_master_2' of git://github.com/gjb2048/moodle 
Conflicts:
	theme/bootstrapbase/style/moodle.css
 2013-06-12 08:48:00 +12:00
Dan Poltawski
e2ac6a848b Merge branch 'wip-MDL-40087_master' of git://github.com/gjb2048/moodle 
Conflicts:
	theme/bootstrapbase/style/moodle.css
 2013-06-11 16:00:18 +08:00
Dan Poltawski
b6174c9897 Merge branch 'm26_MDL-40002_ETag_value_must_be_a_quoted-string' of https://github.com/scara/moodle 2013-06-11 12:54:24 +08:00
Dan Poltawski
fd6f924c08 Merge branch 'wip-MDL-39746-master' of git://github.com/phalacee/moodle 
Conflicts:
	theme/bootstrapbase/style/moodle.css
 2013-06-11 11:24:31 +08:00
Dan Poltawski
c6898e629b Merge branch 'MDL-39338_master' of git://github.com/lazydaisy/moodle 
Conflicts:
	theme/bootstrapbase/style/moodle.css
 2013-06-10 16:06:22 +08:00
Dan Poltawski
de235efba4 Merge branch 'MDL-40018_master' of git://github.com/lazydaisy/moodle 2013-06-10 15:00:08 +08:00
Mary Evans
034710e8ee MDL-39016 theme_bootstrapbase: Added login info and home link to footer in both boostrapbase & clean layout/general.php 2013-06-10 16:05:25 +12:00
Dan Poltawski
07bac478b6 Merge branch 'wip-MDL-39824-m26' of http://github.com/samhemelryk/moodle 2013-06-10 10:54:22 +08:00
Sam Hemelryk
9016063900 MDL-39824 theme: tweaking upgrade note version 2013-06-10 14:34:37 +12:00
Sam Hemelryk
111f5291f9 Merge branch 'wip-MDL-39608-master' of git://github.com/phalacee/moodle 
Conflicts:
	theme/bootstrapbase/style/moodle.css
 2013-06-10 14:26:04 +12:00
Sam Hemelryk
d3e5a21e7a MDL-39824 theme: changes recorded in theme/upgrade.txt 2013-06-10 09:26:05 +12:00
Sam Hemelryk
7956a02fda MDL-40089 theme_clean: simplified layouts and converted to new OUTPUT API 2013-06-10 09:09:03 +12:00
Matteo Scaramuccia
06eca48648 MDL-40002 Files: ETag value must be a quoted-string. 
ETag value must be double quoted, http://tools.ietf.org/html/rfc2616#section-3.11.
More details about potential impacts in MDL-39832: shortly, at least when using
HTTP Partial GET Requests (HTTP Status: 206) plus X-Sendfile HTTP Header.
In this commit, the impact is to be RFC2616 compliant when using the ETag Header.
 2013-06-09 09:43:36 +02:00
Gareth J Barnard
70d7e9141f MDL-39798 theme_bootstrapbase: Improve layout for course participation reports. 2013-06-08 13:59:15 +01:00
Gareth J Barnard
3355b72e3b MDL-40087 theme_bootstrapbase: Turn editing on button misaligned on nav bar. 2013-06-07 18:20:05 +01:00
Jason Fowler
41d6483066 MDL-39746 - Themes - Hiding the user picture on the forum page when the screensize is too small to allow for it 2013-06-07 14:35:08 +08:00
Sam Hemelryk
7362d8160a MDL-40089 theme_clean: moved general to columns3.php as prep 2013-06-07 17:33:14 +12:00
Sam Hemelryk
8bfd530bc1 MDL-39824 theme_bootstrapbase: converted $PAGE use to new $OUTPUT methods. 2013-06-07 17:32:44 +12:00
Sam Hemelryk
28700dea3c MDL-40089 theme_bootstrapbase: moved general to columns3.php as prep 2013-06-07 17:32:06 +12:00
Mary Evans
f84ad1bb0a MDL-39338 core_question: Make history box a .well 2013-06-06 22:49:27 +01:00
Rossiani Wijaya
01a9646138 MDL-39773 bootstrapbase: add style for .centerpadded. 
Relocate .centerpadded styling from standard to base themes
 2013-06-05 12:43:56 +08:00
Dan Poltawski
c05660fc35 Merge branch 'MDL-39977' of git://github.com/lazydaisy/moodle 
Conflicts:
	theme/bootstrapbase/style/moodle.css
 2013-06-05 10:11:42 +08:00