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,793 Commits 36 Branches 519 Tags
Commit Graph

54793 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Sam Hemelryk
fc8931e457 Merge branch 'MDL-34033' of git://github.com/danpoltawski/moodle 2012-07-03 10:27:16 +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
Sam Hemelryk
a8d40508e9 Merge branch 'MDL-28151' of git://github.com/danpoltawski/moodle 2012-07-03 10:13:12 +12:00
Eloy Lafuente (stronk7)
a788105e13 Merge branch 'MDL-23813' of git://github.com/timhunt/moodle 2012-07-02 23:50:39 +02:00
Sam Hemelryk
30141a875e Merge branch 'MDL-23254' of git://github.com/nebgor/moodle 2012-07-03 09:42:08 +12:00
Eloy Lafuente (stronk7)
43a6a288b4 Merge branch 'mssql-case-sensitive' of git://github.com/danpoltawski/moodle 2012-07-02 21:05:08 +02:00
Tim Hunt
ff8c5fda48 MDL-23813 glossary filter: add missing YUI dependency 
Fix found by Huy Hoang. I am just making a commit.
 2012-07-02 17:50:00 +01:00
Eloy Lafuente (stronk7)
44cb29a063 MDL-34121 bump versions to efectively get the upgrade performed. 2012-07-02 18:15:47 +02:00
Eloy Lafuente (stronk7)
d207a888ba Merge branch 'w27_MDL-34121_m24_killbackupmess' of git://github.com/skodak/moodle 2012-07-02 18:12:57 +02:00
Tim Hunt
5415d91e20 MDL-34145 postgres driver: fix get_tables perf on <= 9.0 
The query of the information_schema view seems to be painfully slow on
older versions of postgres (2000ms instead of 20ms). Therefore, it is
worth detecting that case, and using a more postgres specific feedback.
This is particularly important for 2.3+ unit tests.

Thanks to Petr Skoda for his help with this.
 2012-07-02 16:19:00 +01: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
6cad0dddd7 Merge branch 'MDL-33916-master-2' of git://git.luns.net.uk/moodle 2012-07-02 17:35:46 +08:00
Dan Poltawski
2d9c0d1174 MDL-31802 - navigation: add a comment about session reduction 2012-07-02 17:30:26 +08:00
Dan Poltawski
539f2381f6 Merge branch 'MDL-31802' of git://github.com/aolley/moodle 2012-07-02 17:24:48 +08:00
Dan Poltawski
fc7f44a961 Merge branch 'wip-MDL-34117-master' of git://github.com/marinaglancy/moodle 2012-07-02 17:09:44 +08:00
Dan Poltawski
6fa25ccd26 Merge branch 'w27_MDL-34120_m24_delpass' of git://github.com/skodak/moodle 2012-07-02 16:48:22 +08:00
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
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
Dan Poltawski
1e1af1cd15 Merge branch 'MDL-31987_assignment' of git://github.com/rwijaya/moodle 2012-07-02 15:12:39 +08: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
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