mirror_php/moodle
1
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-01-19 14:27:22 +01:00
Code Issues Projects Releases Wiki Activity
61,709 Commits 36 Branches 519 Tags
Commit Graph

13933 Commits

Author SHA1 Message Date
Damyon Wiese
1fba9cf66a MDL-37621 assign: Fix for DB error on update. 
This properly handles the case when the teamsubmissiongroupingid is disabled.
 2013-06-13 15:15:07 +08:00
Dan Poltawski
e3b472e82c Merge branch 'MDL-38359-master' of git://github.com/danmarsden/moodle 2013-06-13 10:15:25 +08: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
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
Sam Hemelryk
e1e6c0dd4c Merge branch 'wip-MDL-39040-master' of git://github.com/abgreeve/moodle 2013-06-12 10:21:45 +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
9ce7b61e62 Merge branch 'w24_MDL-38109_m26_pluginlist' of git://github.com/skodak/moodle 2013-06-12 08:54:09 +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
Dan Poltawski
2504dfd61d Merge branch 'MDL-39155' of https://github.com/jacks92/moodle 2013-06-11 15:38:37 +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
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
Sam Hemelryk
b618f2d9f7 Revert "MDL-37490 mod_assign: Add setting to show the due date on the course page." 
This reverts commit ef8a6dfb33c572beb0982818e9380476d6e636e2.
 2013-06-11 17:10:36 +12:00
Sam Hemelryk
3e69c074ac Revert "MDL-37490 Assign: Minor patch cleanup" 
This reverts commit 06b9df11452fa78832fda6c6c188b561008bd8dd.
 2013-06-11 17:10:30 +12:00
Sam Hemelryk
b9565a0070 Merge branch 'wip-MDL-37490-m7' of git://github.com/gjb2048/moodle 2013-06-11 13:32:36 +12:00
Dan Poltawski
50b5ae4a8d Merge branch 'MDL-39947' of https://github.com/aolley/moodle 2013-06-10 16:19:56 +08:00
Sam Hemelryk
56ad6d46d1 Merge branch 'MDL-39971' of git://github.com/timhunt/moodle 2013-06-10 15:09:43 +12:00
Sam Hemelryk
bf0cdbcf8a Merge branch 'w24_MDL-32480_m26_imscp' of git://github.com/skodak/moodle 2013-06-10 14:41:21 +12:00
Sam Hemelryk
e559265c10 Merge branch 'wip-MDL-39227-master' of git://github.com/phalacee/moodle 2013-06-10 11:43:31 +12:00
Damyon Wiese
06b9df1145 MDL-37490 Assign: Minor patch cleanup 
Bump version number for mod_assign
Remove use of global $OUTPUT (can use get_renderer() in assign)
Fix language strings
Add missing setTypes
 2013-06-08 10:44:52 +01:00
Gareth J Barnard
ef8a6dfb33 MDL-37490 mod_assign: Add setting to show the due date on the course page. 2013-06-08 10:44:28 +01:00
Petr Škoda
f815e4cbdf MDL-32480 allow external https links in IMSCP too 2013-06-07 09:58:03 +02:00
Nicolas Dunand
4a04fef6ef MDL-32480 fix display of IMS content packages with external links 2013-06-07 09:58:03 +02:00
Dan Poltawski
984dc35457 Merge branch 'MDL-39939-scorm-basic-report-name' of git://github.com/mudrd8mz/moodle 2013-06-04 12:27:30 +08:00
Dan Poltawski
ea746c0166 Merge branch 'MDL-39317-master' of git://github.com/damyon/moodle 2013-06-04 11:26:28 +08:00
Dan Poltawski
0d9121a1c4 Merge branch 'MDL-39743-master' of git://github.com/damyon/moodle 2013-06-04 11:03:39 +08:00
Eloy Lafuente (stronk7)
422595e282 Merge branch 'MDL-39821-master' of git://github.com/damyon/moodle 2013-06-04 01:14:09 +02:00
Eloy Lafuente (stronk7)
71b2d24a9b Merge branch 'MDL-39932_master' of git://github.com/grabs/moodle 2013-06-03 19:10:00 +02:00
Eloy Lafuente (stronk7)
6cffc66647 Merge branch 'MDL-39487_master' of https://github.com/IOC/moodle 2013-06-03 19:03:15 +02:00
Tim Hunt
2ed7833790 MDL-39971 each attempt builds on last broken for previews. 2013-05-31 20:24:50 +01:00
Adam Olley
f985bc4e65 MDL-39947 mod_forum: Add safety check to variable assignment when counting unread posts 2013-05-31 09:45:56 +09:30
Andreas Grabs
e6e9bec3ee MDL-39932 mod_feedback - Mapping Feedback when Course is Deleted - thx to David N. Johnson 2013-05-30 23:10:33 +02:00
David Mudrák
b60ab47cb7 MDL-39939 Fix the basic SCORM report plugin name 2013-05-30 22:42:12 +02:00
Damyon Wiese
7775545197 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.
 2013-05-29 14:40:50 +08:00
Ashley Holman
c7e4403c9f MDL-39743 assign: Fix missing capability check for "grant extension" 2013-05-29 11:58:48 +08:00
Damyon Wiese
48488bfb39 MDL-39821 assign: missing setType with advanced grading 2013-05-29 11:20:56 +08:00
David Monllao
69a397cd2c MDL-39795 behat: Adapting features to consider spaces 2013-05-27 14:24:20 +08:00
Jason Fowler
f505aab201 MDL-39227 - SCORM - repositioning the navigation panel to be visible in all themes at all resolutions 2013-05-22 15:14:56 +08:00
Dan Poltawski
a22b8a83e7 Merge branch 'MDL-39753' of git://github.com/stronk7/moodle 2013-05-21 10:58:37 +08:00
Eloy Lafuente (stronk7)
34e8106f5f Merge branch 'MDL-26120' of https://github.com/jacks92/moodle 2013-05-21 00:54:08 +02:00
Eloy Lafuente (stronk7)
c9e54743ec MDL-39753 Add 2.5.0 upgrade line 2013-05-20 15:33:19 +02:00
Dan Poltawski
ef78682e44 Merge branch 'w18_MDL-39374_m26_folderlog' of git://github.com/skodak/moodle 2013-05-20 17:58:09 +08:00