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.
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
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
Eloy Lafuente (stronk7) [Wed, 22 May 2013 02:09:10 +0000 (04:09 +0200)]
MDL-36482 Fix slipped error, thanks Petr!
Damyon Wiese [Wed, 22 May 2013 01:06:29 +0000 (09:06 +0800)]
Merge branch 'MDL-39697' of git://github.com/lazydaisy/moodle
Eloy Lafuente (stronk7) [Wed, 22 May 2013 00:22:55 +0000 (02:22 +0200)]
Merge branch 'wip-MDL-39177-master' of git://github.com/marinaglancy/moodle
Dan Poltawski [Tue, 21 May 2013 04:30:11 +0000 (12:30 +0800)]
Merge branch 'wip-MDL-39720-master' of git://github.com/marinaglancy/moodle
Dan Poltawski [Tue, 21 May 2013 02:58:37 +0000 (10:58 +0800)]
Merge branch 'MDL-39753' of git://github.com/stronk7/moodle
Dan Poltawski [Tue, 21 May 2013 02:52:44 +0000 (10:52 +0800)]
MDL-39323 auth_ldap: fix savepoint version
Dan Poltawski [Tue, 21 May 2013 02:43:34 +0000 (10:43 +0800)]
Merge branch 'wip_master_mdl-39323_fix_start_tls_undefined_notice' of https://github.com/iarenaza/moodle
AMOS bot [Tue, 21 May 2013 00:38:13 +0000 (00:38 +0000)]
Automatically generated installer lang files
Eloy Lafuente (stronk7) [Tue, 21 May 2013 00:25:41 +0000 (02:25 +0200)]
Merge branch 'MDL-36482_master' of https://github.com/mr-russ/moodle
Marina Glancy [Mon, 20 May 2013 23:50:07 +0000 (09:50 +1000)]
MDL-39720 added missing setType() in moodleform
Eloy Lafuente (stronk7) [Mon, 20 May 2013 23:46:45 +0000 (01:46 +0200)]
Merge branch 'MDL-39758_master' of git://github.com/lazydaisy/moodle
Eloy Lafuente (stronk7) [Mon, 20 May 2013 22:59:42 +0000 (00:59 +0200)]
Merge branch 'MDL-39638_master' of git://github.com/dmonllao/moodle
Eloy Lafuente (stronk7) [Mon, 20 May 2013 22:54:08 +0000 (00:54 +0200)]
Merge branch 'MDL-26120' of https://github.com/jacks92/moodle
Eloy Lafuente (stronk7) [Mon, 20 May 2013 22:44:05 +0000 (00:44 +0200)]
Merge branch 'MDL-39717_master' of git://github.com/dmonllao/moodle
Eloy Lafuente (stronk7) [Mon, 20 May 2013 17:05:14 +0000 (19:05 +0200)]
Merge branch 'MDL-31209-master' of git://github.com/mouneyrac/moodle
Eloy Lafuente (stronk7) [Mon, 20 May 2013 13:33:19 +0000 (15:33 +0200)]
MDL-39753 Add 2.5.0 upgrade line
Mary Evans [Mon, 20 May 2013 11:42:43 +0000 (12:42 +0100)]
MDL-39758 theme_bootatrapbase: Added missing layout/embedded.php.
Iñaki Arenaza [Wed, 24 Apr 2013 21:31:48 +0000 (23:31 +0200)]
MDL-39323 Make sure start_tls config value is defined
This has been introduced in 2.5, so when upgrading from previous versions
make sure we set a default value. Otherwise, we get a notice about it
being undefined when we try to use it (and we always try to use it!).
Dan Poltawski [Mon, 20 May 2013 09:58:09 +0000 (17:58 +0800)]
Merge branch 'w18_MDL-39374_m26_folderlog' of git://github.com/skodak/moodle
Damyon Wiese [Mon, 20 May 2013 08:11:59 +0000 (16:11 +0800)]
Merge branch 'MDL-38498-master' of git://github.com/FMCorz/moodle
Dan Poltawski [Mon, 20 May 2013 08:08:51 +0000 (16:08 +0800)]
Merge branch 'MDL-39719-master' of git://github.com/FMCorz/moodle
Frederic Massart [Thu, 2 May 2013 06:49:13 +0000 (14:49 +0800)]
MDL-38498 repository: Unit tests for repository::check_capability()
Dan Poltawski [Mon, 20 May 2013 07:46:49 +0000 (15:46 +0800)]
Merge branch 'MDL-27748' of git://github.com/timhunt/moodle
Dan Poltawski [Mon, 20 May 2013 07:28:31 +0000 (15:28 +0800)]
Merge branch 'MDL-39728' of git://github.com/timhunt/moodle
Dan Poltawski [Mon, 20 May 2013 04:42:17 +0000 (12:42 +0800)]
Merge branch 'wip-MDL-36020-master' of git://github.com/troylee/moodle
Damyon Wiese [Mon, 20 May 2013 04:12:23 +0000 (12:12 +0800)]
Merge branch 'MDL-39363-master' of git://github.com/ankitagarwal/moodle
Marina Glancy [Mon, 20 May 2013 04:09:11 +0000 (14:09 +1000)]
MDL-39177 Updating userid when file is overwritten
Damyon Wiese [Mon, 20 May 2013 04:03:36 +0000 (12:03 +0800)]
Merge branch 'MDL-39528_master' of git://github.com/dmonllao/moodle
Dan Poltawski [Mon, 20 May 2013 04:01:01 +0000 (12:01 +0800)]
Merge branch 'MDL-39630_master' of git://github.com/lazydaisy/moodle
Dan Poltawski [Mon, 20 May 2013 03:47:50 +0000 (11:47 +0800)]
Merge branch 'MDL-39198_master' of git://github.com/kordan/moodle
Dan Poltawski [Mon, 20 May 2013 02:25:08 +0000 (10:25 +0800)]
Merge branch 'MDL-38369-master' of git://github.com/FMCorz/moodle
Frederic Massart [Mon, 20 May 2013 01:15:01 +0000 (09:15 +0800)]
MDL-39719 course: Pointing to wrong category string in requests
Tim Hunt [Sun, 19 May 2013 22:39:23 +0000 (23:39 +0100)]
MDL-27748 question: grade options should be localised.
question_bank::fraction_options should use format_float to display
decimal pionts correctly.
AMOS bot [Sun, 19 May 2013 00:37:17 +0000 (00:37 +0000)]
Automatically generated installer lang files
Tim Hunt [Sat, 18 May 2013 08:16:05 +0000 (09:16 +0100)]
MDL-39728 List all the classes in question/type/questionbase.php
This should make it easier for people to understand the type hierarchy.
AMOS bot [Sat, 18 May 2013 00:41:31 +0000 (00:41 +0000)]
Automatically generated installer lang files
Marina Glancy [Tue, 14 May 2013 03:21:02 +0000 (13:21 +1000)]
MDL-39177 More comments about confusing files.source field
Marina Glancy [Mon, 13 May 2013 11:20:54 +0000 (21:20 +1000)]
MDL-39177 New function file_storage::get_unused_dirname()
Marina Glancy [Mon, 13 May 2013 10:15:32 +0000 (20:15 +1000)]
MDL-39177 Ensure files are overwritten correctly on unzip
Marina Glancy [Mon, 13 May 2013 05:48:01 +0000 (15:48 +1000)]
MDL-39177 Perform all checks on draftfile area before saving the files
Marina Glancy [Mon, 13 May 2013 05:31:15 +0000 (15:31 +1000)]
MDL-39177 Remove code duplication
Marina Glancy [Mon, 13 May 2013 05:12:20 +0000 (15:12 +1000)]
MDL-39177 Update file in filearea only if original is present
Now when file was deleted in filemanager and new file with the same file was uploaded the references will be converted to copies exactly like UI warns in filemanager.
Also do not delete original information from draftfiles.
Marina Glancy [Wed, 8 May 2013 12:22:53 +0000 (22:22 +1000)]
MDL-39177 Discard file origin when moving/renaming a file in filemanager
Created one function that handles file update to be used from both JS and nonJS filepicker
Marina Glancy [Wed, 8 May 2013 04:37:29 +0000 (14:37 +1000)]
MDL-39177 Original info is not preserved when overwriting a file in filemanager
original file location is used by filemanager to indicate that file is a source of reference and file the list of referencing files
Marina Glancy [Wed, 8 May 2013 02:48:54 +0000 (12:48 +1000)]
MDL-39177 File reference is not updated when overwriting the file
Marina Glancy [Tue, 7 May 2013 05:16:48 +0000 (15:16 +1000)]
MDL-33719 When overwriting a file the filemanager is not refreshed
Damyon Wiese [Fri, 17 May 2013 03:36:09 +0000 (11:36 +0800)]
Merge branch 'MDL-28250-25' of git://github.com/danpoltawski/moodle
Conflicts:
version.php
David Monllao [Fri, 17 May 2013 03:24:21 +0000 (11:24 +0800)]
MDL-39717 behat: Removing unstable steps and scenarios
David Monllao [Fri, 17 May 2013 03:23:05 +0000 (11:23 +0800)]
MDL-39717 behat: Add info to experimental steps definitions
JS modal dialogs and drag & drop should be
considered experimental as the steps are not
working as expected in all OS/browser combinations.
Damyon Wiese [Thu, 16 May 2013 07:53:48 +0000 (15:53 +0800)]
Merge branch 'w18_MDL-39678_m26_yui' of git://github.com/skodak/moodle
David Monllao [Mon, 13 May 2013 07:13:00 +0000 (15:13 +0800)]
MDL-39638 behat: New step to collapse nodes based on the expand nodes
Also updating steps with a collapse behaviour.
David Monllao [Tue, 14 May 2013 06:05:32 +0000 (14:05 +0800)]
MDL-39528 behat: Avoid modal window suite failure
Catching JS alerts/confirms exceptions and
auto-accepting them before each test run to
avoid chained scenarios failures.
AMOS bot [Thu, 16 May 2013 00:41:17 +0000 (00:41 +0000)]
Automatically generated installer lang files
Mary Evans [Wed, 15 May 2013 23:57:40 +0000 (00:57 +0100)]
MDL-39697 theme_bootstrapbase: Updated $THEME->layouts in config.php to match those in Base theme.
Petr Škoda [Wed, 15 May 2013 19:57:23 +0000 (21:57 +0200)]
MDL-39678 fix YUI
20130515 vulnerability
Petr Škoda [Sun, 28 Apr 2013 07:30:29 +0000 (09:30 +0200)]
MDL-39374 log only real folder edits
Credit goes to Florian Zillner, thanks.
Dan Poltawski [Wed, 15 May 2013 09:44:37 +0000 (10:44 +0100)]
MDL-28250 license: upgrade old versions of cc-nc
The url was incorectly defined in previous versions
Wojciech Galiszek [Sun, 7 Apr 2013 15:03:53 +0000 (17:03 +0200)]
MDL-28250 license: Correct cc-nc url
AMOS bot [Wed, 15 May 2013 00:39:20 +0000 (00:39 +0000)]
Automatically generated installer lang files
Eloy Lafuente (stronk7) [Tue, 14 May 2013 10:07:02 +0000 (12:07 +0200)]
NOBUG: Adjust backup release for 2.6dev
Eloy Lafuente (stronk7) [Tue, 14 May 2013 09:32:14 +0000 (11:32 +0200)]
weekly release 2.6dev
Eloy Lafuente (stronk7) [Tue, 14 May 2013 09:27:22 +0000 (11:27 +0200)]
Moodle release 2.5
Eloy Lafuente (stronk7) [Tue, 14 May 2013 09:18:14 +0000 (11:18 +0200)]
Merge branch 'install_master' of git://git.moodle.cz/moodle-install
Jerome Mouneyrac [Tue, 14 May 2013 07:40:16 +0000 (15:40 +0800)]
MDL-31209 web service error message: Indication about the service not containg the web service function is confusing
Damyon Wiese [Tue, 14 May 2013 07:25:46 +0000 (15:25 +0800)]
Merge branch 'MDL-39664' of git://github.com/nebgor/moodle
Damyon Wiese [Tue, 14 May 2013 07:08:25 +0000 (15:08 +0800)]
Merge branch 'MDL-39641-master-int' of git://github.com/FMCorz/moodle
Aparup Banerjee [Tue, 14 May 2013 07:02:24 +0000 (15:02 +0800)]
MDL-39664 fixed up is_array test (reverting the whole line basically prior to MDL-39664 changes)
Damyon Wiese [Tue, 14 May 2013 06:16:05 +0000 (14:16 +0800)]
Merge branch 'MDL-39191_master' of git://github.com/kordan/moodle
Damyon Wiese [Tue, 14 May 2013 05:33:25 +0000 (13:33 +0800)]
Merge branch 'MDL-39664' of git://github.com/nebgor/moodle
Aparup Banerjee [Tue, 14 May 2013 05:23:14 +0000 (13:23 +0800)]
MDL-39664 added http redirect limitation to 5. rephrased certificate use in message log.
Aparup Banerjee [Tue, 14 May 2013 04:34:24 +0000 (12:34 +0800)]
MDL-39664 mdeploy follows redirects now.
Aparup Banerjee [Tue, 14 May 2013 03:56:05 +0000 (11:56 +0800)]
MDL-39664 allowed mdeploy to follow redirection (http 302) and added some extra logging info
Troy Lee [Thu, 9 May 2013 02:13:46 +0000 (10:13 +0800)]
MDL-36020 overview/report: fix quiz regrade session lock
Frederic Massart [Fri, 10 May 2013 04:42:02 +0000 (12:42 +0800)]
MDL-39601 user: Missing setType in user filters
AMOS bot [Tue, 14 May 2013 00:37:43 +0000 (00:37 +0000)]
Automatically generated installer lang files
AMOS bot [Tue, 14 May 2013 00:37:41 +0000 (00:37 +0000)]
Merge branch 'master' into install_master
Sam Hemelryk [Mon, 13 May 2013 21:15:54 +0000 (09:15 +1200)]
Merge branch 'MDL-39573-master' of git://github.com/damyon/moodle
Dan Poltawski [Mon, 13 May 2013 12:51:12 +0000 (13:51 +0100)]
Merge branch 'MDL-39599-master-int' of git://github.com/FMCorz/moodle
Dan Poltawski [Mon, 13 May 2013 12:09:14 +0000 (13:09 +0100)]
Merge branch 'MDL-39579-master-int' of git://github.com/FMCorz/moodle
Eloy Lafuente (stronk7) [Mon, 13 May 2013 10:40:21 +0000 (12:40 +0200)]
on demand release 2.5rc1+
Eloy Lafuente (stronk7) [Mon, 13 May 2013 10:07:55 +0000 (12:07 +0200)]
Merge branch 'MDL-39642-en_fix' of git://github.com/mudrd8mz/moodle
Conflicts:
lang/en/badges.php
Frederic Massart [Thu, 2 May 2013 04:02:17 +0000 (12:02 +0800)]
MDL-38369 repository: Remove output before redirect
Frederic Massart [Mon, 13 May 2013 09:09:00 +0000 (17:09 +0800)]
MDL-39641 repository: Correct check for uniqueness of the name
Damyon Wiese [Mon, 13 May 2013 08:43:49 +0000 (16:43 +0800)]
Merge branch 'MDL-39604-master-int' of git://github.com/FMCorz/moodle
Helen Foster [Mon, 13 May 2013 07:52:53 +0000 (09:52 +0200)]
MDL-39642 Merge English strings from the en_fix language pack
Damyon Wiese [Mon, 13 May 2013 07:10:49 +0000 (15:10 +0800)]
Merge branch 'MDL-39189_master' of git://github.com/totara/openbadges
Damyon Wiese [Mon, 13 May 2013 06:59:37 +0000 (14:59 +0800)]
Merge branch 'MDL-39209_master' of git://github.com/totara/openbadges
Damyon Wiese [Thu, 9 May 2013 08:55:59 +0000 (16:55 +0800)]
MDL-39573 theme: bootstrap - always show pre and post regions when editing
Sam Hemelryk [Sun, 12 May 2013 22:17:04 +0000 (10:17 +1200)]
MDL-39526 cache: purged when upgrade finished
Mary Evans [Thu, 9 May 2013 23:00:37 +0000 (00:00 +0100)]
MDL-39595 theme_bootstrapbase: Renamed renderers/core.php to renderers/core_renderer.php
Damyon Wiese [Mon, 13 May 2013 06:05:30 +0000 (14:05 +0800)]
Merge branch 'MDL-39581_master' of https://github.com/markn86/moodle
Damyon Wiese [Mon, 13 May 2013 05:43:07 +0000 (13:43 +0800)]
Merge branch 'MDL-39606-master-int' of git://github.com/FMCorz/moodle
Damyon Wiese [Mon, 13 May 2013 05:28:27 +0000 (13:28 +0800)]
Merge branch 'MDL-39609-master-int' of git://github.com/FMCorz/moodle
Damyon Wiese [Mon, 13 May 2013 05:22:32 +0000 (13:22 +0800)]
Merge branch 'MDL-39611-master-int' of git://github.com/FMCorz/moodle
