mirror_php/moodle
1
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-04-08 18:03:19 +02:00
Code Issues Projects Releases Wiki Activity
54,676 Commits 36 Branches 530 Tags
Commit Graph

12408 Commits

Author SHA1 Message Date
Dan Poltawski
73c672f593 Merge branch 'MDL-34025_master' of https://github.com/markn86/moodle 2012-07-02 16:28:05 +08:00
Dan Poltawski
bfcc865709 Merge branch 'MDL-33924' of git://github.com/timhunt/moodle 2012-07-02 16:19:14 +08:00
Dan Poltawski
6a84f5ae74 Merge branch 'master_MDL-33914' of git://github.com/danmarsden/moodle 2012-07-02 16:14:07 +08:00
Dan Poltawski
637406f3c0 Merge branch 'm23_MDL-33053_AICC_flattened_TOC' of git://github.com/scara/moodle 2012-07-02 15:50:09 +08:00
Dan Poltawski
ba17a42133 Merge branch 'MDL-9073-master' of github.com:FMCorz/moodle 2012-07-02 15:33:31 +08:00
Dan Poltawski
977f05940d Merge branch 'master_MDL-31203_advanced_forum_search_always_reverts_date_from_and_to' of git://github.com/kanikagoyal/moodle 2012-07-02 15:23:52 +08:00
Dan Poltawski
eca8e9aca1 Merge branch 'MDL-26465' of git://github.com/rwijaya/moodle 2012-07-02 15:18:26 +08:00
Dan Poltawski
1e1af1cd15 Merge branch 'MDL-31987_assignment' of git://github.com/rwijaya/moodle 2012-07-02 15:12:39 +08:00
Dan Poltawski
337b34fac0 Merge branch 'MDL-34054' of git://github.com/timhunt/moodle 2012-07-02 14:56:50 +08:00
Rossiani Wijaya
df70d008f7 MDL-31987 Assignment module: fixed upgrade version 2012-07-02 14:46:43 +08:00
Dan Poltawski
74fc24a916 MDL-31987 Assignment module: fix sql for postgres. 2012-07-02 14:45:46 +08:00
Rossiani Wijaya
b8ba23ca23 MDL-31987 Assignment module: Assignment count submissions correctly. 
For advanced upload assignment, store file count of each submission
into assignment_submissions.numfiles

When counting submissions, if the assignment is open and tracking
drafts, only submissions which has send for marking are counted.
Otherwise, submissions which has numfiles > 0 are counted.

Also change a hardcoded 'submitted' to ASSIGNMENT_STATUS_SUBMITTED.

This patch was originally written by: Sunner Sun <sunner@gmail.com>.

I made some modifation to fixed count_real_submissions() query (ref: MDL-32207) in /mod/assignment/type/upload/assignment.class.php file
 2012-07-02 14:26:45 +08:00
Dan Poltawski
c252db3dbe Merge branch 'master_MDL-33978' of git://github.com/danmarsden/moodle 2012-07-02 13:44:10 +08:00
Sam Hemelryk
e07a3bf209 Merge branch 'MDL-33932_master' of git://github.com/grabs/moodle 2012-07-02 14:31:55 +12:00
Eloy Lafuente (stronk7)
f6653bfd47 Merge branch 'MDL-31201' of git://github.com/danpoltawski/moodle 2012-06-30 22:00:34 +02:00
Tim Hunt
fff85efe4b MDL-34054 quiz reports: missing context. 
quiz_report_should_show_grades needs to know the context, so pass it
through.
 2012-06-29 16:09:20 +01:00
Aparup Banerjee
99c3c503e0 MDL-34096 Installation : Added 2.3 upgrade line to db upgrade scripts. 2012-06-29 11:41:09 +08:00
Tim Hunt
df217fd7d0 MDL-33924 quiz: incorrect foreign key definition. 
Thanks to Jean-Michel Vedrine for spotting this.≈
 2012-06-27 08:08:10 +01:00
Mark Nelson
f28da7fcc7 MDL-34025 - quiz secure window: fix popup closing 2012-06-27 15:00:23 +08:00
Sun Zhigang
a572f17d41 MDL-31201 wiki: fix a hardcoded string 2012-06-27 13:34:50 +08:00
Rossiani Wijaya
32cfd597fb fixed the ->spacer <br> param 2012-06-26 18:08:46 +08:00
Mark Nielsen
487ee886ec fixed undefined variable 2012-06-26 17:56:11 +08:00
Andreas Grabs
f65c82636a MDL-33932_master - added array_unique() 2012-06-25 21:45:33 +02:00
Dan Marsden
c2c5c2f8c7 MDL-33978 SCORM activity completion - don't tiggere completion update state on creation of SCORM 2012-06-25 12:23:52 +12:00
Dan Marsden
f0a1cc8ea8 MDL-33914 SCORM show scrollbar on TOC if too long. 2012-06-22 22:21:56 +12:00
Damyon Wiese
99467a9f7f MDL-33853: Prevent locking an assignment submission from putting a grade of 0 in the gradebook 2012-06-22 11:12:06 +08:00
Damyon Wiese
dd9247adfe MDL-33954: Assignment "submissionreceipthtml" Language change 
Add the missing word: "see"
 2012-06-22 09:03:18 +08:00
Aparup Banerjee
7cacb2ef08 Merge branch 'wip-MDL-33297-master' of git://github.com/abgreeve/moodle 2012-06-21 17:34:57 +08:00
Dan Poltawski
75c8a109e5 Merge branch 'MDL-33878' of git://github.com/netspotau/moodle-mod_assign 2012-06-21 15:21:13 +08:00
Dan Poltawski
22b0514e27 Merge branch 'MDL-33860' of git://github.com/netspotau/moodle-mod_assign 2012-06-21 14:56:07 +08:00
Damyon Wiese
caff10a0b0 MDL-33850: Assignment: Change text to "Add submission" before anything has been submitted 
AMOS BEGIN
 CPY [addsubmission,mod_assignment],[addsubmission,mod_assign]
AMOS END
 2012-06-21 14:48:53 +08:00
Damyon Wiese
7056953a1c MDL-33860: Use get_string for All option in assignment grading table 2012-06-21 14:48:28 +08:00
Dan Poltawski
334de6b691 Merge branch 'MDL-33877' of git://github.com/netspotau/moodle-mod_assign 2012-06-21 10:04:29 +08:00
Sam Hemelryk
5f17311f52 MDL-27675 mod_feedback: Fixed up white space 2012-06-21 11:40:38 +12:00
Sam Hemelryk
d2448b8bd2 Merge branch 'MDL-27675_master' of git://github.com/grabs/moodle 2012-06-21 11:25:07 +12:00
Damyon Wiese
1f417de84a MDL-33877: Prevent duplicate records in grade items table after running assignment upgrade tool 
The cause was multiple calls to set_field on the same table. Changed to update_record.
 2012-06-20 14:33:33 +08:00
Dan Poltawski
b1c43c3f64 Merge branch 'w25_MDL-33831_m23_glossestrict' of git://github.com/skodak/moodle 2012-06-20 13:57:26 +08:00
Damyon Wiese
14c46e24a9 MDL-33878: Assignment - prevent error when removing overridden flag in gradebook 
This error only occurs when there is a submission but no grade in the assignment
and the feedback comments plugin is enabled.
 2012-06-20 13:11:19 +08:00
Frederic Massart
f97aee76e7 MDL-9073 Glossary: uncategorised entries are printable 2012-06-20 12:24:44 +08:00
Dan Poltawski
d8d2eebb44 Merge branch 'MDL-33773' of git://github.com/netspotau/moodle-mod_assign 2012-06-20 11:25:08 +08:00
Adrian Greeve
35ca63c166 MDL-33297 - forum - workshop - glossary - data - Updated the check for files to allow students to see files they recently uploaded. 2012-06-20 10:49:18 +08:00
Sam Hemelryk
f7dc4a5630 Merge branch 'MDL-3971' of git://github.com/danpoltawski/moodle 2012-06-20 11:39:59 +12:00
Sam Hemelryk
ec1ca38996 Merge branch 'MDL-33843' of git://github.com/netspotau/moodle-mod_assign 2012-06-20 09:36:22 +12:00
Damyon Wiese
d9a88f427d MDL-33773: Make view/grade all submissions a link in assignment module 2012-06-19 22:08:21 +08:00
Petr Škoda
9bba13089d MDL-33831 fix E_STRICT issues in glossary 2012-06-19 13:57:11 +02:00
Damyon Wiese
5382eabbec MDL-33843: Remove custom dirty form handling and use default behaviour in assignment 2012-06-19 15:18:07 +08:00
Dan Poltawski
4bf433b5fb MDL-33121 book - improve a lang string 
+ Make a comment match coding style
 2012-06-19 14:15:11 +08:00
Dan Poltawski
34741af185 Merge branch 'MDL-33121' of git://github.com/rwijaya/moodle 2012-06-19 14:14:54 +08:00
Dan Poltawski
c1ac8fa189 Merge branch 'MDL-33821-master-1' of git://git.luns.net.uk/moodle 2012-06-19 13:27:07 +08:00
Eloy Lafuente (stronk7)
e165512d3a Merge branch 'MDL-33778' of git://github.com/timhunt/moodle 2012-06-19 00:54:39 +02:00