Dan Poltawski [Tue, 4 Jun 2013 06:44:35 +0000 (14:44 +0800)]
Merge branch 'MDL-39835_M26' of github.com:lazydaisy/moodle
Dan Poltawski [Tue, 4 Jun 2013 06:37:55 +0000 (14:37 +0800)]
Merge branch 'wip-MDL-39819_master' of git://github.com/gjb2048/moodle
Conflicts:
theme/bootstrapbase/style/moodle.css
Dan Poltawski [Tue, 4 Jun 2013 06:14:18 +0000 (14:14 +0800)]
Merge branch 'wip-MDL-39870-master' of git://github.com/marinaglancy/moodle
Dan Poltawski [Tue, 4 Jun 2013 06:08:28 +0000 (14:08 +0800)]
MDL-39931 less: recompile with whitespace removed
Dan Poltawski [Tue, 4 Jun 2013 05:31:34 +0000 (13:31 +0800)]
Merge branch 'MDL-39931' of github.com:lazydaisy/moodle
Dan Poltawski [Tue, 4 Jun 2013 05:18:49 +0000 (13:18 +0800)]
Merge branch 'MDL-39536-master' of git://github.com/FMCorz/moodle
Frederic Massart [Fri, 31 May 2013 08:11:17 +0000 (16:11 +0800)]
MDL-39536 completion: Unit tests for get_activities and has_activities
Frederic Massart [Fri, 31 May 2013 06:25:21 +0000 (14:25 +0800)]
MDL-39536 completion: Prevent DB call when fetching activities
Dan Poltawski [Tue, 4 Jun 2013 04:27:30 +0000 (12:27 +0800)]
Merge branch 'MDL-39939-scorm-basic-report-name' of git://github.com/mudrd8mz/moodle
Dan Poltawski [Tue, 4 Jun 2013 03:29:38 +0000 (11:29 +0800)]
Merge branch 'wip-mdl-39827' of git://github.com/rajeshtaneja/moodle
Dan Poltawski [Tue, 4 Jun 2013 03:26:28 +0000 (11:26 +0800)]
Merge branch 'MDL-39317-master' of git://github.com/damyon/moodle
Dan Poltawski [Tue, 4 Jun 2013 03:03:39 +0000 (11:03 +0800)]
Merge branch 'MDL-39743-master' of git://github.com/damyon/moodle
Dan Poltawski [Tue, 4 Jun 2013 02:42:45 +0000 (10:42 +0800)]
Merge branch 'wip_master_mdl-34085' of https://github.com/iarenaza/moodle
Eloy Lafuente (stronk7) [Mon, 3 Jun 2013 23:51:10 +0000 (01:51 +0200)]
Merge branch 'wip-MDL-39801-master' of git://github.com/marinaglancy/moodle
Eloy Lafuente (stronk7) [Mon, 3 Jun 2013 23:41:58 +0000 (01:41 +0200)]
MDL-39764 style: phpdoc changed to inline comments
Eloy Lafuente (stronk7) [Mon, 3 Jun 2013 23:36:16 +0000 (01:36 +0200)]
Merge branch 'wip-MDL-39764_master_3' of git://github.com/gjb2048/moodle
Eloy Lafuente (stronk7) [Mon, 3 Jun 2013 23:31:54 +0000 (01:31 +0200)]
Merge branch 'w23_MDL-39882_m26_behatconfig' of git://github.com/skodak/moodle
Eloy Lafuente (stronk7) [Mon, 3 Jun 2013 23:14:09 +0000 (01:14 +0200)]
Merge branch 'MDL-39821-master' of git://github.com/damyon/moodle
Eloy Lafuente (stronk7) [Mon, 3 Jun 2013 22:50:15 +0000 (00:50 +0200)]
MDL-39465 Show env. info instead of part twice.
Gareth J Barnard [Mon, 3 Jun 2013 22:36:32 +0000 (23:36 +0100)]
MDL-39764 course_format: Allow courses to have numsections > maxsections.
Eloy Lafuente (stronk7) [Mon, 3 Jun 2013 22:04:12 +0000 (00:04 +0200)]
Merge branch 'MDL-39936-master' of git://github.com/danpoltawski/moodle
Eloy Lafuente (stronk7) [Mon, 3 Jun 2013 21:59:12 +0000 (23:59 +0200)]
Merge branch 'w23_MDL-39465_m26_environment' of git://github.com/skodak/moodle
Eloy Lafuente (stronk7) [Mon, 3 Jun 2013 21:51:22 +0000 (23:51 +0200)]
Merge branch 'MDL-39166-m25' of https://github.com/jfilip/moodle
Eloy Lafuente (stronk7) [Mon, 3 Jun 2013 21:18:55 +0000 (23:18 +0200)]
Merge branch 'wip-MDL-39710-master' of git://github.com/marinaglancy/moodle
Eloy Lafuente (stronk7) [Mon, 3 Jun 2013 17:10:00 +0000 (19:10 +0200)]
Merge branch 'MDL-39932_master' of git://github.com/grabs/moodle
Eloy Lafuente (stronk7) [Mon, 3 Jun 2013 17:03:15 +0000 (19:03 +0200)]
Merge branch 'MDL-39487_master' of https://github.com/IOC/moodle
Eloy Lafuente (stronk7) [Mon, 3 Jun 2013 14:20:41 +0000 (16:20 +0200)]
Merge branch 'MDL-39987_master' of git://github.com/lazydaisy/moodle
Mary Evans [Sun, 2 Jun 2013 22:04:17 +0000 (23:04 +0100)]
MDL-39987 theme_bootstrapbase: Fixed menunode text in renderers/core_renderer.php.
Mary Evans [Sat, 1 Jun 2013 20:36:58 +0000 (21:36 +0100)]
MDL-39835 theme_sky_high: Fix for footer to display correctly in higher resolutions.
Gareth J Barnard [Fri, 31 May 2013 21:30:26 +0000 (22:30 +0100)]
MDL-39819 theme_bootstrapbase: Fix icon alignment in filepicker.
Petr Škoda [Fri, 31 May 2013 20:02:34 +0000 (22:02 +0200)]
MDL-39465 detect environment problems in tests
This should help explain why something else fails.
Petr Škoda [Fri, 31 May 2013 19:09:05 +0000 (21:09 +0200)]
MDL-39882 add required behat settings to config-dist
Marina Glancy [Fri, 31 May 2013 06:09:21 +0000 (16:09 +1000)]
MDL-39710 Don't display rubric and guide preview unless option checked
Russell Boyatt [Wed, 29 May 2013 14:32:48 +0000 (15:32 +0100)]
Fixing MDL-39710: setting to limit student access to rubric now checked.
Marina Glancy [Fri, 31 May 2013 01:48:32 +0000 (11:48 +1000)]
MDL-39801 navigation_node::remove does not allow to insert nodes afterwards
Marina Glancy [Fri, 31 May 2013 01:45:47 +0000 (11:45 +1000)]
MDL-39801 navigation_node::remove fails if first child does not have a key
Andreas Grabs [Thu, 30 May 2013 21:10:33 +0000 (23:10 +0200)]
MDL-39932 mod_feedback - Mapping Feedback when Course is Deleted - thx to David N. Johnson
David Mudrák [Thu, 30 May 2013 20:42:12 +0000 (22:42 +0200)]
MDL-39939 Fix the basic SCORM report plugin name
Iñaki Arenaza [Thu, 30 May 2013 15:09:49 +0000 (17:09 +0200)]
MDL-34085 Fix the backup options names in core_course_duplicate_course
Fix the option names to match those used by the backup subsystem.
Mary Evans [Thu, 30 May 2013 14:26:13 +0000 (15:26 +0100)]
MDL-39931 theme_bootstrapbase: ported invisiblefieldset css rules from theme/base/core.css to less/moodle/core.css
Dan Poltawski [Thu, 30 May 2013 05:40:28 +0000 (13:40 +0800)]
MDL-39936 upgrade: 2.5.0 line incorrectly positioned
Damyon Wiese [Thu, 30 May 2013 03:50:35 +0000 (11:50 +0800)]
weekly on-sync release 2.6dev
Damyon Wiese [Thu, 30 May 2013 03:25:54 +0000 (11:25 +0800)]
Merge branch 'install_master' of git://git.moodle.cz/moodle-install
AMOS bot [Thu, 30 May 2013 00:38:20 +0000 (00:38 +0000)]
Automatically generated installer lang files
Damyon Wiese [Wed, 29 May 2013 06:35:22 +0000 (14:35 +0800)]
MDL-39317 assign: Fix for submitted filter on grading table.
Some old upgraded assignments have no timecreated column so use
a different one to check for a valid submission.
Marina Glancy [Wed, 29 May 2013 04:44:45 +0000 (14:44 +1000)]
MDL-39870 correctly determine whether activity is resource or module
Ashley Holman [Wed, 29 May 2013 03:57:33 +0000 (11:57 +0800)]
MDL-39743 assign: Fix missing capability check for "grant extension"
Damyon Wiese [Wed, 29 May 2013 03:20:56 +0000 (11:20 +0800)]
MDL-39821 assign: missing setType with advanced grading
AMOS bot [Wed, 29 May 2013 00:39:21 +0000 (00:39 +0000)]
Automatically generated installer lang files
Eloy Lafuente (stronk7) [Tue, 28 May 2013 13:31:07 +0000 (15:31 +0200)]
Merge branch 'w22_MDL-39676_m26_whereparam' of git://github.com/skodak/moodle
Damyon Wiese [Tue, 28 May 2013 02:53:39 +0000 (10:53 +0800)]
MDL-39477: Remove some unused instances of $CFG
Also change @since tags to 2.5.1 because this will be backported.
Damyon Wiese [Tue, 28 May 2013 03:13:43 +0000 (11:13 +0800)]
Merge branch 'MDL-39702_master' of git://github.com/dmonllao/moodle
Conflicts:
lib/testing/generator/repository_generator.php
Damyon Wiese [Tue, 28 May 2013 03:12:43 +0000 (11:12 +0800)]
Merge branch 'MDL-39477-master' of git://github.com/FMCorz/moodle
Frederic Massart [Fri, 3 May 2013 03:44:31 +0000 (11:44 +0800)]
MDL-39477 repository: Tests use data generator
Frederic Massart [Thu, 2 May 2013 10:14:58 +0000 (18:14 +0800)]
MDL-39477 repository: Introducing data generators for repositories
Damyon Wiese [Tue, 28 May 2013 01:57:15 +0000 (09:57 +0800)]
Merge branch 'w22_MDL-39802_m26_deletedusers' of git://github.com/skodak/moodle
AMOS bot [Tue, 28 May 2013 00:38:14 +0000 (00:38 +0000)]
Automatically generated installer lang files
Eloy Lafuente (stronk7) [Mon, 27 May 2013 23:23:27 +0000 (01:23 +0200)]
Merge branch 'wip-MDL-39836_master' of git://github.com/gjb2048/moodle
Conflicts:
theme/bootstrapbase/style/moodle.css
Eloy Lafuente (stronk7) [Mon, 27 May 2013 23:00:57 +0000 (01:00 +0200)]
Merge branch 'wip-MDL-39456-m26' of git://github.com/samhemelryk/moodle
Eloy Lafuente (stronk7) [Mon, 27 May 2013 22:56:37 +0000 (00:56 +0200)]
Merge branch 'MDL-39853_master' of git://github.com/dmonllao/moodle
Eloy Lafuente (stronk7) [Mon, 27 May 2013 22:02:58 +0000 (00:02 +0200)]
Merge branch 'MDL-39795_master' of git://github.com/dmonllao/moodle
Damyon Wiese [Mon, 27 May 2013 08:29:00 +0000 (16:29 +0800)]
Merge branch 'MDL-39686_master' of git://github.com/dmonllao/moodle
Damyon Wiese [Mon, 27 May 2013 08:24:34 +0000 (16:24 +0800)]
Merge branch 'MDL-39680_master' of git://github.com/lazydaisy/moodle
Conflicts:
theme/bootstrapbase/style/moodle.css
Damyon Wiese [Mon, 27 May 2013 08:15:51 +0000 (16:15 +0800)]
Merge branch 'MDL-39640-master-int' of git://github.com/FMCorz/moodle
Kordan [Mon, 20 May 2013 12:55:10 +0000 (14:55 +0200)]
MDL-39194 theme_formal_white: cleaned the category page showing course listing
David Monllao [Mon, 27 May 2013 07:12:15 +0000 (15:12 +0800)]
MDL-39853 behat: Useful info for $CFG->behat_config setting
David Monllao [Wed, 15 May 2013 08:15:47 +0000 (16:15 +0800)]
MDL-39686 behat: Add option to restart the browser
David Monllao [Wed, 15 May 2013 08:12:15 +0000 (16:12 +0800)]
MDL-39686 behat: Adding into to config-dist.php
David Monllao [Mon, 20 May 2013 06:58:56 +0000 (14:58 +0800)]
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.
Frederic Massart [Thu, 2 May 2013 10:14:58 +0000 (18:14 +0800)]
MDL-39477 repository: Introducing data generators for repositories
Dan Poltawski [Mon, 27 May 2013 06:42:44 +0000 (14:42 +0800)]
MDL-39806 theme_bootstrapbase: run less with --compress
Dan Poltawski [Mon, 27 May 2013 06:36:46 +0000 (14:36 +0800)]
Merge branch 'MDL-39806_master' of git://github.com/lazydaisy/moodle
David Monllao [Mon, 27 May 2013 06:23:45 +0000 (14:23 +0800)]
MDL-39795 behat: Adapting features to consider spaces
David Monllao [Thu, 23 May 2013 05:18:51 +0000 (13:18 +0800)]
MDL-39795 behat: Improving find-texts-in-page-contents performance
Dan Poltawski [Mon, 27 May 2013 06:17:00 +0000 (14:17 +0800)]
Merge branch 'wip-MDL-39785-master' of git://github.com/marinaglancy/moodle
Dan Poltawski [Mon, 27 May 2013 06:04:04 +0000 (14:04 +0800)]
Merge branch 'MDL-38239-master' of git://github.com/StudiUM/moodle
Dan Poltawski [Mon, 27 May 2013 05:43:13 +0000 (13:43 +0800)]
Merge branch 'w22_MDL-39688_m26_etag' of git://github.com/skodak/moodle
Dan Poltawski [Mon, 27 May 2013 05:04:45 +0000 (13:04 +0800)]
Merge branch 'w22_MDL-38408_m26_paypalcost' of git://github.com/skodak/moodle
Yuliya Bozhko [Tue, 21 May 2013 22:28:51 +0000 (10:28 +1200)]
MDL-39778 badges: Fix missing library error in delete_course()
Rajesh Taneja [Mon, 27 May 2013 02:46:59 +0000 (10:46 +0800)]
MDL-39827 course: Trigger invalidate cache event while changing sort-order of category
Dan Poltawski [Mon, 27 May 2013 02:18:21 +0000 (10:18 +0800)]
Merge branch 'MDL-39768_master' of git://github.com/dmonllao/moodle
Gareth J Barnard [Mon, 27 May 2013 01:14:19 +0000 (02:14 +0100)]
MDL-38856 theme_bootstrapbase: Inverse user name text unreadable on nav bar
Mary Evans [Sun, 26 May 2013 12:55:45 +0000 (13:55 +0100)]
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.
Petr Škoda [Sat, 25 May 2013 20:47:28 +0000 (22:47 +0200)]
MDL-38408 always validate PayPal dates and cost, improve float formatting
Mary Evans [Sat, 25 May 2013 15:47:52 +0000 (16:47 +0100)]
MDL-39806 theme_bootstrapbase: Fix for coursesearchbox label alignment.
Petr Škoda [Sat, 25 May 2013 08:09:42 +0000 (10:09 +0200)]
MDL-39676 improve get_role_users() unit tests
Petr Škoda [Sat, 25 May 2013 07:10:24 +0000 (09:10 +0200)]
MDL-39688 do not set Etag when sending http ranges
Petr Škoda [Fri, 24 May 2013 19:03:58 +0000 (21:03 +0200)]
MDL-39802 ignore deleted users in meta enrolments
Petr Škoda [Fri, 24 May 2013 19:03:47 +0000 (21:03 +0200)]
MDL-39802 ignore deleted users in cohort enrolments
Petr Škoda [Fri, 24 May 2013 19:03:33 +0000 (21:03 +0200)]
MDL-39802 ignore deleted users in category enrolments
Petr Škoda [Fri, 24 May 2013 19:14:53 +0000 (21:14 +0200)]
MDL-39802 fix sloppy user deleting and creating in imsenterprise plugin
Petr Škoda [Fri, 24 May 2013 19:01:08 +0000 (21:01 +0200)]
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.
Damyon Wiese [Fri, 24 May 2013 05:18:42 +0000 (13:18 +0800)]
weekly on-sync release 2.6dev
Damyon Wiese [Fri, 24 May 2013 05:10:53 +0000 (13:10 +0800)]
Merge branch 'install_master' of git://git.moodle.cz/moodle-install
Sam Hemelryk [Wed, 1 May 2013 21:56:30 +0000 (09:56 +1200)]
MDL-39456 cachestore_file: added reference to global $CFG
By holding onto a reference of the global $CFG object we
can be sure that it isn't destroyed before we are done
with it.
This allows for caches to be used within destructors for
purposes such as delayed writes.
Eloy Lafuente (stronk7) [Thu, 23 May 2013 13:50:56 +0000 (15:50 +0200)]
Merge branch 'wip-MDL-39177-master' of git://github.com/marinaglancy/moodle
Marina Glancy [Thu, 23 May 2013 09:15:47 +0000 (19:15 +1000)]
MDL-39177 make sure we don't remove existing directories when cleaning up unzip
AMOS bot [Wed, 22 May 2013 08:26:02 +0000 (08:26 +0000)]
Automatically generated installer lang files
Marina Glancy [Wed, 22 May 2013 07:30:04 +0000 (17:30 +1000)]
MDL-39785 bug fix: filter_activitynames was not applied correctly
David Monllao [Wed, 22 May 2013 07:11:05 +0000 (15:11 +0800)]
MDL-39768 behat: Adding focused panels CSS selector