Matteo Scaramuccia [Sat, 1 Jun 2013 10:21:29 +0000 (12:21 +0200)]
MDL-39832 Files: Revert MDL-39688 commit,
f111746140fe80a821ae69e3bf518d950bf188a1
MDL-39688 has been successful in providing a solution for the issue but further
investigations done in MDL-39832 have got the evidence that the given solution
is more likely a workaround.
Dan Poltawski [Thu, 6 Jun 2013 03:58:39 +0000 (11:58 +0800)]
weekly on-sync release 2.6dev
Dan Poltawski [Thu, 6 Jun 2013 03:54:47 +0000 (11:54 +0800)]
Merge branch 'install_master' of git://git.moodle.cz/moodle-install
Eloy Lafuente (stronk7) [Wed, 5 Jun 2013 17:31:53 +0000 (19:31 +0200)]
Merge branch 'wip-MDL-38773-master' of git://github.com/marinaglancy/moodle
Eloy Lafuente (stronk7) [Wed, 5 Jun 2013 14:22:58 +0000 (16:22 +0200)]
Merge branch 'w23_MDL-39588_m26_ociinstall' of git://github.com/skodak/moodle
Eloy Lafuente (stronk7) [Wed, 5 Jun 2013 14:10:39 +0000 (16:10 +0200)]
Merge branch 'w23_MDL-39503_m26_signup' of git://github.com/skodak/moodle
Eloy Lafuente (stronk7) [Wed, 5 Jun 2013 08:36:16 +0000 (10:36 +0200)]
Merge branch 'wip-MDL-21097-master' of git://github.com/marinaglancy/moodle
Marina Glancy [Wed, 5 Jun 2013 08:06:56 +0000 (18:06 +1000)]
MDL-21097 Correctly check capabilities for frontpage editing mode
Dan Poltawski [Wed, 5 Jun 2013 05:10:12 +0000 (13:10 +0800)]
Merge branch 'wip-MDL-21097-master' of git://github.com/marinaglancy/moodle
Marina Glancy [Wed, 5 Jun 2013 04:25:13 +0000 (14:25 +1000)]
MDL-21097 corrected course editing roles
Dan Poltawski [Wed, 5 Jun 2013 02:11:42 +0000 (10:11 +0800)]
Merge branch 'MDL-39977' of git://github.com/lazydaisy/moodle
Conflicts:
theme/bootstrapbase/style/moodle.css
Marina Glancy [Wed, 5 Jun 2013 02:02:33 +0000 (12:02 +1000)]
MDL-38773 Purge coursecat cache on course restore
Eloy Lafuente (stronk7) [Wed, 5 Jun 2013 00:45:37 +0000 (02:45 +0200)]
Merge branch 'master-MDL-39409-auth-cas-use-moodle-web-proxy' of https://github.com/brki/moodle
Eloy Lafuente (stronk7) [Wed, 5 Jun 2013 00:43:21 +0000 (02:43 +0200)]
Merge branch 'w23_MDL-39416_m26_pagelog' of git://github.com/skodak/moodle
AMOS bot [Wed, 5 Jun 2013 00:39:44 +0000 (00:39 +0000)]
Automatically generated installer lang files
Eloy Lafuente (stronk7) [Wed, 5 Jun 2013 00:32:29 +0000 (02:32 +0200)]
Merge branch 'MDL-39968-master' of git://github.com/danpoltawski/moodle
Eloy Lafuente (stronk7) [Wed, 5 Jun 2013 00:29:43 +0000 (02:29 +0200)]
Merge branch 'MDL-38731-master' of git://github.com/danpoltawski/moodle
Eloy Lafuente (stronk7) [Wed, 5 Jun 2013 00:27:08 +0000 (02:27 +0200)]
Merge branch 'MDL-37332-master' of git://github.com/danpoltawski/moodle
Eloy Lafuente (stronk7) [Wed, 5 Jun 2013 00:22:22 +0000 (02:22 +0200)]
Merge branch 'm25_MDL-38545_PHP_Strict_error' of https://github.com/scara/moodle
Yuliya Bozhko [Tue, 28 May 2013 21:42:11 +0000 (09:42 +1200)]
MDL-39790 Add badges block to the course page
Eloy Lafuente (stronk7) [Tue, 4 Jun 2013 23:43:03 +0000 (01:43 +0200)]
Merge branch 'wip-MDL-21097-master' of git://github.com/marinaglancy/moodle
Eloy Lafuente (stronk7) [Tue, 4 Jun 2013 19:45:15 +0000 (21:45 +0200)]
MDL-39723 prevent update_courses() bad habits.
All the external functions end calling require_login() that is
always in charge of setting the $COURSE global. This is not a
problem, but in the case of core_course_external::update_courses()
testing, where we are, in the same "request", both setting and getting
the $COURSE information and it's clearly outdated, so the test fails.
Alternative solution would be to modify the external function to ensure
that, after updating a course, $COURSE is also updated with the changes
but it does not seem to be necessary for "normal" usage (both UI/WS POVs).
Eloy Lafuente (stronk7) [Tue, 4 Jun 2013 15:47:45 +0000 (17:47 +0200)]
Merge branch 'MDL-39723-master' of git://github.com/sammarshallou/moodle
Dan Poltawski [Tue, 4 Jun 2013 07:53:56 +0000 (15:53 +0800)]
Merge branch 'MDL-39945' of git://github.com/timhunt/moodle
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
AMOS bot [Tue, 4 Jun 2013 00:46:34 +0000 (00:46 +0000)]
Automatically generated installer lang files
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.
Petr Škoda [Sun, 2 Jun 2013 11:30:02 +0000 (13:30 +0200)]
MDL-39416 do not try to get detailed perflog info before PAGE int
Petr Škoda [Sun, 2 Jun 2013 08:35:15 +0000 (10:35 +0200)]
MDL-39588 require MOODLELIB Oracle package
Previously it was kind of optional, but it is now required. We also attempt to install it automatically now.
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.
Mary Evans [Sat, 1 Jun 2013 17:42:09 +0000 (18:42 +0100)]
MDL-39977 theme_bootstrapbase: Changes the way Clean theme's login takes its navbar styles from Bootstrapbase.
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:25:27 +0000 (21:25 +0200)]
MDL-39503 tell robots to not index login and signup page
This should partially prevent people from googling moodle sites that allow signup. Please note you can not use login block if because it would still disclose the signup link.
Petr Škoda [Fri, 31 May 2013 19:09:05 +0000 (21:09 +0200)]
MDL-39882 add required behat settings to config-dist
Dan Poltawski [Fri, 31 May 2013 05:11:07 +0000 (13:11 +0800)]
MDL-39968 bootstrapbase: uses non-standard browser sniffing
Also theme_clean does the same sniffing, but is not necessary as its
included by bootstrapbase
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.
Dan Poltawski [Thu, 28 Mar 2013 03:44:32 +0000 (11:44 +0800)]
MDL-38731 course: split course group settings header
Allow translators to translate the heading differently.
AMOS BEGIN
CPY [groups,group],[groupsettingsheader,group]
AMOS END
Dan Poltawski [Fri, 24 May 2013 07:16:57 +0000 (15:16 +0800)]
MDL-37332 portfolio: don't add double slashes
get_filepath() always returns trailing slash.
This breaks windows export - thanks to Jason Platts
Marina Glancy [Fri, 31 May 2013 03:17:02 +0000 (13:17 +1000)]
MDL-21097 Allow user to change current section if he does not have any other manageing capability
Marina Glancy [Thu, 30 May 2013 00:18:00 +0000 (10:18 +1000)]
MDL-21097 Correctly check capabilities for course settings items
- Make sure that items in course settings (and frontpage settings) are shown depending on user capabilities
- Make sure user is able to turn editing on on the page even if he has only limited number of seciton/modules managing capabilities
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
AMOS bot [Fri, 31 May 2013 00:43:05 +0000 (00:43 +0000)]
Automatically generated installer lang files
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
Tim Hunt [Thu, 30 May 2013 18:18:36 +0000 (19:18 +0100)]
MDL-39945 qtype multichoice was not comparing blank responses correctly.
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
sam marshall [Fri, 17 May 2013 15:43:51 +0000 (16:43 +0100)]
MDL-39723 Remove unnecessary queries for COURSE, SITE
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