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

12427 Commits

Author SHA1 Message Date
Sam Hemelryk
e537a588d8 Merge branch 'MDL-33828-master' of git://github.com/FMCorz/moodle 2012-07-03 16:35:32 +12:00
Dan Poltawski
d4c16e8b63 Merge branch 'master_MDL-33938' of git://github.com/danmarsden/moodle 
Conflicts:
	mod/scorm/db/upgrade.php
 2012-07-03 12:19:07 +08:00
Frederic Massart
c31dc0b695 MDL-33828 Portfolio: prevent notices while exporting to portfolios 2012-07-03 09:33:17 +08:00
Eloy Lafuente (stronk7)
9039021b25 Merge branch 'MDL-33499' of git://github.com/netspotau/moodle-mod_assign 2012-07-03 02:15:57 +02:00
Eloy Lafuente (stronk7)
f1d9ceb0e4 Merge branch 'wip-MDL-33521-m24' of git://github.com/samhemelryk/moodle 2012-07-03 01:58:48 +02:00
Eloy Lafuente (stronk7)
5d16ab2bba Merge branch 'MDL-33796-master' of git://github.com/FMCorz/moodle 2012-07-03 01:04:47 +02:00
Sam Hemelryk
4f5263d969 Merge branch 'MDL-34029_upgrade_documentation' of git://github.com/davosmith/moodle 2012-07-03 10:55:29 +12:00
Sam Hemelryk
a0c400598e Merge branch 'MDL-33848' of git://github.com/netspotau/moodle-mod_assign 2012-07-03 10:20:56 +12:00
Dan Poltawski
79121bb8ef Merge branch 'wip-MDL-33948-master' of git://github.com/marinaglancy/moodle 2012-07-02 17:44:01 +08:00
Dan Poltawski
0acd31fba8 Merge branch 'MDL-34109' of git://github.com/timhunt/moodle 2012-07-02 16:42:56 +08:00
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
Marina Glancy
61a339e598 MDL-33948 mod_forum correctly passes files options to file_save_draft_area_files() 2012-07-02 14:11:55 +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
Sam Hemelryk
d75e8e3ac8 MDL-33521 css: Fixed invalid CSS in core CSS and plugin styles.css files 2012-07-02 11:34:44 +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
Tim Hunt
0f525225a1 MDL-34109 quiz cron: timelimit are timeclose of 0 are special. 
If the timelimit or timeclose of a quiz are 0, this means 'no
restriction', rather than '1970' or '0 seconds'. We need to handle these
special cases correctly in the code that looks for quiz attempts that
might be in the wrong state.
 2012-06-29 11:07:21 +01:00
Tim Hunt
240db6d8f7 MDL-34109 quiz cron: change whitespace before applying the fix. 
This commit just changes the white-space, but does not change any of the
actual code. This is so that the commit I am about to make, which will
change the code, will be easier to understand.
 2012-06-29 11:02:30 +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
Davo Smith
652cc64851 MDL-34029 update mod/upgrade.txt to include course drag and drop upload 2012-06-26 12:05:04 +01: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
Frederic Massart
50f4e23fc9 MDL-33796 Glossary: removed unused missing string 2012-06-26 14:54:56 +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
Dan Marsden
e0d90c54c0 MDL-33938 SCORM use consistant naming for maxattempt setting - match setting name with db field name to help when matching default settings 2012-06-22 21:51:04 +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