mirror_php/moodle
1
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-01-19 06:18:28 +01:00
Code Issues Projects Releases Wiki Activity
54,959 Commits 36 Branches 519 Tags
Commit Graph

54959 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Dan Poltawski
f8425a1d31 Merge branch 'w27_MDL-34125_m24_tablename' of git://github.com/skodak/moodle 2012-07-02 16:46:21 +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
1363416735 Merge branch 'w27_MDL-34045_m24_idnumber' of git://github.com/skodak/moodle 2012-07-02 16:34:11 +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
b96c32fbef Merge branch 'master_MDL-33835' of git://github.com/danmarsden/moodle 2012-07-02 16:09:59 +08:00
Dan Poltawski
b8b82c051d Merge branch 'MDL-33780' of git://github.com/timhunt/moodle 2012-07-02 16:07:13 +08:00
Dan Poltawski
09d6d58235 Merge branch 'wip-MDL-33721-master' of git://github.com/marinaglancy/moodle 2012-07-02 16:00:06 +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
cef245ae48 Merge branch 'MDL-32605-master' of git://github.com/ankitagarwal/moodle 2012-07-02 15:45:54 +08:00
Rossiani Wijaya
32bb764891 MDL-33030 Lesson module: fixed progress bar 2012-07-02 15:43:32 +08:00
Dan Poltawski
1f1de4f6da Merge branch 'MDL-25476_email_from_support' of git://github.com/andyjdavis/moodle 2012-07-02 15:41:16 +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
Rajesh Taneja
4387f13821 MDL-33943 tool_replace: Hardcoded strings replaced with lang strings 2012-07-02 15:15:58 +08:00
Dan Poltawski
1e1af1cd15 Merge branch 'MDL-31987_assignment' of git://github.com/rwijaya/moodle 2012-07-02 15:12:39 +08:00
Davo Smith
970f0c0a36 MDL-34107 Upload repository - do not add a dot to files without an extension 2012-07-02 08:10:24 +01:00
David Mudrák
d5d2e3531f MDL-34019 Fix response item key name 2012-07-02 15:02:58 +08:00
Dan Poltawski
337b34fac0 Merge branch 'MDL-34054' of git://github.com/timhunt/moodle 2012-07-02 14:56:50 +08:00
Dan Poltawski
1b1ad55b9f MDL-33995 - unit tests: fix class name collision 2012-07-02 14:53:32 +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
Rajesh Taneja
ba0dde9785 MDL-29969 Administration: Default value for numsections is set to 1 for site frontpage 2012-07-02 14:26:15 +08:00
David Balch
c7aed1e11b MDL-34063 XHTML files should use the HTML icon, not the markup icon 2012-07-02 14:25:56 +08:00
Dan Poltawski
9bf41fb6aa Merge branch 'MDL-33776' of git://github.com/mouneyrac/moodle 2012-07-02 14:12:53 +08:00
Marina Glancy
b2dbfa90cc MDL-34117 Correctly pass accepted_types to dnduploader 2012-07-02 14:12:31 +08:00
Marina Glancy
81c4a77827 MDL-34047 repository URL downloader must say that it returns only images 2012-07-02 14:12:20 +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
Marina Glancy
3b6629c088 MDL-33948 file_save_draft_area_files() validates if references are allowed and allows unlimited file size 2012-07-02 14:11:55 +08:00
Marina Glancy
adbb904b9c MDL-33837 picking file from server files should not copy 'Main file' property 2012-07-02 14:11:39 +08:00
Marina Glancy
4e02810b38 MDL-33721 show loading icon after file has been selected in filepicker, prevent clicking select button twice 2012-07-02 14:11:32 +08:00
Dan Poltawski
c6ace6b16a Merge branch 'MDL-33995' of git://github.com/mouneyrac/moodle 2012-07-02 14:09:13 +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
103a53473f Merge branch 'MDL-33686_options' of git://github.com/andyjdavis/moodle 2012-07-02 14:53:31 +12: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
bbfa552c7b Merge branch 'MDL-33627_master' of git://github.com/grabs/moodle 2012-07-02 14:06:14 +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
Frederic Massart
c947ea3e3f MDL-33303 Filepicker: resized to match HTML editor and made resizable 2012-07-02 11:34:34 +12:00
Eloy Lafuente (stronk7)
d71b79a406 weekly release 2.4dev 2012-07-02 00:55:18 +02:00
Eloy Lafuente (stronk7)
15c9acb21a Merge branch 'install_master' of git://github.com/amosbot/moodle 2012-07-02 00:39:51 +02:00
Eloy Lafuente (stronk7)
6e4c643101 Merge branch 'MDL-34119_master' of git://github.com/lazydaisy/moodle 2012-07-02 00:30:46 +02:00
Sam Hemelryk
abb98b8881 Merge branch 'MDL-34044' of git://github.com/srynot4sale/moodle 2012-07-02 08:22:45 +12:00
Eloy Lafuente (stronk7)
cf16aed6f7 Merge branch 'w27_MDL-34130_m24_recordsettests' of git://github.com/skodak/moodle 2012-07-01 21:58:59 +02:00
Petr Škoda
c56cdae977 MDL-34130 prevent some warning in PHPStorm 2012-07-01 21:50:36 +02:00
Petr Škoda
3b5f6e6c2a MDL-34130 test recordset data is static 
We do not want recordset results to be affected by subsequent update or delete queries.
 2012-07-01 21:35:37 +02:00
Petr Škoda
4993d5fe00 MDL-34130 add missing rs close 
Thanks Eloy!
 2012-07-01 21:24:13 +02:00
Petr Škoda
e1defa2ed5 MDL-34130 test interaction of recordsets and transactions 2012-07-01 21:23:54 +02:00