a3974b0106
Merge branch 'w23_MDL-30725_m23_backuptrash' of git://github.com/skodak/moodle
2012-06-08 01:43:40 +02:00
76cc4fd177
Merge branch 'MDL-33080' of git://github.com/stronk7/moodle
2012-06-08 10:23:16 +12:00
5874cc6aab
Merge branch 'MDL-32325-master' of git://github.com/FMCorz/moodle
2012-06-08 10:20:43 +12:00
03a94794fc
Merge branch 'MDL-32985_integration' of git://github.com/merrill-oakland/moodle
2012-06-08 00:04:19 +02:00
a15e8b4101
MDL-30506 navigation: Fixed up reference handling issue and added docs post integration
2012-06-08 09:34:19 +12:00
a509cb29c3
Merge branch 'MDL-30506' of git://github.com/jonof/moodle
2012-06-08 09:04:46 +12:00
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
d9552ab44f
MDL-33393 quiz overdue handling: improve strings and add help
2012-06-07 17:33:46 +01:00
3b2465fee6
MDL-33587 Delete the reference properly in stored_file::delete()
2012-06-07 18:02:12 +02:00
1c0da8498f
MDL-33587 Improve stored_file::delete_reference() method
2012-06-07 17:37:25 +02:00
2fa8aea279
MDL-33587 Throw coding exception when trying to unlink a non-reference file
2012-06-07 17:36:29 +02:00
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
55244f8527
Merge branch 'MDL-33577' of git://github.com/timhunt/moodle
2012-06-07 23:15:45 +08:00
901f49097a
Merge branch 'MDL-33532' of git://github.com/timhunt/moodle
2012-06-07 22:23:38 +08:00
9c1fe3356f
Merge branch 'MDL-33565' of git://github.com/timhunt/moodle
2012-06-07 22:14:28 +08:00
984ec46e03
MDL-33292 Consume the new ability to move dialogues in chooser dialogues
2012-06-07 14:58:54 +01:00
3bc24f9aa7
Merge branch 'MDL-33517' of git://github.com/timhunt/moodle
2012-06-07 21:49:14 +08:00
06a78ea6a4
MDL-33292 Add ability to move (drag) M.core.dialogue
2012-06-07 14:47:33 +01:00
371409f41e
MDL-33588 Ensure that a drop target is defined before checking a drop group
2012-06-07 14:46:36 +01:00
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
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
b84477000a
MDL-33577 qtype_multianswer: Fix strict syntax warning.
2012-06-07 12:32:41 +01:00
620ecd38d2
Merge branch 'wip-MDL-33482-master' of git://github.com/danpoltawski/moodle
2012-06-07 18:11:10 +08:00
8d25aeb711
MDL-33482 Replaced modchooser with chooserdialouge and cleaned codes
2012-06-07 18:09:14 +08:00
255dd8d1e2
MDL-33482 Replaced modchooser with chooserdialogue
2012-06-07 18:09:14 +08:00
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
644495114e
Merge branch 'MDL-33475' of git://github.com/netspotau/moodle-mod_assign
2012-06-07 17:33:39 +08:00
a6eecb7c9d
Merge branch 'MDL-33535-master-1' of git://git.luns.net.uk/moodle
2012-06-07 17:25:59 +08:00
928cc791e6
MDL-33573 Remove anchor from activity chooser link until JS is ready
2012-06-07 10:15:52 +01:00
dbf7784e67
MDL-33583 really keep all automated backup files when told to do so
2012-06-07 11:05:15 +02:00
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
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
7ccec1e2cf
MDL-33535 Correct typo in glossary documentation link
2012-06-07 09:17:40 +01:00
c9978ce67b
Merge branch 'w23_MDL-33555_m23_assignfk' of git://github.com/skodak/moodle
2012-06-07 14:29:08 +08:00
ac16f14512
Merge branch 'MDL-33465-master' of git://github.com/ankitagarwal/moodle
...
Conflicts:
backup/moodle2/restore_stepslib.php
2012-06-07 14:04:08 +08:00
25f288f2fd
Merge branch 'MDL-33467' of git://github.com/timhunt/moodle
2012-06-07 13:33:22 +08:00
2960a22052
Merge branch 'MDL-33322' of git://github.com/rwijaya/moodle
2012-06-07 13:02:38 +08:00
3872cae1eb
Merge branch 'MDL-31863' of git://github.com/nebgor/moodle
2012-06-07 11:59:13 +08:00
130d3fbf96
MDL-31863 Web Service : get_files() optional $modified timestamp returns files changed after given time.
2012-06-07 11:57:19 +08:00
25ccaf5494
MDL-31863 Web service : added modified to parameters and modifiedtime to description
2012-06-07 11:56:19 +08:00
eba009ea63
MDL-33475: Fix javascript error when advanced grading is used in mod_assign
2012-06-07 10:52:05 +08:00
2d8a9ce96c
MDL-33572: Make the display of the "graded" status consistent in mod_assign
...
Do not display "graded" when the grade is set to -1.
2012-06-07 10:22:46 +08:00
4913af936f
MDL-33498: Correct use of unformat_float for mod_assign decimal grades
...
This was affecting locales that use , instead of . in floating point numbers.
2012-06-07 09:27:59 +08:00
e7fc2ff42e
MDL-27675 - Feedback module abuses data_submitted
2012-06-06 23:17:35 +02:00
98984c09a2
MDL-33565 setuplib: better error if you pass an object as $debuginfo
...
This changes makes sure the error is triggerd when the exception is
thrown, so that the problem code is in the stack-trace. Before, the
error happend in the exception hander, so you could not see the code
that caused the problem.
2012-06-06 20:33:16 +01:00
ee326d5e7d
MDL-33548 quiz manual grading: check the grade is in range.
...
To do this nicely, I refactored some code out of the quiz manual grading
report.
2012-06-06 20:21:33 +01:00
f02a91fc50
MDL-33517 quiz: revise timelimit help string.
...
Thanks Helen.
2012-06-06 19:24:48 +01:00
54c2756ca2
MDL-32985 cron: Fixing related problem with setting of lastnotifyfailure
...
Because of a flaw in the logic, lastnotifyfailure was not set unless
there was a failure. This means that after 1 hour of no failures, the
function would execute every cron cycle, which has a pretty high cost
on large sites.
2012-06-06 12:04:03 -04:00
5f9ba165de
MDL-33557 fix path in PHPUnit init hint
...
This resolves problem when execution phpunit in subdirectory.
2012-06-06 12:29:20 +02:00
2aad62e93c
MDL-33467 fixed variable name conflict
2012-06-06 11:17:07 +01:00
Eloy Lafuente (stronk7)