Marina Glancy [Fri, 14 Jun 2013 02:53:23 +0000 (12:53 +1000)]
Merge branch 'install_master' of git://git.moodle.cz/moodle-install
Damyon Wiese [Wed, 12 Jun 2013 15:09:59 +0000 (23:09 +0800)]
MDL-37621 assign: Fix for DB error on update.
This properly handles the case when the teamsubmissiongroupingid is disabled.
Dan Poltawski [Thu, 13 Jun 2013 06:22:59 +0000 (14:22 +0800)]
MDL-39824: theme_bootstrap: initalise array before use
This causes warnings when no navigation items are returned.
Also fixed some bad whitespace.
Dan Poltawski [Thu, 13 Jun 2013 05:56:11 +0000 (13:56 +0800)]
Dan Poltawski [Thu, 13 Jun 2013 05:56:09 +0000 (13:56 +0800)]
Revert "MDL-39832 Files: Fixed ETag format according with RFC2616."
This reverts commit
9ab37ae3e07f54bc08644f8462d94bed68ff6c9b.
Damyon Wiese [Thu, 13 Jun 2013 04:46:45 +0000 (12:46 +0800)]
MDL-37459 admin: Set the default setting flags on a new install.
Make sure the default flags for all settings are saved on a new install.
Dan Poltawski [Thu, 13 Jun 2013 02:15:25 +0000 (10:15 +0800)]
Merge branch 'MDL-38359-master' of git://github.com/danmarsden/moodle
Damyon Wiese [Wed, 12 Jun 2013 15:03:43 +0000 (23:03 +0800)]
MDL-37459 admin: Fix for error on updating a locked checkbox
Changed the way apply_admin_locked_flags gets the current value for the field.
The old way was plain wrong (looking at getValue from the quickform element).
AMOS bot [Thu, 13 Jun 2013 00:41:25 +0000 (00:41 +0000)]
Automatically generated installer lang files
Dan Marsden [Wed, 12 Jun 2013 09:29:39 +0000 (21:29 +1200)]
MDL-38359: assign - prevent loss of associated marker
certain markers don't see the marker allocation column.
Dan Marsden [Wed, 12 Jun 2013 09:16:12 +0000 (21:16 +1200)]
MDL-38359: assign - fix some issues with releasing grades
Dan Poltawski [Wed, 12 Jun 2013 08:49:29 +0000 (16:49 +0800)]
Merge branch 'master_MDL-39239' of git://github.com/danmarsden/moodle
Dan Poltawski [Wed, 12 Jun 2013 08:47:38 +0000 (16:47 +0800)]
Merge branch 'MDL-38359-master' of git://github.com/danmarsden/moodle
Dan Marsden [Wed, 12 Jun 2013 08:18:07 +0000 (20:18 +1200)]
MDL-38359: assign - remove some old debug code.
Dan Poltawski [Wed, 12 Jun 2013 08:08:50 +0000 (16:08 +0800)]
Revert "MDL-39489 behat: Updating to 2.6 moodlehq/behat-extension tag"
Wasn't ready for the prime time
This reverts commit
ca96789d77b34bd733e6c491ba79e3ab21d7e86f.
Marina Glancy [Wed, 12 Jun 2013 07:22:22 +0000 (17:22 +1000)]
Merge branch 'MDL-37621-master-fix2' of git://github.com/damyon/moodle
Marina Glancy [Wed, 12 Jun 2013 06:53:49 +0000 (16:53 +1000)]
Merge branch 'MDL-37459-master-fix2' of git://github.com/damyon/moodle
Damyon Wiese [Wed, 12 Jun 2013 05:45:48 +0000 (13:45 +0800)]
MDL-37621 assign: Improvements to default settings.
Added a new adminsetting_configempty type so that module settings
which can have no sensible defaults can still be configured as advanced.
Damyon Wiese [Wed, 12 Jun 2013 05:05:56 +0000 (13:05 +0800)]
MDL-37621 assign: Improvements to assignment default settings.
Remove locked flag from datetime settings.
Change requiresubmissionstatement to use the new admin flags instead of it's previous custom behaviour.
This means there is a language change:
AMOS BEGIN
CPY [requiresubmissionstatementassignment_help,mod_assign],[requiresubmissionstatement_help,mod_assign]
AMOS END
Damyon Wiese [Wed, 12 Jun 2013 06:10:55 +0000 (14:10 +0800)]
MDL-37459 admin: Code improvements for admin defaults.
Split apply_admin_defaults_after_data so the defaults are set before
set_data is called.
Change function from private to protected.
Change check for if module for is an add or an update.
Dan Poltawski [Wed, 12 Jun 2013 05:56:39 +0000 (13:56 +0800)]
Merge branch 'MDL-39472-master' of git://github.com/sammarshallou/moodle
Damyon Wiese [Wed, 12 Jun 2013 04:28:47 +0000 (12:28 +0800)]
MDL-37459 admin: Change the behaviour of locked admin settings.
Now the defaults for settings will never force changes to the module update
form, and settings will only be locked if their value matches the admin default.
Sam Hemelryk [Wed, 12 Jun 2013 02:22:01 +0000 (14:22 +1200)]
Revert "MDL-38555 forms: Prevent same data submission multiple times."
This reverts commit
9f2f313e9f7c88eab154450de394c2451f530f58.
Damyon Wiese [Wed, 12 Jun 2013 02:06:06 +0000 (10:06 +0800)]
MDL-37459 admin: Default styles for flags for admin settings
Dan Poltawski [Wed, 12 Jun 2013 01:33:23 +0000 (09:33 +0800)]
Merge branch 'MDL-39773_b' of git://github.com/rwijaya/moodle
Conflicts:
theme/bootstrapbase/style/moodle.css
Sam Hemelryk [Tue, 11 Jun 2013 23:36:40 +0000 (11:36 +1200)]
Merge branch 'MDL-38555-master' of https://github.com/lucisgit/moodle
Sam Hemelryk [Tue, 11 Jun 2013 22:21:45 +0000 (10:21 +1200)]
Merge branch 'wip-MDL-39040-master' of git://github.com/abgreeve/moodle
Sam Hemelryk [Tue, 11 Jun 2013 22:14:14 +0000 (10:14 +1200)]
Merge branch 'MDL-35666-master' of git://github.com/mouneyrac/moodle
Sam Hemelryk [Tue, 11 Jun 2013 21:58:55 +0000 (09:58 +1200)]
MDL-39629 theme_formal_white: added missing pluginfile func
Sam Hemelryk [Tue, 11 Jun 2013 21:48:56 +0000 (09:48 +1200)]
Merge branch 'MDL-39629_master' of git://github.com/kordan/moodle
Dan Marsden [Mon, 13 May 2013 22:37:18 +0000 (10:37 +1200)]
MDL-39239 SCORM: drop old imsrepository code - it doesn't work anyway.
Sam Hemelryk [Tue, 11 Jun 2013 21:38:38 +0000 (09:38 +1200)]
Merge branch 'MDL-30320' of git://github.com/timhunt/moodle
Sam Hemelryk [Tue, 11 Jun 2013 21:34:06 +0000 (09:34 +1200)]
Merge branch 'master_MDL-38019' of git://github.com/andyjdavis/moodle
Sam Hemelryk [Tue, 11 Jun 2013 21:08:55 +0000 (09:08 +1200)]
Merge branch 'MDL-39967-master' of git://github.com/danpoltawski/moodle
Sam Hemelryk [Tue, 11 Jun 2013 21:07:01 +0000 (09:07 +1200)]
Merge branch 'MDL-39940-master' of git://github.com/danpoltawski/moodle
Sam Hemelryk [Tue, 11 Jun 2013 21:04:22 +0000 (09:04 +1200)]
Merge branch 'MDL-39964-master' of git://github.com/danpoltawski/moodle
Conflicts:
lib/deprecatedlib.php
Sam Hemelryk [Tue, 11 Jun 2013 21:00:24 +0000 (09:00 +1200)]
Merge branch 'MDL-25901-master' of git://github.com/danpoltawski/moodle
Sam Hemelryk [Tue, 11 Jun 2013 20:54:09 +0000 (08:54 +1200)]
Merge branch 'w24_MDL-38109_m26_pluginlist' of git://github.com/skodak/moodle
Sam Hemelryk [Tue, 11 Jun 2013 20:51:59 +0000 (08:51 +1200)]
Merge branch 'wip-MDL-39798_master' of git://github.com/gjb2048/moodle
Conflicts:
theme/bootstrapbase/style/moodle.css
Sam Hemelryk [Tue, 11 Jun 2013 20:48:00 +0000 (08:48 +1200)]
Merge branch 'wip-MDL-39820_master_2' of git://github.com/gjb2048/moodle
Conflicts:
theme/bootstrapbase/style/moodle.css
Petr Škoda [Fri, 7 Jun 2013 15:26:01 +0000 (17:26 +0200)]
MDL-38109 use always get_plugin_list() to get list of plugins
get_list_of_plugins() is NOT intended for real plugins, only plugin like directories.
Damyon Wiese [Tue, 11 Jun 2013 08:20:55 +0000 (16:20 +0800)]
MDL-38359 courselib: Fix unit tests
The courselib tests have hardcoded test data sets for forum and assign
modules that need to be updated every time we add a new feature.
Dan Poltawski [Tue, 11 Jun 2013 08:00:18 +0000 (16:00 +0800)]
Merge branch 'wip-MDL-40087_master' of git://github.com/gjb2048/moodle
Conflicts:
theme/bootstrapbase/style/moodle.css
Dan Poltawski [Tue, 11 Jun 2013 07:41:11 +0000 (15:41 +0800)]
Merge branch 'MDL-39489_master' of git://github.com/dmonllao/moodle
Dan Poltawski [Tue, 11 Jun 2013 07:38:37 +0000 (15:38 +0800)]
Merge branch 'MDL-39155' of https://github.com/jacks92/moodle
Dan Poltawski [Tue, 11 Jun 2013 07:34:48 +0000 (15:34 +0800)]
Merge branch 'wip-MDL-40100-m26' of git://github.com/samhemelryk/moodle
Dan Poltawski [Tue, 11 Jun 2013 07:31:20 +0000 (15:31 +0800)]
Merge branch 'MDL-38359-master' of git://github.com/damyon/moodle
Damyon Wiese [Tue, 11 Jun 2013 07:25:01 +0000 (15:25 +0800)]
MDL-38359 assign: Set header field name so it works with shortforms
Two forms were adding headers with empty names - fixed.
Damyon Wiese [Tue, 11 Jun 2013 06:37:23 +0000 (14:37 +0800)]
MDL-37621 assign: Fix php error on create new assign
I removed one too many defaults in the previous patch. This patch
puts back the default for teamsubmissiongroupingid.
Damyon Wiese [Tue, 11 Jun 2013 06:26:33 +0000 (14:26 +0800)]
MDL-38359 assign: Add support for admin defaults for marking workflow settings
Dan Marsden [Mon, 1 Apr 2013 22:59:53 +0000 (11:59 +1300)]
MDL-38359 Marking Allocation and Workflow code
based on Marking workflow code from Damyon Wiese
Dan Poltawski [Tue, 11 Jun 2013 06:09:12 +0000 (14:09 +0800)]
Merge branch 'MDL-39449' of git://github.com/timhunt/moodle
Marina Glancy [Tue, 11 Jun 2013 05:57:14 +0000 (15:57 +1000)]
Merge branch 'MDL-37621-master' of git://github.com/damyon/moodle
Sam Hemelryk [Tue, 11 Jun 2013 05:36:18 +0000 (17:36 +1200)]
Merge branch 'MDL-32533-master' of git://github.com/danpoltawski/moodle
Damyon Wiese [Wed, 30 Jan 2013 06:50:53 +0000 (14:50 +0800)]
MDL-37621 Assign: Apply admin defaults to all module settings. Added the 3 date based settings.
Version bump for new settings.
AMOS BEGIN
MOV [defaultplugins,mod_assign],[defaultsettings,mod_assign]
MOV [defaultplugins_help,mod_assign],[defaultsettings_help,mod_assign]
AMOS END
Marina Glancy [Tue, 11 Jun 2013 05:32:27 +0000 (15:32 +1000)]
Merge branch 'MDL-37459-master-fix' of https://github.com/damyon/moodle
Sam Hemelryk [Tue, 11 Jun 2013 05:31:51 +0000 (17:31 +1200)]
Merge branch 'MDL-26925-master' of git://github.com/danpoltawski/moodle
Damyon Wiese [Tue, 11 Jun 2013 05:25:28 +0000 (13:25 +0800)]
MDL-37459: Fix unprintable chars in wierd commit
Somehow some unprintable chars made it into the last commit.
Removing them all...
Sam Hemelryk [Tue, 11 Jun 2013 05:10:36 +0000 (17:10 +1200)]
Revert "MDL-37490 mod_assign: Add setting to show the due date on the course page."
This reverts commit
ef8a6dfb33c572beb0982818e9380476d6e636e2.
Sam Hemelryk [Tue, 11 Jun 2013 05:10:30 +0000 (17:10 +1200)]
Revert "MDL-37490 Assign: Minor patch cleanup"
This reverts commit
06b9df11452fa78832fda6c6c188b561008bd8dd.
Sam Hemelryk [Tue, 11 Jun 2013 05:07:14 +0000 (17:07 +1200)]
Merge branch 'MDL-22390' of git://github.com/timhunt/moodle
Dan Poltawski [Tue, 11 Jun 2013 05:05:25 +0000 (13:05 +0800)]
Merge branch 'MDL-40010_master' of https://github.com/markn86/moodle
Marina Glancy [Tue, 11 Jun 2013 04:57:34 +0000 (14:57 +1000)]
Merge branch 'MDL-37459-master' of https://github.com/damyon/moodle
Damyon Wiese [Thu, 10 Jan 2013 07:10:02 +0000 (15:10 +0800)]
MDL-37459 admin: Admin settings flags
Make "Advanced" and "Lockable" flags for any admin setting.
Dan Poltawski [Tue, 11 Jun 2013 04:54:24 +0000 (12:54 +0800)]
Merge branch 'm26_MDL-40002_ETag_value_must_be_a_quoted-string' of https://github.com/scara/moodle
Dan Poltawski [Tue, 11 Jun 2013 03:38:34 +0000 (11:38 +0800)]
Revert "MDL-26511 Images in Cloze multichoice"
This reverts commit
feec4f89417b13d87a464710b2479704cffbabdb.
Dan Poltawski [Tue, 11 Jun 2013 03:24:31 +0000 (11:24 +0800)]
Merge branch 'wip-MDL-39746-master' of git://github.com/phalacee/moodle
Conflicts:
theme/bootstrapbase/style/moodle.css
Sam Hemelryk [Tue, 11 Jun 2013 02:16:50 +0000 (14:16 +1200)]
Merge branch 'MDL-39490-format_rewrite_order' of git://github.com/mudrd8mz/moodle
Tim Lock [Mon, 10 Jun 2013 23:24:01 +0000 (08:54 +0930)]
MDL-40120: Fix get_course_records() which breaks in PSQL
Sam Hemelryk [Tue, 11 Jun 2013 01:32:36 +0000 (13:32 +1200)]
Merge branch 'wip-MDL-37490-m7' of git://github.com/gjb2048/moodle
Sam Hemelryk [Tue, 11 Jun 2013 00:26:55 +0000 (12:26 +1200)]
Merge branch 'MDL-39454-master' of git://github.com/sammarshallou/moodle
Sam Hemelryk [Mon, 10 Jun 2013 23:06:17 +0000 (11:06 +1200)]
Merge branch 'wip-mdl-28558' of git://github.com/rajeshtaneja/moodle
Sam Hemelryk [Mon, 10 Jun 2013 22:35:10 +0000 (10:35 +1200)]
Merge branch 'wip-mdl-33379' of git://github.com/rajeshtaneja/moodle
Conflicts:
lib/deprecatedlib.php
Sam Hemelryk [Mon, 10 Jun 2013 22:31:55 +0000 (10:31 +1200)]
Merge branch 'MDL-32898-master' of git://github.com/ankitagarwal/moodle
Sam Hemelryk [Mon, 10 Jun 2013 22:29:11 +0000 (10:29 +1200)]
Merge branch 'wip-mdl-34508' of git://github.com/rajeshtaneja/moodle
Dan Poltawski [Mon, 10 Jun 2013 08:19:56 +0000 (16:19 +0800)]
Merge branch 'MDL-39947' of https://github.com/aolley/moodle
Dan Poltawski [Mon, 10 Jun 2013 08:06:22 +0000 (16:06 +0800)]
Merge branch 'MDL-39338_master' of git://github.com/lazydaisy/moodle
Conflicts:
theme/bootstrapbase/style/moodle.css
Dan Poltawski [Mon, 10 Jun 2013 07:42:45 +0000 (15:42 +0800)]
Merge branch 'm26_MDL-39832_Fix_Chrome_Issues_ETag_XSendfile' of https://github.com/scara/moodle
Dan Poltawski [Mon, 10 Jun 2013 07:28:17 +0000 (15:28 +0800)]
Merge branch 'wip-mdl-39639' of git://github.com/rajeshtaneja/moodle
Dan Poltawski [Mon, 10 Jun 2013 07:00:08 +0000 (15:00 +0800)]
Merge branch 'MDL-40018_master' of git://github.com/lazydaisy/moodle
Dan Poltawski [Mon, 10 Jun 2013 06:57:48 +0000 (14:57 +0800)]
Merge branch 'MDL-40013_master' of git://github.com/oasychev/moodle
Dan Poltawski [Mon, 10 Jun 2013 06:41:20 +0000 (14:41 +0800)]
Merge branch 'MDL-40080-unused-hub-strings' of git://github.com/mudrd8mz/moodle
Dan Poltawski [Mon, 10 Jun 2013 06:25:03 +0000 (14:25 +0800)]
Merge branch 'MDL-40008_master' of https://github.com/markn86/moodle
Dan Poltawski [Mon, 10 Jun 2013 05:12:11 +0000 (13:12 +0800)]
Merge branch 'w24_MDL-39096_m26_obfuscate' of git://github.com/skodak/moodle
Dan Poltawski [Mon, 10 Jun 2013 04:16:37 +0000 (12:16 +0800)]
Merge branch 'w24_MDL-28394_m26_enrolrestore' of git://github.com/skodak/moodle
Dan Poltawski [Mon, 10 Jun 2013 04:09:47 +0000 (12:09 +0800)]
Merge branch 'master_MDL-37968' of git://github.com/danmarsden/moodle
Mary Evans [Wed, 5 Jun 2013 21:48:12 +0000 (22:48 +0100)]
MDL-39016 theme_bootstrapbase: Added login info and home link to footer in both boostrapbase & clean layout/general.php
Dan Poltawski [Mon, 10 Jun 2013 03:59:03 +0000 (11:59 +0800)]
Merge branch 'w24_MDL-37974_m26_manexpire' of git://github.com/skodak/moodle
Sam Hemelryk [Mon, 10 Jun 2013 03:55:14 +0000 (15:55 +1200)]
Merge branch 'MDL-40009_master' of https://github.com/markn86/moodle
Sam Hemelryk [Mon, 10 Jun 2013 03:49:04 +0000 (15:49 +1200)]
Merge branch 'w24_MDL-39549_m26_cohortsearch' of git://github.com/skodak/moodle
ppichet [Wed, 5 Jun 2013 03:59:11 +0000 (23:59 -0400)]
MDL-26511 Images in Cloze multichoice
vertical and horizontal answer and in feedback of all qtype answers
Sam Hemelryk [Mon, 10 Jun 2013 03:09:43 +0000 (15:09 +1200)]
Merge branch 'MDL-39971' of git://github.com/timhunt/moodle
Dan Poltawski [Mon, 10 Jun 2013 02:54:22 +0000 (10:54 +0800)]
Merge branch 'wip-MDL-39824-m26' of github.com/samhemelryk/moodle
Sam Hemelryk [Mon, 10 Jun 2013 02:48:21 +0000 (14:48 +1200)]
Merge branch 'MDL-39978' of git://github.com/timhunt/moodle
Sam Hemelryk [Mon, 10 Jun 2013 02:41:21 +0000 (14:41 +1200)]
Merge branch 'w24_MDL-32480_m26_imscp' of git://github.com/skodak/moodle
Sam Hemelryk [Mon, 10 Jun 2013 02:34:25 +0000 (14:34 +1200)]
MDL-39824 theme: tweaking upgrade note version
Sam Hemelryk [Mon, 10 Jun 2013 02:26:04 +0000 (14:26 +1200)]
Merge branch 'wip-MDL-39608-master' of git://github.com/phalacee/moodle
Conflicts:
theme/bootstrapbase/style/moodle.css
AMOS bot [Mon, 10 Jun 2013 00:39:08 +0000 (00:39 +0000)]
Automatically generated installer lang files
Sam Hemelryk [Mon, 10 Jun 2013 00:31:03 +0000 (12:31 +1200)]
Merge branch 'MDL-36090_log2' of git://github.com/andyjdavis/moodle
Sam Hemelryk [Mon, 10 Jun 2013 00:14:17 +0000 (12:14 +1200)]
Merge branch 'wip-MDL-40088-master' of git://github.com/marinaglancy/moodle
