Commit graph

62580 commits

Author SHA1 Message Date
Marina Glancy
74aeac79b4 MDL-39870 correctly determine whether activity is resource or module 2013-05-29 14:45:20 +10:00
Ashley Holman
c7e4403c9f MDL-39743 assign: Fix missing capability check for "grant extension" 2013-05-29 11:58:48 +08: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
sam marshall
a260245739 MDL-39723 Remove unnecessary queries for COURSE, SITE 2013-05-28 13:14:55 +01:00
Jason Fowler
0179d6beee MDL-38347 - Calendar - Fixing arrow output on Android devices 2013-05-28 15:25:44 +08: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
Dan Poltawski
cce01b49c1 Merge branch 'w22_MDL-38408_m26_paypalcost' of git://github.com/skodak/moodle 2013-05-27 13:04:45 +08:00
Yuliya Bozhko
59c6b212f5 MDL-39778 badges: Fix missing library error in delete_course() 2013-05-27 11:59:54 +08:00
Rajesh Taneja
0ca328ed23 MDL-39827 course: Trigger invalidate cache event while changing sort-order of category 2013-05-27 10:46:59 +08:00
Dan Poltawski
047a79baed Merge branch 'MDL-39768_master' of git://github.com/dmonllao/moodle 2013-05-27 10:18:21 +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
Petr Škoda
ee4df06f12 MDL-38408 always validate PayPal dates and cost, improve float formatting 2013-05-25 22:47:28 +02:00
Mary Evans
7eff2edc96 MDL-39806 theme_bootstrapbase: Fix for coursesearchbox label alignment. 2013-05-25 16:47:52 +01:00
Petr Škoda
5ce443a1b1 MDL-39676 improve get_role_users() unit tests 2013-05-25 10:09:42 +02:00
Petr Škoda
f111746140 MDL-39688 do not set Etag when sending http ranges 2013-05-25 09:10:24 +02:00
Petr Škoda
f3bd4ea6ec MDL-39802 ignore deleted users in meta enrolments 2013-05-24 21:16:21 +02:00
Petr Škoda
a23fe90d18 MDL-39802 ignore deleted users in cohort enrolments 2013-05-24 21:16:14 +02:00
Petr Škoda
5b5d372c3c MDL-39802 ignore deleted users in category enrolments 2013-05-24 21:15:17 +02:00
Petr Škoda
29daca77bd MDL-39802 fix sloppy user deleting and creating in imsenterprise plugin 2013-05-24 21:14:53 +02:00
Petr Škoda
736faed6c6 MDL-39802 add cli script for fixing of all deleted users
Use this script if something just set the user.deleted flag instead of calling the delete_user() method.
2013-05-24 21:08:45 +02:00
Damyon Wiese
73f560c7b2 weekly on-sync release 2.6dev 2013-05-24 13:18:42 +08:00