60881 Commits

Author SHA1 Message Date
David Monllao
550d842e3c MDL-39232 behat Normalize feature tags according to component names 2013-04-30 11:54:47 +08:00
David Monllao
9b1dbe16db MDL-39232 behat: Adding @_only_local tag
Tests which requires files to be uploaded should
be tagged as @_only_local.
2013-04-30 11:54:47 +08:00
Dan Poltawski
cf5a3296c4 on demand release 2.5beta+ 2013-04-26 10:38:16 +01:00
Dan Poltawski
bd7ed905d5 Merge branch 'install_master' of git://git.moodle.cz/moodle-install 2013-04-26 10:37:15 +01:00
Eloy Lafuente (stronk7)
88bcc5fabe MDL-39278 rebuild moodle.css with everything in place 2013-04-26 11:13:09 +02:00
Eloy Lafuente (stronk7)
a86103e09b Merge branch 'MDL-39278-master' of git://github.com/damyon/moodle
Conflicts:
	theme/bootstrap/style/generated.css
	theme/bootstrap/style/moodle.css
	theme/bootstrapbase/less/moodle/recess.txt
	theme/bootstrapbase/style/generated.css
2013-04-26 11:10:09 +02:00
Dan Poltawski
1c97061a35 MDL-39341 boostrapbase: fix some missing renames 2013-04-26 09:54:21 +01:00
Dan Poltawski
5df8fc6744 Merge branch 'MDL-39341-master' of git://github.com/damyon/moodle 2013-04-26 09:52:44 +01:00
Eloy Lafuente (stronk7)
e4a7816155 Merge branch 'MDL-38888-master' of git://github.com/mouneyrac/moodle 2013-04-26 10:48:38 +02:00
Jerome Mouneyrac
3fb83b41a5 MDL-38888 Publish forms display setType warning 2013-04-26 16:45:00 +08:00
Damyon Wiese
4f1008202d MDL-39341 Themes Rename bootstrap to bootstrapbase 2013-04-26 13:01:06 +08:00
Damyon Wiese
64bfea3b0e Merge branch 'MDL-38833_settype' of git://github.com/andyjdavis/moodle 2013-04-26 11:55:30 +08:00
Damyon Wiese
36f33e3c2c MDL-39278 Bootstrap - Change generated.css to moodle.css
The filename generated.css comes from moodle.less - so this is more obvious.
2013-04-26 11:38:43 +08:00
Andrew Davis
15b0930288 MDL-38833 core_grade: added a set_type for finalgrade 2013-04-26 09:58:40 +08:00
Damyon Wiese
44ed2fe740 Merge branch 'MDL-39250_clean_master' of git://github.com/lazydaisy/moodle 2013-04-26 09:15:14 +08:00
Eloy Lafuente (stronk7)
29b8b7e11a Merge branch 'MDL-39358-standard-clean' of git://github.com/mudrd8mz/moodle 2013-04-25 23:50:08 +02:00
David Mudrák
e18597fa15 MDL-39358 Mark the new theme_clean as a standard plugin 2013-04-25 22:23:58 +02:00
Dan Poltawski
75358cf3c5 Merge branch 'wip-MDL-39305-master' of git://github.com/marinaglancy/moodle 2013-04-25 14:53:18 +01:00
Dan Poltawski
6cb94fd13b Merge branch 'MDL-38889-master' of git://github.com/mouneyrac/moodle 2013-04-25 13:06:52 +01:00
Dan Poltawski
68265ee2d6 Merge branch 'MDL-34403' of https://github.com/mpetrowi/moodle 2013-04-25 12:49:38 +01:00
Jerome Mouneyrac
fea8be4203 MDL-37988 Completion reports: Table header row not in thead section 2013-04-25 12:37:53 +01:00
Dan Poltawski
78129ff0be Merge branch 'MDL-29258_master' of git://github.com/dmonllao/moodle 2013-04-25 10:19:45 +01:00
Dan Poltawski
0722742b63 Merge branch 'MDL-39329-master' of git://github.com/FMCorz/moodle 2013-04-25 10:09:52 +01:00
Mary Evans
b0ba8d9843 MDL-39250 theme_clean: Removed 2 instances of id="region-pre" from aside tags in layout/general.php. 2013-04-25 03:13:53 +01:00
AMOS bot
606e312ce4 Automatically generated installer lang files 2013-04-25 00:38:05 +00:00
Eloy Lafuente (stronk7)
5f8a42728f on demand release 2.5beta+ 2013-04-25 01:07:27 +02:00
Eloy Lafuente (stronk7)
344c04e0ff Merge branch 'install_master' of git://git.moodle.cz/moodle-install 2013-04-25 01:02:41 +02:00
Eloy Lafuente (stronk7)
e9f9bb7532 MDL-39276 theme_clean: Move favicon from old simple 2013-04-25 00:28:30 +02:00
Eloy Lafuente (stronk7)
ac8b3d845e Merge branch 'MDL-39276_clean' of git://github.com/lazydaisy/moodle 2013-04-25 00:27:03 +02:00
Eloy Lafuente (stronk7)
e4083853c4 MDL-39138 theme_bootstrap: whitespace line 2013-04-25 00:01:32 +02:00
Eloy Lafuente (stronk7)
4017b1f76a Merge branch 'wip-MDL-39138-master' of git://github.com/ds125v/moodle
Conflicts:
	theme/bootstrap/style/generated.css
2013-04-25 00:00:23 +02:00
Eloy Lafuente (stronk7)
274511f0cb Merge branch 'MDL-35364' of git://github.com/timhunt/moodle 2013-04-24 23:35:46 +02:00
Mary Evans
109cdf6bd8 MDL-39276 theme_clean: Renamed Simple theme to Clean theme. 2013-04-24 21:35:15 +01:00
Matt Petro
f5f3658480 MDL-34403 mod quiz: fix error during enrolment 2013-04-24 15:00:06 -04:00
Dan Poltawski
ba26ed9cac Merge branch 'MDL-39283' of git://github.com/jmvedrine/moodle 2013-04-24 14:33:00 +01:00
David Scotson
68ce389682 MDL-39138 theme_bootstrap: Revert Settings/Nav styles 2013-04-24 14:01:34 +01:00
Dan Poltawski
088c2616ec Merge branch 'wip-MDL-39297-master' of git://github.com/marinaglancy/moodle 2013-04-24 11:47:08 +01:00
Dan Poltawski
a461c6d444 Merge branch 'MDL-38415-master' of git://github.com/FMCorz/moodle 2013-04-24 11:39:08 +01:00
Dan Poltawski
f1b0908b8a MDL-38597 forum: fix incompetent programmer error ;-)
Shameful, Fred!
2013-04-24 10:02:41 +01:00
Dan Poltawski
6f0fdc9bb2 Merge branch 'MDL-38597-master-int' of git://github.com/FMCorz/moodle 2013-04-24 09:57:22 +01:00
Dan Poltawski
c1ae8606bd Merge branch 'MDL-38572-master' of git://github.com/FMCorz/moodle 2013-04-24 09:53:25 +01:00
Damyon Wiese
de17527022 MDL-32946: Be consistent with use of alt/title.
Re: Block dock/undock links.
2013-04-24 16:10:43 +08:00
Damyon Wiese
11b6045b09 Merge branch 'wip-MDL-32946-master' of git://github.com/phalacee/moodle 2013-04-24 16:10:30 +08:00
Dan Poltawski
9da8c53295 Merge branch 'MDL-39219_scorm_ie7' of git://github.com/davosmith/moodle 2013-04-24 09:08:23 +01:00
Dan Poltawski
e6c91f99ec Merge branch 'MDL-38892' of git://github.com/rwijaya/moodle 2013-04-24 08:16:37 +01:00
Damyon Wiese
7d45396306 Merge branch 'MDL-34939-master' of https://github.com/lucisgit/moodle 2013-04-24 15:01:35 +08:00
Rossiani Wijaya
819b1de681 MDL-38892 data module: Fixed action setType to use PARAM_ALPHANUM 2013-04-24 13:49:09 +08:00
Jason Fowler
473327030e MDL-32946 - Blocks - Improving image alts for accessibility. 2013-04-24 13:06:22 +08:00
Damyon Wiese
a6e22a88c7 Merge branch 'wip-MDL-39326-m25' of git://github.com/samhemelryk/moodle 2013-04-24 12:53:16 +08:00
Frederic Massart
a96889ab51 MDL-39329 course: Strict standard warning during unpublishing 2013-04-24 11:47:08 +08:00