mirror_php/moodle
1
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-01-18 22:08:20 +01:00
Code Issues Projects Releases Wiki Activity
61,616 Commits 36 Branches 519 Tags
Commit Graph

3346 Commits

Author SHA1 Message Date
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
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
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
Eloy Lafuente (stronk7)
796b57ea0b Merge branch 'MDL-39968-master' of git://github.com/danpoltawski/moodle 2013-06-05 02:32:29 +02:00
Mary Evans
665c8e972a MDL-40018 theme_sky_high: Fixed footer in admin pages. 2013-06-04 23:36:38 +01:00
Dan Poltawski
20fe8676ea Merge branch 'MDL-39835_M26' of github.com:lazydaisy/moodle 2013-06-04 14:44:35 +08:00
Dan Poltawski
93ab081025 Merge branch 'wip-MDL-39819_master' of git://github.com/gjb2048/moodle 
Conflicts:
	theme/bootstrapbase/style/moodle.css
 2013-06-04 14:37:55 +08:00
Dan Poltawski
31e9ffe0ac MDL-39931 less: recompile with whitespace removed 2013-06-04 14:08:28 +08:00
Dan Poltawski
42d00d3638 Merge branch 'MDL-39931' of github.com:lazydaisy/moodle 2013-06-04 13:31:34 +08:00
Mary Evans
c14964cacb MDL-39987 theme_bootstrapbase: Fixed menunode text in renderers/core_renderer.php. 2013-06-02 23:04:17 +01:00
Mary Evans
5f831ca077 MDL-39835 theme_sky_high: Fix for footer to display correctly in higher resolutions. 2013-06-01 21:36:58 +01:00
Mary Evans
58183f9b01 MDL-39977 theme_bootstrapbase: Changes the way Clean theme's login takes its navbar styles from Bootstrapbase. 2013-06-01 18:42:09 +01:00
Gareth J Barnard
873dfb3608 MDL-39819 theme_bootstrapbase: Fix icon alignment in filepicker. 2013-05-31 22:30:26 +01:00
Dan Poltawski
e807dadb55 MDL-39968 bootstrapbase: uses non-standard browser sniffing 
Also theme_clean does the same sniffing, but is not necessary as its
included by bootstrapbase
 2013-05-31 15:55:47 +08:00
Mary Evans
947483327f MDL-39931 theme_bootstrapbase: ported invisiblefieldset css rules from theme/base/core.css to less/moodle/core.css 2013-05-30 15:26:13 +01:00
Eloy Lafuente (stronk7)
33b9fecd19 Merge branch 'wip-MDL-39836_master' of git://github.com/gjb2048/moodle 
Conflicts:
	theme/bootstrapbase/style/moodle.css
 2013-05-28 01:23:27 +02:00
Damyon Wiese
1833a3c449 Merge branch 'MDL-39680_master' of git://github.com/lazydaisy/moodle 
Conflicts:
	theme/bootstrapbase/style/moodle.css
 2013-05-27 16:24:34 +08:00
Kordan
30a826320e MDL-39194 theme_formal_white: cleaned the category page showing course listing 2013-05-27 15:46:57 +08:00
Dan Poltawski
2226ac117b MDL-39806 theme_bootstrapbase: run less with --compress 2013-05-27 14:44:11 +08:00
Gareth J Barnard
af9c2dcf24 MDL-38856 theme_bootstrapbase: Inverse user name text unreadable on nav bar 2013-05-27 02:14:19 +01:00
Mary Evans
38c96b9545 MDL-39680 theme_bootstrapbase: Fixed footer alignment in less/moodle/debug.less 
Squashed commit of the following:

commit 58f5e063a8b333c184ca83ece7f61ec40d2a5080
Author: Mary Evans <lazydaisy@visible-expression.co.uk>
Date:   Sun May 26 13:45:11 2013 +0100

    MDL-39680 theme_bootstrapbase: Fixed footer alignment in less/moodle/debug.less

commit 575594257a9f4fab75977d2334d07659abea0b65
Author: Mary Evans <lazydaisy@visible-expression.co.uk>
Date:   Sun May 26 02:07:00 2013 +0100

    MDL-39680 theme_bootstrapbase: Centralised text in footer.
 2013-05-26 14:07:36 +01:00
Mary Evans
7eff2edc96 MDL-39806 theme_bootstrapbase: Fix for coursesearchbox label alignment. 2013-05-25 16:47:52 +01:00
Damyon Wiese
49125bc509 Merge branch 'MDL-39697' of git://github.com/lazydaisy/moodle 2013-05-22 09:06:29 +08:00
Dan Poltawski
a22b8a83e7 Merge branch 'MDL-39753' of git://github.com/stronk7/moodle 2013-05-21 10:58:37 +08:00
Eloy Lafuente (stronk7)
40cdce2e78 Merge branch 'MDL-39758_master' of git://github.com/lazydaisy/moodle 2013-05-21 01:46:45 +02:00
Eloy Lafuente (stronk7)
c9e54743ec MDL-39753 Add 2.5.0 upgrade line 2013-05-20 15:33:19 +02:00
Mary Evans
4cb70acbb4 MDL-39758 theme_bootatrapbase: Added missing layout/embedded.php. 2013-05-20 12:42:43 +01:00
Dan Poltawski
2f75633c6f Merge branch 'MDL-39630_master' of git://github.com/lazydaisy/moodle 2013-05-20 12:01:01 +08:00
Dan Poltawski
02f92b2d86 Merge branch 'MDL-39198_master' of git://github.com/kordan/moodle 2013-05-20 11:47:50 +08:00
Mary Evans
67202e2f27 MDL-39697 theme_bootstrapbase: Updated $THEME->layouts in config.php to match those in Base theme. 2013-05-16 01:06:26 +01:00
Damyon Wiese
d458718f59 Merge branch 'MDL-39191_master' of git://github.com/kordan/moodle 2013-05-14 14:16:05 +08:00
Sam Hemelryk
f000edba16 Merge branch 'MDL-39573-master' of git://github.com/damyon/moodle 2013-05-14 09:15:54 +12:00
Eloy Lafuente (stronk7)
522b5faf60 Merge branch 'MDL-39642-en_fix' of git://github.com/mudrd8mz/moodle 
Conflicts:
	lang/en/badges.php
 2013-05-13 12:07:55 +02:00
Helen Foster
9f3e096899 MDL-39642 Merge English strings from the en_fix language pack 2013-05-13 09:58:43 +02:00
Damyon Wiese
6693089b90 MDL-39573 theme: bootstrap - always show pre and post regions when editing 2013-05-13 14:55:29 +08:00
Mary Evans
0d57b4cbf2 MDL-39595 theme_bootstrapbase: Renamed renderers/core.php to renderers/core_renderer.php 2013-05-13 14:51:26 +08:00