Aparup Banerjee
7d22edb6b1
Merge branch 'master_MDL-33515' of git://github.com/danmarsden/moodle
2012-06-12 11:25:17 +08:00
Aparup Banerjee
42fd396171
Merge branch 'MDL-33548' of git://github.com/timhunt/moodle
2012-06-11 13:55:20 +08:00
Eloy Lafuente (stronk7)
997c7e2744
Merge branch 'MDL-33471' of git://github.com/timhunt/moodle
2012-06-08 17:08:18 +02:00
Tim Hunt
815fcecc40
MDL-33471 quiz cron: better mtrace output for overdue handling
2012-06-08 16:02:01 +01:00
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
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
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
Sam Hemelryk
5874cc6aab
Merge branch 'MDL-32325-master' of git://github.com/FMCorz/moodle
2012-06-08 10:20:43 +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
Dan Poltawski
901f49097a
Merge branch 'MDL-33532' of git://github.com/timhunt/moodle
2012-06-07 22:23:38 +08:00
Dan Poltawski
3bc24f9aa7
Merge branch 'MDL-33517' of git://github.com/timhunt/moodle
2012-06-07 21:49:14 +08: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
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
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
7ccec1e2cf
MDL-33535 Correct typo in glossary documentation link
2012-06-07 09:17:40 +01:00
Dan Poltawski
c9978ce67b
Merge branch 'w23_MDL-33555_m23_assignfk' of git://github.com/skodak/moodle
2012-06-07 14:29:08 +08:00
Damyon Wiese
eba009ea63
MDL-33475: Fix javascript error when advanced grading is used in mod_assign
2012-06-07 10:52:05 +08:00
Damyon Wiese
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
Tim Hunt
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
Tim Hunt
f02a91fc50
MDL-33517 quiz: revise timelimit help string.
...
Thanks Helen.
2012-06-06 19:24:48 +01:00
Petr Skoda
3269c859bf
MDL-33555 fix invalid FK in mod_assign
...
There is no need to upgrade DB because we create only indexes now.
2012-06-06 10:54:40 +02:00
Dan Poltawski
de6a0dfd3d
Merge branch 'MDL-33547' of git://github.com/netspotau/moodle-mod_assign
2012-06-06 16:09:15 +08:00
Damyon Wiese
509e59ca38
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-06 15:49:37 +08:00
Dan Poltawski
7f04dd633f
Merge branch 'MDL-33088-master' of git://github.com/FMCorz/moodle
2012-06-06 13:20:59 +08:00
Frederic Massart
a8608cba3f
MDL-33088 Glossary: disabled filtering on concepts in recent activity block
2012-06-06 12:57:02 +08:00
Aparup Banerjee
bfcf1a449c
Merge branch 'wip-MDL-33527-master' of git://github.com/phalacee/moodle
2012-06-06 11:07:08 +08:00
Dan Poltawski
c89331a4ca
Merge branch 'MDL-33119' of git://github.com/timhunt/moodle
2012-06-06 10:31:12 +08:00
Frederic Massart
50d24a3c85
MDL-32325 Glossary: Entrylist print version is XHTML compliant
2012-06-06 09:55:36 +08:00
Jason Fowler
abaf245f10
MDL-33527 - Database - Fixing the ability to export database entries
2012-06-06 09:13:26 +08:00
Sam Hemelryk
f064f0fd15
Merge branch 'w23_MDL-33103_m23_dataestrict' of git://github.com/skodak/moodle
2012-06-06 11:50:19 +12:00
Sam Hemelryk
f48de74428
Merge branch 'MDL-33487' of git://github.com/danpoltawski/moodle
2012-06-06 10:06:17 +12:00
Dan Poltawski
a16757ed9c
Merge branch 'MDL-33042-master-1' of git://git.luns.net.uk/moodle
2012-06-05 12:52:39 +08:00
Dan Poltawski
ac0ad29c6f
Merge branch 'MDL-33319' of git://github.com/netspotau/moodle-mod_assign
2012-06-05 12:03:56 +08:00
Dan Poltawski
f7091beef4
Merge branch 'MDL-33485' of git://github.com/timhunt/moodle
2012-06-05 10:16:44 +08:00
Dan Poltawski
92c1f40445
MDL-31460 mod_forum: fix trailing whitespace
2012-06-05 09:34:26 +08:00
Dan Poltawski
50bc155cce
Merge branch 'MDL-31460_unsubscribe' of git://github.com/andyjdavis/moodle
2012-06-05 09:33:38 +08:00
Andrew Davis
74a37e1deb
MDL-31460 mod_forum: added some controls to mod/forum/unsubscribeall.php to prevent the removal of subscriptions the user shouldnt be able to delete
2012-06-04 09:16:21 +07:00
Eloy Lafuente (stronk7)
34570f86bc
MDL-33480 book print tool: display intro images properly
2012-06-04 01:46:53 +02:00
Petr Skoda
b208ded6cf
MDL-33103 fix mod_data E_STRICT issue in import
2012-06-02 21:39:18 +02:00
Dan Poltawski
578d7f3dbd
MDL-33487 - mod_forum: incorrect param ordering
...
Thanks to Garret Gengler for spotting it.
2012-06-01 23:35:26 +08:00
Tim Hunt
9378c99b02
MDL-33119 quiz complete report: fix placeholders in attempt string.
2012-06-01 08:45:41 -06:00
Tim Hunt
fc86f69b52
MDL-33485 quiz manual grading report: fix SQL typo.
2012-06-01 08:11:48 -06:00
Eloy Lafuente (stronk7)
dac01a7444
Merge branch 'MDL-33389_master' of git://github.com/kordan/moodle
2012-05-31 16:14:57 +02:00
Aparup Banerjee
ffbe29a6bd
Merge branch 'MDL-33140' of git://github.com/timhunt/moodle
2012-05-31 14:15:19 +08:00
Tim Hunt
602a76d86a
MDL-33140 quiz browser security: block copy/paste more
2012-05-30 14:48:39 -06:00
