mirror_php/moodle
1
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-04-06 17:03:33 +02:00
Code Issues Projects Releases Wiki Activity
58,959 Commits 36 Branches 529 Tags
Commit Graph

13373 Commits

Author SHA1 Message Date
Eloy Lafuente (stronk7)
8d8f9cf756 Merge branch 'master_MDL-33078' of git://github.com/danmarsden/moodle 2013-02-04 23:58:41 +01:00
Dan Marsden
a022192a3b MDL-33078 SCORM: rebuild toc when calling LMSCommit to improve pre-req handling 2013-02-04 22:04:06 +13:00
Damyon Wiese
935ec5e77e Merge branch 'MDL-37781-workshop-schedule' of git://github.com/mudrd8mz/moodle 2013-02-04 16:18:00 +08:00
Dan Poltawski
6ac9f15969 Merge branch 'master_MDL-29207' of git://github.com/danmarsden/moodle 2013-02-04 15:54:43 +08:00
Dan Poltawski
cf936fa297 Merge branch 'wip-mdl-30144' of git://github.com/rajeshtaneja/moodle 2013-02-04 13:54:27 +08:00
Dan Poltawski
4ac341c9b6 Merge branch 'MDL-37646-master' of git://github.com/damyon/moodle 2013-02-04 13:49:23 +08:00
Damyon Wiese
c15cda6138 Merge branch 'MDL-37806-workshop-next' of git://github.com/mudrd8mz/moodle 2013-02-04 12:48:42 +08:00
Dan Poltawski
d5a13bca09 Merge branch 'MDL-37710-master' of git://github.com/damyon/moodle 2013-02-04 12:12:11 +08:00
Dan Poltawski
b9299c61ca Merge branch 'MDL-37635-master' of git://github.com/damyon/moodle 2013-02-04 11:56:45 +08:00
Dan Marsden
361069cbbb MDL-29207: SCORM prereq callback is pure js - move it to module.js so it can be cached better. 2013-02-03 20:27:52 +13:00
Dan Marsden
5f03868a53 MDL-29207 SCORM: Auto-continue doesn't work with Pre-req due to JS errors 2013-02-03 20:27:39 +13:00
Dan Marsden
6496979459 MDL-36800 SCORM: Fix Yui().use calls - thanks to Nancy Cheng for the fix 2013-02-03 20:21:16 +13:00
Michael Hughes
127d66f183 MDL-30144 Assignment 2.2: Download all as zip should only contain submission from active enroled users 2013-02-01 17:08:22 +08:00
Damyon Wiese
46692c3a81 MDL-37635 Assign: Prevent errors when viewing a feedback for an assignment with no gradeitem in gradebook 
Also adds unit tests to verify that:
Feedback is visible even if there is no grade
The grade is not shown if the gradeitem is hidden unless you have mod/assign:grade capability
 2013-02-01 13:46:08 +08:00
David Mudrák
1df3bc143c MDL-37806 Display 'Save and show next' button when assessing workshop submissions 
The button is displayed only when there is a pending (that is not
assessed yet) submission to assess.

AMOS BEGIN
 CPY [savenext,mod_assign],[saveandshownext,mod_workshop]
AMOS END
 2013-01-31 18:21:51 +01:00
David Mudrák
0001eea6dd MDL-37806 Add new workshop class method to return pending assessments 
This is a simple wrapper around workshop::get_assessments_by_reviewer()
that filters assigned assessments and returns just those that were not
graded by the reviewer yet.
 2013-01-31 18:21:50 +01:00
David Mudrák
8342a6981b MDL-37781 Allocate workshop submissions without waiting for cron 
Now we are checking for the need to execute the allocator every time the
main view.php is displayed to any user. Previously this was done by cron
only.
 2013-01-31 11:42:03 +01:00
David Mudrák
85f1c2d68b MDL-37781 Check for switching the workshop phase without waiting for cron 
Now we are checking for the need to switch the phase when the main
view.php is displayed to any user (previously this was done via cron
only). To give our subplugins (such as the scheduled allocation method)
a chance to do what they need to do, the workshop_viewed event is
triggered before the phase is actually switched.
 2013-01-31 11:41:55 +01:00
Dan Poltawski
12f756f9d7 Revert "MDL-37613 mod: changed generalbox class in table to generaltable class in mod/feedback (2 files);mod/glossary (3 files);mod/wiki (1 file)." 
This reverts commit 0434dd24820e8c89e7f03d01c797ca65d211121a.
 2013-01-31 15:02:12 +08:00
Dan Poltawski
2c8d31cd72 Merge branch 'master_MDL-34231' of git://github.com/danmarsden/moodle 2013-01-31 10:14:46 +08:00
Dan Marsden
220e5b5216 MDL-34231 SCORM: calculate correct number of attemptsleft when entering an attempt. 2013-01-31 10:45:11 +13:00
Petr Škoda
7a18f49c60 MDL-37726 remove PREVIOUS/NEXT from all install.xml files 
YAY!
 2013-01-29 22:34:46 +01:00
Eloy Lafuente (stronk7)
96b997d759 Merge branch 'MDL-37533-master' of git://github.com/damyon/moodle 2013-01-29 15:35:05 +01:00
Damyon Wiese
3e1b63f1c8 MDL-37710 Assign: Fix pluginfile permission checks for student viewing their own team submission. 
This change adds a function to the assign class to allow the permissions for a group submission
to be checked and updates all the submission plugins to call it.
 2013-01-29 17:14:36 +08:00
Damyon Wiese
6792b8f5d3 MDL-37646 Assign: Quickgrading fix when using grading filters or lots of students. 2013-01-29 14:36:18 +08:00
Dan Poltawski
5d80fc80c0 Merge branch 'MDL-37694' of git://github.com/timhunt/moodle 2013-01-29 11:54:36 +08:00
Sam Hemelryk
dabe6985e4 Merge branch 'master_MDL-37696' of git://github.com/danmarsden/moodle 2013-01-29 10:19:31 +13:00
Sam Hemelryk
41f3d113f7 Merge branch 'MDL-37697-m' of git://github.com/andrewnicols/moodle 2013-01-29 10:17:01 +13:00
Sam Hemelryk
cb4adcc4a4 Merge branch 'master_MDL-34231' of git://github.com/danmarsden/moodle 2013-01-29 08:28:31 +13:00
Dan Marsden
cce0da745a MDL-34231 SCORM: Lock after final attempt when using skip content structure or direct navigation to player.php 2013-01-28 21:17:43 +13:00
Sam Hemelryk
225a85806d Merge branch 'wip-MDL-37613_master' of git://github.com/lazydaisy/moodle 2013-01-28 17:38:36 +13:00
Sam Hemelryk
58f828ca14 Merge branch 'wip-MDL-29723_master' of git://github.com/lazydaisy/moodle 2013-01-28 17:35:04 +13:00
David Monllao
e8eb2b003a MDL-37634 lesson: readquestion visibility to protected 2013-01-28 13:45:42 +13:00
Dan Marsden
fe56bc615d MDL-37696 SCORM css: don't include style.css multiple times 2013-01-28 10:31:08 +13:00
Andreas Grabs
82e4dc33f0 MDL-37628 feedback - Coding error in Recent Activity 2013-01-26 11:28:06 +01:00
Andrew Robert Nicols
c112bc6069 MDL-37697 Use the correct editor format for course forums 2013-01-25 12:30:29 +00:00
Tim Hunt
e389874d19 MDL-37694 move quiz unit tests to the right place. 
Follow-on from MDL-37684.
 2013-01-25 12:12:12 +00:00
Stephen Bourget
0b33e91cd6 MDL-37533 Assign: Fix grading filters to show only assignments needing grading 2013-01-24 10:55:43 +08:00
Damyon Wiese
d43b31094e MDL-37533 Assign: Use the constant for the submitted status in the query (and parameterize the query) 2013-01-24 10:52:20 +08:00
Stephen Bourget
b7f461419b MDL-37533 Assign: assign_print_overview does not correctly display assignments that need grading 2013-01-24 10:39:09 +08:00
Dan Poltawski
a42a78754f Merge branch 'MDL-37547-master' of github.com:damyon/moodle 2013-01-23 15:58:34 +08:00
Dan Poltawski
1c426a56f8 Merge branch 'MDL-37082-master' of git://github.com/damyon/moodle 2013-01-23 15:53:20 +08:00
Damyon Wiese
8549deb969 MDL-37082: Fixed failed unit tests from previous patch 2013-01-23 15:23:37 +08:00
Damyon Wiese
d021941d6c MDL-37547 Assign: Fix failed unit test on oracle. 
Oracle is rounding numbers with no decimals - which causes a test failure.
 2013-01-23 14:56:21 +08:00
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
Mary Evans
bd5d8b5041 MDL-29723 mod/quiz: Modified show/hide button in edit.php and added some extra CSS rules to styles.css to make Question bank block more compatible/adaptable with themes. 2013-01-22 16:17:11 +00: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