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

15743 Commits

Author SHA1 Message Date
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
Dan Poltawski
1911cf3c99 Merge branch 'MDL-46017-master' of git://github.com/damyon/moodle 2014-07-23 08:24:24 +01: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
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
Eloy Lafuente (stronk7)
d1d9e833d8 Merge branch 'MDL-46080' of https://github.com/jonof/moodle 2014-07-14 23:29:07 +02:00
Sam Hemelryk
3c94f90cde MDL-37993 mod_quiz: fixed deprecated behat step 2014-07-15 09:10:17 +12:00
Sam Hemelryk
9b3b730c62 Merge branch 'MDL-37993-quiz-completion-pass-attempts' of git://github.com/MorrisR2/moodle 2014-07-15 08:48:55 +12:00
Sam Hemelryk
5c9ba23a68 Merge branch 'MDL-42179-003-master' of https://github.com/dbezborodovrp/moodle 2014-07-15 08:39:37 +12:00
Eloy Lafuente (stronk7)
8d0703d643 Merge branch 'master_MDL-31366' of git://github.com/danmarsden/moodle 2014-07-14 18:13:18 +02:00
Eloy Lafuente (stronk7)
8707dae4f8 Merge branch 'MDL-44523_master' of git://github.com/dmonllao/moodle 2014-07-14 18:06:52 +02:00
Syxton
83360c8d52 MDL-45965 assign: add notification capability 
MDL-45965 assign: add notification capability

Adds a new capability that adds flexibility to what users receive grader
submission messages. Includes phpunit tests. Function is based off of
get_graders() but is separate because it is bad form to have a
capability that is dependent on another capabilities setting.
 2014-07-14 11:14:27 -04:00
Ray Morris
db3686d546 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-14 10:14:27 -05:00
Damien Bezborodov
79397b56cb MDL-42179 mod_assign: Time remaining issue for group assignment 2014-07-14 13:41:44 +09:30
Andrew Davis
9e6cdc0ece MDL-30431 mod_wiki: clarified the logic around editing and deleting wiki comments and added behat tests 2014-07-14 07:49:23 +08:00
David Monllao
8538c56281 MDL-31089 mod_forum: Filtering non-visible groups 2014-07-11 16:48:02 +08:00
David Monllao
93d14b8ad1 MDL-44523 events: Changing edulevels to make them consistent with other events 2014-07-11 10:36:00 +08:00
Dan Marsden
9b4162fb1d MDL-31366 Feedback: decode htmlchars on output to excel 2014-07-11 13:28:16 +12:00
Nobelium
ad88d3ed2a MDL-35870 mod_scorm : Adding phpdocs for new functions 
get_scorm_default in scorm_12lib.php
get_scorm_default in scorm_13lib.php
get_scorm_default in aicclib.php
scorm_isset in locallib.php
scorm_empty in locallib.php
 2014-07-10 15:40:39 +00:00
Nobelium
3ad5eeedcf MDL-35870 mod_scorm : Removing loaddatamodel.php 2014-07-10 14:17:32 +00:00
Andrew Nicols
f2946a5419 MDL-38990 mod_forum: Restrict ability to post to all groups in a forum 
In order to post to all groups in a forum, you must have the
moodle/site:accessallgroups capability.

Thanks to Jakob Ackermann <jackermann@onlineschool.ca> for part of the fix
on this one.
 2014-07-10 16:26:01 +08:00
Eloy Lafuente (stronk7)
7a26204e18 Merge branch 'MDL-43849_master' of git://github.com/dmonllao/moodle 2014-07-08 20:28:58 +02:00
Dan Poltawski
8bdcbcaf7d Merge branch 'MDL-44492' of git://github.com/timhunt/moodle 2014-07-08 14:17:56 +01:00
Tim Hunt
afbe4592ad MDL-44492 quiz: fix hilighting of graded attempt 
In various places, when showing several attempts, we try to hilight the
most significant one (the one that gave the final grade if the quiz is
set to first/last/best attempt). That was not working because the table
zebra stripes were a more specific rule.

Also, the colour was inconsistent, not nice, and not very bootstrapy, so
I changed it.
 2014-07-08 13:31:55 +01:00
Tim Hunt
6f885844fd MDL-44492 quiz reports: revert some style overrides. 
But add one more. This makes Clean theme look a lot better.
 2014-07-08 13:31:53 +01:00
Tim Hunt
750757cff1 MDL-44492 Rough unit test for the report SQL. 
We really ought to test more cases, but this hits one of the most tricky cases.
 2014-07-08 13:31:51 +01:00
Tim Hunt
8cacc71dd2 MDL-44492 quiz reports: make show only graded attempt work. 
It needs to only affect finished attempts, and the wording needs to be
modified to make it clear that is what it does.
 2014-07-08 13:31:49 +01:00
Nobelium
7b9036be25 MDL-35870 mod_scorm : Initializing scorm API using js_init_call 2014-07-08 11:22:37 +00:00
Nobelium
93ca0d54c0 MDL-35870 mod_scorm : Prevents scorm API reload 2014-07-08 11:22:37 +00:00