Commit graph

54494 commits

Author SHA1 Message Date
Dan Marsden
e099166635 MDL-33515 SCORM - attempts grading setting is confusing - last attempt is really last completed attempt. 2012-06-08 20:33:38 +12:00
Dan Poltawski
ec3d3ede80 MDL-33465 - bump version number for new log entry defintion 2012-06-08 15:54:31 +08:00
Dan Poltawski
4e020fe71d Merge branch 'MDL-33465-master' of git://github.com/ankitagarwal/moodle 2012-06-08 15:51:41 +08:00
Ankit Agarwal
283ba570c0 MDL-33465 course: COALESCE is not cross-db compatible while using fields of different datatypes 2012-06-08 15:48:18 +08:00
Dan Poltawski
dcac0787b9 Revert "MDL-31863 Web service : added modified to parameters and modifiedtime to description"
This reverts commit 25ccaf5494.
2012-06-08 15:25:40 +08:00
Dan Poltawski
c13dcf934e Revert "MDL-31863 Web Service : get_files() optional $modified timestamp returns files changed after given time."
This reverts commit 130d3fbf96.
2012-06-08 15:25:34 +08:00
Dan Poltawski
c9d7e6fa16 Merge branch 'MDL-33498' of git://github.com/netspotau/moodle-mod_assign 2012-06-08 13:39:17 +08:00
Jason Fowler
d508e71d4c MDL-33594 - Glossary - fixing portfolio exports 2012-06-08 13:32:44 +08:00
Dan Poltawski
b63084a58b MDL-33594 mod_data: use filelib rather than speciifc internal file 2012-06-08 13:31:31 +08:00
Frederic Massart
98d5bad9fa MDL-31499 Filepicker: download all function uses iframe instead of popup 2012-06-08 12:32:39 +08:00
Jerome Mouneyrac
3297d57528 MDL-33581 missing parameter defaults for some external functions 2012-06-08 11:54:59 +08:00
Dan Poltawski
8ac226d23c Merge branch 'MDL-33587-delete-alias' of git://github.com/mudrd8mz/moodle 2012-06-08 11:40:56 +08:00
Dan Poltawski
e13388c1c0 MDL-32783 quiz overdue handling: improve lang string
And remove a stray #
2012-06-08 10:47:31 +08:00
Dan Poltawski
583c698ee1 Merge branch 'MDL-32783' of git://github.com/timhunt/moodle 2012-06-08 10:36:17 +08:00
Dan Poltawski
3970a4719c MDL-33593 course: rename editingenabled param
Change to notifyeditingon to better reflect what it does and
prevent people getting confused with edit=1
2012-06-08 10:21:58 +08:00
Eloy Lafuente (stronk7)
61aaad4833 Merge branch 'w23_MDL-33583_m23_keepall' of git://github.com/skodak/moodle 2012-06-08 01:56:06 +02:00
Sam Hemelryk
c224cc643b Merge branch 'w23_MDL-33557_m23_initpath' of git://github.com/skodak/moodle 2012-06-08 11:53:43 +12:00
Eloy Lafuente (stronk7)
a3974b0106 Merge branch 'w23_MDL-30725_m23_backuptrash' of git://github.com/skodak/moodle 2012-06-08 01:43:40 +02:00
Sam Hemelryk
76cc4fd177 Merge branch 'MDL-33080' of git://github.com/stronk7/moodle 2012-06-08 10:23:16 +12:00
Sam Hemelryk
5874cc6aab Merge branch 'MDL-32325-master' of git://github.com/FMCorz/moodle 2012-06-08 10:20:43 +12:00
Eloy Lafuente (stronk7)
03a94794fc Merge branch 'MDL-32985_integration' of git://github.com/merrill-oakland/moodle 2012-06-08 00:04:19 +02:00
Sam Hemelryk
a15e8b4101 MDL-30506 navigation: Fixed up reference handling issue and added docs post integration 2012-06-08 09:34:19 +12:00
Sam Hemelryk
a509cb29c3 Merge branch 'MDL-30506' of git://github.com/jonof/moodle 2012-06-08 09:04:46 +12:00
Tim Hunt
a6866c7e9f MDL-32783 quiz overdue handling: enforce end of grace period
The summary page was not enforcing the end of the grace period. If the
user had the summary page open, then they coudl still stubmit after the
end of the grace period.

Also, the editing form was not validating that the quiz grace period was
greater than quiz|graceperiodmin in the quiz configuration, and that
should be checked, so I added it.

I fear that processattempt.php is becoming very spaghetti-like with all
the timing rules, it really needs to be refactored, but not 2 weeks
before the 2.3 release. (When refactoring, we really need unit tests for
this.)
2012-06-07 19:17:07 +01:00
Tim Hunt
d9552ab44f MDL-33393 quiz overdue handling: improve strings and add help 2012-06-07 17:33:46 +01:00
David Mudrak
3b2465fee6 MDL-33587 Delete the reference properly in stored_file::delete() 2012-06-07 18:02:12 +02:00
David Mudrak
1c0da8498f MDL-33587 Improve stored_file::delete_reference() method 2012-06-07 17:37:25 +02:00
David Mudrak
2fa8aea279 MDL-33587 Throw coding exception when trying to unlink a non-reference file 2012-06-07 17:36:29 +02:00
David Mudrak
2d2c194bbe MDL-33587 Add unit tests for stored_file::delete_reference()
The first unit test forces the File API to be more picky as any sane
core API should be. The second one illustrates the buggy behaviour of
the current implementation of delete_reference(). They both fail at the
moment, of course...
2012-06-07 17:36:23 +02:00
Dan Poltawski
55244f8527 Merge branch 'MDL-33577' of git://github.com/timhunt/moodle 2012-06-07 23:15:45 +08:00
Dan Poltawski
901f49097a Merge branch 'MDL-33532' of git://github.com/timhunt/moodle 2012-06-07 22:23:38 +08:00
Dan Poltawski
9c1fe3356f Merge branch 'MDL-33565' of git://github.com/timhunt/moodle 2012-06-07 22:14:28 +08:00
Andrew Robert Nicols
984ec46e03 MDL-33292 Consume the new ability to move dialogues in chooser dialogues 2012-06-07 14:58:54 +01:00
Dan Poltawski
3bc24f9aa7 Merge branch 'MDL-33517' of git://github.com/timhunt/moodle 2012-06-07 21:49:14 +08:00
Andrew Robert Nicols
06a78ea6a4 MDL-33292 Add ability to move (drag) M.core.dialogue 2012-06-07 14:47:33 +01:00
Andrew Robert Nicols
371409f41e MDL-33588 Ensure that a drop target is defined before checking a drop group 2012-06-07 14:46:36 +01:00
Damyon Wiese
a2d1d76961 MDL-33547: Fix for mod_assign portfolio export for a list of files.
This will fix any submission or feedback plugin using render_area_files
to show a list of files.
2012-06-07 14:46:36 +01:00
Tim Hunt
7f5f384477 MDL-33532 quiz editing: let uses enter locale floats.
So, for example, Croatian users can set the maximum grade to 65,5.
2012-06-07 12:55:53 +01:00
Tim Hunt
b84477000a MDL-33577 qtype_multianswer: Fix strict syntax warning. 2012-06-07 12:32:41 +01:00
Dan Poltawski
620ecd38d2 Merge branch 'wip-MDL-33482-master' of git://github.com/danpoltawski/moodle 2012-06-07 18:11:10 +08:00
Barbara Ramiro
8d25aeb711 MDL-33482 Replaced modchooser with chooserdialouge and cleaned codes 2012-06-07 18:09:14 +08:00
Andrew Robert Nicols
255dd8d1e2 MDL-33482 Replaced modchooser with chooserdialogue 2012-06-07 18:09:14 +08:00
Barbara Ramiro
89e00e91cd MDL-33482 Activity Chooser styled similar to Filepicker particularly the look and feel with drop shadow 2012-06-07 18:09:14 +08:00
Dan Poltawski
644495114e Merge branch 'MDL-33475' of git://github.com/netspotau/moodle-mod_assign 2012-06-07 17:33:39 +08:00
Dan Poltawski
a6eecb7c9d Merge branch 'MDL-33535-master-1' of git://git.luns.net.uk/moodle 2012-06-07 17:25:59 +08:00
Andrew Robert Nicols
928cc791e6 MDL-33573 Remove anchor from activity chooser link until JS is ready 2012-06-07 10:15:52 +01:00
Petr Skoda
dbf7784e67 MDL-33583 really keep all automated backup files when told to do so 2012-06-07 11:05:15 +02:00
Petr Skoda
096702f698 MDL-30725 save automated external only backups directly to ext storage, do not pollute file pool
This solution is based on code by Tony Levi, thanks!
2012-06-07 10:49:48 +02:00
Dan Poltawski
d9d59e3911 MDL-33551 googleapi: allow multiple uploads in one session
We need to clear state between multiple uploads
2012-06-07 16:38:10 +08:00
Andrew Robert Nicols
7ccec1e2cf MDL-33535 Correct typo in glossary documentation link 2012-06-07 09:17:40 +01:00