mirror_php/moodle
1
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-01-31 12:45:04 +01:00
Code Issues Projects Releases Wiki Activity
61,700 Commits 36 Branches 519 Tags
Commit Graph

61700 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Damyon Wiese
7e815a6eac 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.
 2013-06-13 15:20:52 +10:00
Dan Poltawski
e3b472e82c Merge branch 'MDL-38359-master' of git://github.com/danmarsden/moodle 2013-06-13 10:15:25 +08:00
Damyon Wiese
54106942b3 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).
 2013-06-13 11:18:18 +10:00
Dan Marsden
8a309823f0 MDL-38359: assign - prevent loss of associated marker 
certain markers don't see the marker allocation column.
 2013-06-12 21:29:39 +12:00
Dan Marsden
24835a1292 MDL-38359: assign - fix some issues with releasing grades 2013-06-12 21:16:12 +12:00
Dan Poltawski
19c1e0b80a Merge branch 'master_MDL-39239' of git://github.com/danmarsden/moodle 2013-06-12 16:49:29 +08:00
Dan Poltawski
85937391e1 Merge branch 'MDL-38359-master' of git://github.com/danmarsden/moodle 2013-06-12 16:47:38 +08:00
Dan Marsden
b6d1b761a4 MDL-38359: assign - remove some old debug code. 2013-06-12 20:18:07 +12:00
Dan Poltawski
3d5f0a66e9 Revert "MDL-39489 behat: Updating to 2.6 moodlehq/behat-extension tag" 
Wasn't ready for the prime time

This reverts commit ca96789d77b34bd733e6c491ba79e3ab21d7e86f.
 2013-06-12 16:08:50 +08:00
Marina Glancy
8ea7d3a2db Merge branch 'MDL-37621-master-fix2' of git://github.com/damyon/moodle 2013-06-12 17:22:22 +10:00
Marina Glancy
128e9315d6 Merge branch 'MDL-37459-master-fix2' of git://github.com/damyon/moodle 2013-06-12 16:53:49 +10:00
Damyon Wiese
c7cd8d9c84 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.
 2013-06-12 14:20:02 +08:00
Damyon Wiese
de6a0a394b 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
 2013-06-12 14:19:52 +08:00
Damyon Wiese
c30371168f 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.
 2013-06-12 14:10:55 +08:00
Dan Poltawski
bdce4a9cca Merge branch 'MDL-39472-master' of git://github.com/sammarshallou/moodle 2013-06-12 13:56:39 +08:00
Damyon Wiese
fa358a83ad 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.
 2013-06-12 12:30:08 +08:00
Sam Hemelryk
c601027d8f Revert "MDL-38555 forms: Prevent same data submission multiple times." 
This reverts commit 9f2f313e9f7c88eab154450de394c2451f530f58.
 2013-06-12 14:22:01 +12:00
Damyon Wiese
459e3c88ca MDL-37459 admin: Default styles for flags for admin settings 2013-06-12 10:06:06 +08:00
Dan Poltawski
1899145c50 Merge branch 'MDL-39773_b' of git://github.com/rwijaya/moodle 
Conflicts:
	theme/bootstrapbase/style/moodle.css
 2013-06-12 09:33:23 +08:00
Sam Hemelryk
44df0d9aaa Merge branch 'MDL-38555-master' of https://github.com/lucisgit/moodle 2013-06-12 11:36:40 +12:00
Sam Hemelryk
e1e6c0dd4c Merge branch 'wip-MDL-39040-master' of git://github.com/abgreeve/moodle 2013-06-12 10:21:45 +12:00
Sam Hemelryk
aae402010b Merge branch 'MDL-35666-master' of git://github.com/mouneyrac/moodle 2013-06-12 10:14:14 +12:00
Sam Hemelryk
6e49802071 MDL-39629 theme_formal_white: added missing pluginfile func 2013-06-12 09:58:55 +12:00
Sam Hemelryk
ac547b717a Merge branch 'MDL-39629_master' of git://github.com/kordan/moodle 2013-06-12 09:48:56 +12:00
Dan Marsden
93c984a829 MDL-39239 SCORM: drop old imsrepository code - it doesn't work anyway. 2013-06-12 09:47:26 +12:00
Sam Hemelryk
ee4e6c04e2 Merge branch 'MDL-30320' of git://github.com/timhunt/moodle 2013-06-12 09:38:38 +12:00
Sam Hemelryk
5d24aff39f Merge branch 'master_MDL-38019' of git://github.com/andyjdavis/moodle 2013-06-12 09:34:06 +12:00
Sam Hemelryk
18a1f186db Merge branch 'MDL-39967-master' of git://github.com/danpoltawski/moodle 2013-06-12 09:08:55 +12:00
Sam Hemelryk
cc5468de0e Merge branch 'MDL-39940-master' of git://github.com/danpoltawski/moodle 2013-06-12 09:07:01 +12:00
Sam Hemelryk
7b50002304 Merge branch 'MDL-39964-master' of git://github.com/danpoltawski/moodle 
Conflicts:
	lib/deprecatedlib.php
 2013-06-12 09:04:22 +12:00
Sam Hemelryk
9439d0506c Merge branch 'MDL-25901-master' of git://github.com/danpoltawski/moodle 2013-06-12 09:00:24 +12:00
Sam Hemelryk
9ce7b61e62 Merge branch 'w24_MDL-38109_m26_pluginlist' of git://github.com/skodak/moodle 2013-06-12 08:54:09 +12:00
Sam Hemelryk
ec18f333bd Merge branch 'wip-MDL-39798_master' of git://github.com/gjb2048/moodle 
Conflicts:
	theme/bootstrapbase/style/moodle.css
 2013-06-12 08:51:59 +12:00
Sam Hemelryk
754fa10916 Merge branch 'wip-MDL-39820_master_2' of git://github.com/gjb2048/moodle 
Conflicts:
	theme/bootstrapbase/style/moodle.css
 2013-06-12 08:48:00 +12:00
Petr Škoda
a9cda870ba 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.
 2013-06-11 10:22:45 +02:00
Damyon Wiese
7f198356ef 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.
 2013-06-11 16:20:55 +08:00
Dan Poltawski
e2ac6a848b Merge branch 'wip-MDL-40087_master' of git://github.com/gjb2048/moodle 
Conflicts:
	theme/bootstrapbase/style/moodle.css
 2013-06-11 16:00:18 +08:00
Dan Poltawski
75eb51818c Merge branch 'MDL-39489_master' of git://github.com/dmonllao/moodle 2013-06-11 15:41:11 +08:00
Dan Poltawski
2504dfd61d Merge branch 'MDL-39155' of https://github.com/jacks92/moodle 2013-06-11 15:38:37 +08:00
Dan Poltawski
f7ec3b43a7 Merge branch 'wip-MDL-40100-m26' of git://github.com/samhemelryk/moodle 2013-06-11 15:34:48 +08:00
Dan Poltawski
6217bb5b8d Merge branch 'MDL-38359-master' of git://github.com/damyon/moodle 2013-06-11 15:31:20 +08:00
Damyon Wiese
52fdb0582a MDL-38359 assign: Set header field name so it works with shortforms 
Two forms were adding headers with empty names - fixed.
 2013-06-11 15:25:01 +08:00
Damyon Wiese
e9416eb7ef 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.
 2013-06-11 17:13:00 +10:00
Damyon Wiese
bb6471aa88 MDL-38359 assign: Add support for admin defaults for marking workflow settings 2013-06-11 14:26:33 +08:00
Dan Marsden
f8d107b3a8 MDL-38359 Marking Allocation and Workflow code 
based on Marking workflow code from Damyon Wiese
 2013-06-11 14:11:41 +08:00
Dan Poltawski
3873f6aa60 Merge branch 'MDL-39449' of git://github.com/timhunt/moodle 2013-06-11 14:09:12 +08:00
Marina Glancy
ab8e5e795d Merge branch 'MDL-37621-master' of git://github.com/damyon/moodle 2013-06-11 15:57:14 +10:00
Sam Hemelryk
30db96bd90 Merge branch 'MDL-32533-master' of git://github.com/danpoltawski/moodle 2013-06-11 17:36:18 +12:00
Damyon Wiese
a8fe74e9db 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
 2013-06-11 13:35:18 +08:00
Marina Glancy
849a016128 Merge branch 'MDL-37459-master-fix' of https://github.com/damyon/moodle 2013-06-11 15:32:27 +10:00