mirror_php/moodle
1
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-04-17 22:45:54 +02:00
Code Issues Projects Releases Wiki Activity
58,706 Commits 37 Branches 536 Tags
Commit Graph

13327 Commits

Author SHA1 Message Date
Dan Poltawski
bc5165c2be Merge branch 'MDL-37082_master' of git://github.com/markn86/moodle 2013-01-23 14:45:59 +08:00
Mark Nelson
18aaeef0b6 MDL-37082 mod_assign: removed reference to deprecated delete_course_module function in the unit tests 2013-01-23 14:25:02 +08:00
Eloy Lafuente (stronk7)
c9c75b39fd Merge branch 'MDL-37619-master' of git://github.com/damyon/moodle 2013-01-23 02:07:53 +01:00
Dan Poltawski
0a93b3127f Merge branch 'MDL-37082_master' of git://github.com/markn86/moodle 2013-01-23 08:53:02 +08:00
Mark Nelson
a347aee32e MDL-37082 core_course: create new course_delete_module function that handles the whole deletion process 
Instead of repeating code all over the place because the original function delete_course_module only partially deletes data, we now place all the functionality needed to delete a module here.
 2013-01-22 17:05:16 +08:00
Aparup Banerjee
1a6192f928 Merge branch 'MDL-37547-master' of github.com:damyon/moodle 2013-01-22 13:57:25 +08:00
Damyon Wiese
c1432fad2c MDL-37619 Assign: Fix failed unit tests for mod/assign/lib.php 
The failure was caused by a regression in MDL-37527.
 2013-01-22 13:34:01 +08:00
Dan Poltawski
5a4a346834 Merge branch 'MDL-33206-master' of git://github.com/StudiUM/moodle 2013-01-22 12:58:27 +08:00
Dan Poltawski
cba645b850 Merge branch 'master_MDL-36853' of git://github.com/danmarsden/moodle 2013-01-22 12:49:18 +08:00
Dan Poltawski
ad0bcfe6a6 Merge branch 'MDL-35357' of git://github.com/rwijaya/moodle 2013-01-22 11:48:04 +08:00
Aparup Banerjee
8b042b1cc8 Merge branch 'MDL-37583' of git://github.com/timhunt/moodle 2013-01-22 11:37:24 +08:00
Aparup Banerjee
c0038fbe5b Merge branch 'MDL-37540-master' of git://github.com/damyon/moodle 2013-01-22 10:59:26 +08:00
Aparup Banerjee
5d4183b94f Merge branch 'MDL-37543-master' of git://github.com/damyon/moodle 2013-01-22 10:56:06 +08:00
Eloy Lafuente (stronk7)
cccdddf241 Merge branch 'MDL-37539-master' of github.com:damyon/moodle 2013-01-22 02:11:27 +01:00
Damyon Wiese
f518843d4c MDL-37539 assign: Fix unit test after changes to upgrade for advanced file assignments. 2013-01-22 09:04:13 +08:00
Eloy Lafuente (stronk7)
0aaf378cf9 Merge branch 'MDL-36104_master' of https://github.com/markn86/moodle 2013-01-22 01:11:48 +01:00
Eloy Lafuente (stronk7)
17f394f81a Merge branch 'MDL-37539-master' of github.com:damyon/moodle 2013-01-22 01:05:54 +01:00
Sam Hemelryk
0774b0d34c Merge branch 'MDL-37563-master' of git://github.com/damyon/moodle 2013-01-22 09:10:44 +13:00
Eloy Lafuente (stronk7)
ea4edbd6bc Merge branch 'MDL-37577' of git://github.com/timhunt/moodle 2013-01-21 20:01:39 +01:00
Eloy Lafuente (stronk7)
509c2758ce Merge branch 'MDL-34050' of git://github.com/rwijaya/moodle 2013-01-21 16:47:18 +01:00
Tim Hunt
805e32f74e MDL-37577 quiz overdue handling: optimise database query 
This is the standard trick of adding a redundant WHERE clause to a
subquery to help the database realise that it does not have to inspect
so many rows.
 2013-01-21 13:21:38 +00:00
Michael de Raadt
25784512cd MDL-35357 Lesson Module: fixed undefined property for $answerformat 2013-01-21 15:35:39 +08:00
Mark Nelson
7e5be0744c MDL-36104 mod_assign: added hidden labels to the feedback input fields 2013-01-21 12:50:34 +08:00
Dan Poltawski
73ce4ac996 Merge branch 'MDL-37457_master' of git://github.com/dmonllao/moodle 2013-01-21 10:53:12 +08:00
Dan Poltawski
66bfd52a62 Merge branch 'MDL-37527-master' of github.com:damyon/moodle 2013-01-21 10:03:34 +08:00
Dan Poltawski
3be10301e9 Merge branch 'master_MDL-36421' of git://github.com/danmarsden/moodle 2013-01-21 09:01:00 +08:00
Sam Hemelryk
528d2633df Merge branch 'MDL-37295-master' of git://github.com/ankitagarwal/moodle 2013-01-21 10:18:33 +13:00
Jean-Philippe Gaudreau
5595391eae MDL-33206 mod_book: Add a link to display the print dialog in the print book tool 2013-01-18 10:49:45 -05:00
Tim Hunt
283cbd825c MDL-37583 quiz statistics report. Delete junk code. 2013-01-18 14:43:17 +00:00
Dan Poltawski
9f780282fa MDL-31682 - fix for online text assignments 2013-01-17 15:48:29 +08:00
Damyon Wiese
7720f485c9 MDL-37563 Assignment upgrade: Upgrade conditional activity settings. 2013-01-17 14:00:46 +08:00
Dan Poltawski
361dfe6572 Merge branch 'wip-mdl-29534' of git://github.com/rajeshtaneja/moodle 2013-01-17 13:47:25 +08:00
Rajesh Taneja
e9c55e3993 MDL-29534 Forum: Fixed userfrom reference problem 2013-01-17 13:45:01 +08:00
Damyon Wiese
5389dfb0eb MDL-37539 Assignment upgrade: Disable submission comments if allow notes was not enabled. 
For advanced upload of files only - this setting was stored in var2.
 2013-01-17 12:15:00 +08:00
Damyon Wiese
f531ca72f9 MDL-37540 Assignment upgrade: Upgrade setting "Hide description before due date" 
Advanced upload of files has this setting which is stored in var3.
 2013-01-17 11:44:57 +08:00
Damyon Wiese
01d29b3907 MDL-37543 Assignment upgrade: convert advanced upload files "Send for marking" setting 
Advanced upload files assignment type has "Enable send for marking" setting instead
of "Allow resubmissions". Needs special handling in upgrade code to convert to
"Require students click submit button".
 2013-01-17 11:05:31 +08:00
Damyon Wiese
cb5b486040 MDL-37547 Assignment: Add unit tests for mod/assign/lib.php 2013-01-16 16:36:19 +08:00
Dan Poltawski
f2c87dd530 Merge branch 'MDL-37546-master' of github.com:damyon/moodle 2013-01-16 13:49:34 +08:00
Damyon Wiese
f93fdcef86 MDL-37546 Assignment fix assign_get_recent_mod_activity code cleanup regression. 2013-01-16 13:48:15 +08:00
Damyon Wiese
425a634b58 MDL-37527 Assignment - Change query for print_overview so it uses an index (postgres) 
Reported by Mark Neilsen.
 2013-01-16 13:20:27 +08:00
Marina Glancy
a3f66bdeac MDL-36968 Move function print_recent_activity() to the block recent_activity 2013-01-16 16:13:04 +11:00
Eloy Lafuente (stronk7)
493d8f781c Merge branch 'MDL-37354-master' of git://github.com/mouneyrac/moodle 
Conflicts:
	message/tests/externallib_test.php
 2013-01-15 21:50:31 +01:00
Ben Johnson
7536464d61 MDL-36421 SCORM: fix SCORM course format new window popups 2013-01-15 21:42:56 +13:00
Dan Poltawski
864ff70c74 Merge branch 'MDL-36534' of git://github.com/timhunt/moodle 2013-01-15 14:44:28 +08:00
Ankit Agarwal
c524394d88 MDL-37295 forum: Parse old log entries during restore 2013-01-15 13:57:40 +08:00
Dan Poltawski
0a9b944a15 Merge branch 'MDL-36587-master' of git://github.com/damyon/moodle 
Conflicts:
	mod/assign/locallib.php
 2013-01-15 11:19:40 +08:00
Rossiani Wijaya
b0ff0e9aae MDL-34050 Lesson Module: Fixed spacing and removed array_unique() for responses 2013-01-15 11:17:55 +08:00
David Monllao
6b21986911 MDL-37457 testing Mark current classes as deprecated 2013-01-15 11:07:45 +08:00
David Monllao
5c3c2c81be MDL-37457 testing Refactoring references 2013-01-15 11:07:43 +08:00
Sam Hemelryk
2a6dbdcaee Merge branch 'MDL-37378' of git://github.com/timhunt/moodle 2013-01-15 10:43:08 +13:00