54808 Commits

Author SHA1 Message Date
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
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
Petr Škoda
541ca062f1 MDL-34130 test nested recordset iteration 2012-07-01 21:23:37 +02:00
Petr Škoda
401793a36d MDL-34130 fix data inserts in recordset tests 2012-07-01 21:23:21 +02:00
Petr Škoda
afe1cf72a0 MDL-34125 fix regression when deleting activity modules
Credit goes to Gordon Bateson.
2012-07-01 10:04:54 +02:00
AMOS bot
f86830ad0c Automatically generated installer lang files 2012-07-01 00:31:36 +00:00
Eloy Lafuente (stronk7)
ba4e17574f Merge branch 'MDL-32249c' of github.com:srynot4sale/moodle 2012-07-01 02:02:56 +02:00
Eloy Lafuente (stronk7)
f6653bfd47 Merge branch 'MDL-31201' of git://github.com/danpoltawski/moodle 2012-06-30 22:00:34 +02:00
Petr Škoda
3cbad151af MDL-34123 use user's lang when sending new emails 2012-06-30 20:46:04 +02:00
Petr Škoda
66c528d2ac MDL-34036 fix course role user selector 2012-06-30 15:39:12 +02:00
Petr Škoda
3f4a299936 MDL-34121 drop unused backup tables that were supposed to be dropped long ago
The backup/restore leftovers that referenced these will be dropped in 2.4
2012-06-30 13:58:51 +02:00
Mary Evans
4097797fcd MDL-34119_M23 theme_splash: Added colourswitcher.js and associated code in layout files and lib.php 2012-06-30 12:42:59 +01:00
Dan Poltawski
609541df30 MDL-34081 dml: mssql driver was using case insensitve sql 2012-06-30 18:56:57 +08:00
Petr Škoda
8205498fa0 MDL-34120 do not try to create new passwords for incorrectly deleted users
There is still some code that ignores delete_user() and instead hacks the user table directly, skip the borked user records for now when sending new passwords.
2012-06-30 08:55:39 +02:00
Petr Škoda
0004317f79 MDL-33876 skip deleted users in enrol_database sync 2012-06-30 08:42:16 +02:00
Petr Škoda
c82d309d07 MDL-34115 fix sorting in blocks admin UI
Comparison of arrays is not locale aware.
2012-06-30 08:33:34 +02:00
Petr Škoda
81f3d7a76c MDL-34045 fix invalid idnumber field type in cohort form 2012-06-30 07:50:38 +02:00
Mary Evans
44ca33e489 MDL-34119_M23 theme_splash: removed redundant js call in lib.php. Added lang option to config.php + amended lang output in layout files. Added some css to style langmenu + removed redundant loginicon in pagelayout.css 2012-06-30 01:07:14 +01: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
Aparup Banerjee
8128e0c88b MDL-23254 Authentication : used httpswwwroot as root url during authentication procedure where $PAGE->https_required() is specified. 2012-06-28 15:32:33 +08:00
Adam Olley
51591b2c0e MDL-31802: Remove section summaries from navigation_cache 2012-06-28 11:04:41 +09:30
AMOS bot
d53d164771 Automatically generated installer lang files 2012-06-28 00:31:24 +00:00
Jerome Mouneyrac
2a7a021695 MDL-33995 Course external PHPunit test + externallib_testcase helper class 2012-06-27 16:24:22 +08:00