mirror_php/moodle
1
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-03-19 23:20:09 +01:00
Code Issues Projects Releases Wiki Activity
69,199 Commits 36 Branches 527 Tags
Commit Graph

15767 Commits

Author SHA1 Message Date
Dan Poltawski
2ac36ad587 Merge branch 'MDL-46236' of git://github.com/nobelium/moodle 2014-07-29 12:04:29 +01:00
Dan Poltawski
5d9fa99bff Merge branch 'MDL-46456' of https://github.com/aolley/moodle 2014-07-29 11:57:47 +01:00
Marina Glancy
05d311caa5 Merge branch 'MDL-46465_chat_style' of git://github.com/andyjdavis/moodle 2014-07-29 12:10:34 +08:00
Sam Hemelryk
6df4025b2c Merge branch 'MDL-43908-master' of https://github.com/lucisgit/moodle 2014-07-29 15:50:50 +12:00
Dan Poltawski
d4a89aa500 Merge branch 'master_MDL-45715' of https://github.com/danmarsden/moodle 2014-07-28 12:47:30 +01:00
Dan Poltawski
d8d240ee63 Merge branch 'MDL-46397' of git://github.com/nobelium/moodle 2014-07-28 10:41:05 +01:00
Nobelium
bf4f65fbb6 MDL-46397 mod_scorm : binding cmi values with scoid 2014-07-28 05:37:21 +00:00
Andrew Davis
c52b4db52d MDL-46465 mod_chat: assorted coding style fixes 2014-07-28 10:01:41 +08:00
Sam Hemelryk
cb2ca9b9cc Merge branch 'MDL-8501-master' of git://github.com/FMCorz/moodle 2014-07-28 12:10:03 +12:00
Sam Hemelryk
db28260c29 Merge branch 'MDL-46506-master' of git://github.com/damyon/moodle 2014-07-28 08:46:03 +12:00
Nobelium
98939a3c84 MDL-46236 mod_scorm : Setting lauch options for scorm in popup 2014-07-26 14:46:25 +00:00
Damyon Wiese
cbec30d4de MDL-46485 Assign: Fix when submitting to a group assignment from the default group 2014-07-25 15:18:40 +08:00
Damyon Wiese
e2d2d8a175 MDL-46485 Assign: New unit test to show error with group submission 2014-07-25 15:18:34 +08:00
Frederic Massart
d9c767c76b MDL-8501 mod_forum: Behat test for neighbour discussions 2014-07-25 10:26:56 +08:00
Frederic Massart
d78628783b MDL-8501 mod_forum: Adding links to navigate between discussions 2014-07-25 10:26:56 +08:00
Frederic Massart
826cb6f6a1 MDL-8501 mod_forum: Test coverage of neighbour discussions 2014-07-25 09:55:29 +08:00
Frederic Massart
8d3a5ba176 MDL-8501 mod_forum: New function to retrieve discussion neighbours 2014-07-25 09:55:29 +08:00
Tony Butler
f33be9eb36 MDL-43908 mod_assign: Order submissions by course id then cm id 
Signed-off-by: Tony Butler <tonyjbutler@gmail.com>
 2014-07-24 17:20:19 +01:00
Tony Butler
86dced433e MDL-43908 mod_assign: Remove redundant code and improve SQL query 
Signed-off-by: Tony Butler <tonyjbutler@gmail.com>
 2014-07-24 17:20:19 +01:00
Tony Butler
c681f7a083 MDL-43908 mod_assign: Prevent notifications for unavailable assignments 
Signed-off-by: Tony Butler <tonyjbutler@gmail.com>
 2014-07-24 16:59:24 +01:00
Tony Butler
ccd6839a7b MDL-43908 mod_assign: Defer notifications for unavailable assignments 
Signed-off-by: Tony Butler <tonyjbutler@gmail.com>
 2014-07-24 16:59:24 +01:00
Damyon Wiese
9f65f9c332 MDL-46506 Assign: fix php warning on grant extension page 
This code was missed when the extensionduedate was moved to the userflags table.
 2014-07-24 11:25:22 +08:00
Damyon Wiese
3169bb36aa MDL-46017 Assign: Restore can't rely allocated marker fields existing in backup 2014-07-24 10:50:20 +08:00
Dan Poltawski
1911cf3c99 Merge branch 'MDL-46017-master' of git://github.com/damyon/moodle 2014-07-23 08:24:24 +01:00
Dan Marsden
5a96486b44 MDL-45715 assign: disable marking allocation if markingworkflow is not set. 2014-07-23 19:15:09 +12:00
Dan Poltawski
919dc292b9 MDL-45965 assign: bump version 2014-07-22 17:23:45 +01:00
Dan Poltawski
406e47123d Merge branch 'MDL-45965_master' of https://github.com/Syxton/moodle 2014-07-22 17:09:48 +01:00
Dan Poltawski
02213adfd0 Merge branch 'MDL-37509-master' of git://github.com/damyon/moodle 2014-07-22 15:56:55 +01:00
Damyon Wiese
2fef6e7060 MDL-46017 Assign: Fix restore of marking workflow data 2014-07-21 16:35:30 +08:00
Damyon Wiese
ae7638f72a MDL-37509 Assign: Do not put description in calendar before it should be shown to students 2014-07-21 15:54:39 +08:00
Damyon Wiese
3b775a0b8a MDL-43151 Assign: More validation in mod_form. 
Add check to mod_form to prevent "reopen until pass" and "blind marking" both being on
 2014-07-21 13:41:51 +08:00
Damyon Wiese
3db661cdae MDL-43151 assign: Use grade_grade->is_passed 
Do not try and calculate this inside mod_assign - it's a gradebook thing only.
 2014-07-21 13:22:22 +08:00
Adam Olley
9b3b8e51c9 MDL-46456 mod_lti: Fixed Y.one selector in mod_form.js 2014-07-21 12:58:13 +09:30
Sam Hemelryk
424033b780 Merge branch 'MDL40479_Grading_alert_colour' of https://github.com/Dave-B/moodle 2014-07-21 11:32:09 +12:00
Sam Hemelryk
e6330e5ba8 Merge branch 'MDL-37993-quiz-completion-pass-attempts' of git://github.com/MorrisR2/moodle 
Conflicts:
	mod/quiz/lib.php
	mod/quiz/mod_form.php
	mod/quiz/tests/behat/completion_condition_passing_grade.feature
 2014-07-17 15:16:07 +12:00
Ray Morris
349c930343 MDL-37993 Quiz: completion upon all passing grade or attempts exhausted 
This patch adds completion options to Quiz similar to what is available in scorm.
One can have the quiz marked complete when either a passing grade is achieved or
all attempts are used up. This will allow a quiz to complete when the user "passes
or fails".  (Where "fail" means "using up all attempts without passing".)
 2014-07-16 19:17:57 -05:00
David Balch
d9bfe3c5c1 MDL-40479 mod_assign PHPDoc: Fix error, improve consistency. 2014-07-16 08:58:21 +01:00
David Balch
153510ead8 MDL-40479 mod_assign: Fix the colour of grading success messages. 2014-07-16 08:57:48 +01:00
Eloy Lafuente (stronk7)
743960d3ab Merge branch 'wip-mdl-30431' of https://github.com/rajeshtaneja/moodle 2014-07-16 09:18:03 +02:00
Eloy Lafuente (stronk7)
9a363a1cd2 Merge branch 'MDL-35870' of git://github.com/nobelium/moodle 2014-07-16 09:04:55 +02:00
Nobelium
6f850a51a4 MDL-35870 mod_scorm: Fixing undefined scoid for popup mode 2014-07-16 11:51:03 +00:00
Rajesh Taneja
52f061db3e MDL-30431 behat: Use table id for wiki comments in behat 2014-07-16 14:56:08 +08:00
Rajesh Taneja
f466584f69 MDL-30431 behat: Fixed wiki behat 2014-07-16 14:52:13 +08:00
Eloy Lafuente (stronk7)
248cae7600 MDL-30431 mod_wiki: whitespace fix 2014-07-16 01:19:45 +02:00
Eloy Lafuente (stronk7)
5b00ae7442 Merge branch 'MDL-30431_wiki_comments' of https://github.com/andyjdavis/moodle 2014-07-16 01:16:04 +02:00
Eloy Lafuente (stronk7)
c5e0735569 Merge branch 'MDL-35870' of git://github.com/nobelium/moodle 2014-07-15 18:30:29 +02:00
Nobelium
76c8fa4190 MDL-35870 mod_scorm : fix for debug.js.php not found error 2014-07-15 16:05:40 +00:00
Eloy Lafuente (stronk7)
3b674f5d0a MDL-35870 mod_scorm : Bump version 2014-07-15 01:45:23 +02:00
Eloy Lafuente (stronk7)
714b25d07d MDL-35870 mod_scorm : whitespace fixes 2014-07-15 01:41:07 +02:00
Eloy Lafuente (stronk7)
857449d769 Merge branch 'MDL-35870' of git://github.com/nobelium/moodle 2014-07-15 01:06:53 +02:00