Commit graph

61466 commits

Author SHA1 Message Date
Eloy Lafuente (stronk7)
fd4c01566e Merge branch 'w23_MDL-39882_m26_behatconfig' of git://github.com/skodak/moodle 2013-06-04 01:31:54 +02:00
Eloy Lafuente (stronk7)
422595e282 Merge branch 'MDL-39821-master' of git://github.com/damyon/moodle 2013-06-04 01:14:09 +02:00
Eloy Lafuente (stronk7)
d13d3f2d31 MDL-39465 Show env. info instead of part twice. 2013-06-04 00:50:15 +02:00
Eloy Lafuente (stronk7)
5431fda180 Merge branch 'MDL-39936-master' of git://github.com/danpoltawski/moodle 2013-06-04 00:04:12 +02:00
Eloy Lafuente (stronk7)
a346c3826b Merge branch 'w23_MDL-39465_m26_environment' of git://github.com/skodak/moodle 2013-06-03 23:59:12 +02:00
Eloy Lafuente (stronk7)
0288c5ffe1 Merge branch 'MDL-39166-m25' of https://github.com/jfilip/moodle 2013-06-03 23:51:22 +02:00
Eloy Lafuente (stronk7)
9e3b5a47f6 Merge branch 'wip-MDL-39710-master' of git://github.com/marinaglancy/moodle 2013-06-03 23:18:55 +02:00
Eloy Lafuente (stronk7)
71b2d24a9b Merge branch 'MDL-39932_master' of git://github.com/grabs/moodle 2013-06-03 19:10:00 +02:00
Eloy Lafuente (stronk7)
6cffc66647 Merge branch 'MDL-39487_master' of https://github.com/IOC/moodle 2013-06-03 19:03:15 +02:00
Eloy Lafuente (stronk7)
c557f6b324 Merge branch 'MDL-39987_master' of git://github.com/lazydaisy/moodle 2013-06-03 16:20:41 +02:00
Mary Evans
c14964cacb MDL-39987 theme_bootstrapbase: Fixed menunode text in renderers/core_renderer.php. 2013-06-02 23:04:17 +01:00
Petr Škoda
7dc1feaa99 MDL-39465 detect environment problems in tests
This should help explain why something else fails.
2013-05-31 22:02:34 +02:00
Petr Škoda
f8cb3e62ff MDL-39882 add required behat settings to config-dist 2013-05-31 21:09:52 +02:00
Marina Glancy
027c230796 MDL-39710 Don't display rubric and guide preview unless option checked 2013-05-31 16:14:32 +10:00
Russell Boyatt
8f485ce28e Fixing MDL-39710: setting to limit student access to rubric now checked. 2013-05-31 16:14:26 +10:00
Andreas Grabs
e6e9bec3ee MDL-39932 mod_feedback - Mapping Feedback when Course is Deleted - thx to David N. Johnson 2013-05-30 23:10:33 +02:00
Dan Poltawski
4f5bcf2eca MDL-39936 upgrade: 2.5.0 line incorrectly positioned 2013-05-30 13:41:15 +08:00
Damyon Wiese
b6f8a93642 weekly on-sync release 2.6dev 2013-05-30 11:50:35 +08:00
Damyon Wiese
455d204201 Merge branch 'install_master' of git://git.moodle.cz/moodle-install 2013-05-30 11:25:54 +08:00
AMOS bot
4912f45476 Automatically generated installer lang files 2013-05-30 00:38:20 +00:00
Damyon Wiese
48488bfb39 MDL-39821 assign: missing setType with advanced grading 2013-05-29 11:20:56 +08:00
AMOS bot
7440ce08c3 Automatically generated installer lang files 2013-05-29 00:39:21 +00:00
Eloy Lafuente (stronk7)
aeb5f9ae37 Merge branch 'w22_MDL-39676_m26_whereparam' of git://github.com/skodak/moodle 2013-05-28 15:31:07 +02:00
Damyon Wiese
ba375bcb17 MDL-39477: Remove some unused instances of $CFG
Also change @since tags to 2.5.1 because this will be backported.
2013-05-28 11:13:52 +08:00
Damyon Wiese
e750fcc4da Merge branch 'MDL-39702_master' of git://github.com/dmonllao/moodle
Conflicts:
	lib/testing/generator/repository_generator.php
2013-05-28 11:13:43 +08:00
Damyon Wiese
0f1f601368 Merge branch 'MDL-39477-master' of git://github.com/FMCorz/moodle 2013-05-28 11:12:43 +08:00
Frederic Massart
67e01a5f5f MDL-39477 repository: Tests use data generator 2013-05-28 10:44:44 +08:00
Frederic Massart
9b5e61ac1e MDL-39477 repository: Introducing data generators for repositories 2013-05-28 10:44:43 +08:00
Damyon Wiese
cb7c21af80 Merge branch 'w22_MDL-39802_m26_deletedusers' of git://github.com/skodak/moodle 2013-05-28 09:57:15 +08:00
AMOS bot
131025b885 Automatically generated installer lang files 2013-05-28 00:38:14 +00: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
Eloy Lafuente (stronk7)
f50ca7b3df Merge branch 'wip-MDL-39456-m26' of git://github.com/samhemelryk/moodle 2013-05-28 01:00:57 +02:00
Eloy Lafuente (stronk7)
ed602a597d Merge branch 'MDL-39853_master' of git://github.com/dmonllao/moodle 2013-05-28 00:56:37 +02:00
Eloy Lafuente (stronk7)
cc4cbf67f0 Merge branch 'MDL-39795_master' of git://github.com/dmonllao/moodle 2013-05-28 00:02:58 +02:00
Damyon Wiese
e6302a3c75 Merge branch 'MDL-39686_master' of git://github.com/dmonllao/moodle 2013-05-27 16:29:00 +08: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
Damyon Wiese
d059d80ea6 Merge branch 'MDL-39640-master-int' of git://github.com/FMCorz/moodle 2013-05-27 16:15:51 +08:00
Kordan
30a826320e MDL-39194 theme_formal_white: cleaned the category page showing course listing 2013-05-27 15:46:57 +08:00
David Monllao
ae689a9633 MDL-39853 behat: Useful info for $CFG->behat_config setting 2013-05-27 15:12:26 +08:00
David Monllao
41eb672ba4 MDL-39686 behat: Add option to restart the browser 2013-05-27 15:03:25 +08:00
David Monllao
886b44bbd3 MDL-39686 behat: Adding into to config-dist.php 2013-05-27 15:01:46 +08:00
David Monllao
c29e3e248f MDL-39702 generators: Adding MOODLE_INTERNAL
As discussed generators should include MOODLE_INTERNAL
as they make use of CFG and they don't make sense without
requiring config.php.
2013-05-27 14:52:53 +08:00
Frederic Massart
0852bbaed5 MDL-39477 repository: Introducing data generators for repositories 2013-05-27 14:52:11 +08:00
Dan Poltawski
2226ac117b MDL-39806 theme_bootstrapbase: run less with --compress 2013-05-27 14:44:11 +08:00
Dan Poltawski
550e8d5bc7 Merge branch 'MDL-39806_master' of git://github.com/lazydaisy/moodle 2013-05-27 14:36:46 +08:00
David Monllao
69a397cd2c MDL-39795 behat: Adapting features to consider spaces 2013-05-27 14:24:20 +08:00
David Monllao
9a1f4922bd MDL-39795 behat: Improving find-texts-in-page-contents performance 2013-05-27 14:24:20 +08:00
Dan Poltawski
92e24958e5 Merge branch 'wip-MDL-39785-master' of git://github.com/marinaglancy/moodle 2013-05-27 14:17:00 +08:00
Dan Poltawski
87787191e4 Merge branch 'MDL-38239-master' of git://github.com/StudiUM/moodle 2013-05-27 14:04:04 +08:00
Dan Poltawski
5584adfe70 Merge branch 'w22_MDL-39688_m26_etag' of git://github.com/skodak/moodle 2013-05-27 13:43:13 +08:00