3de2643218
MDL-38960 behat: New test
...
According to MDLQA-111, a history of each
wiki page is available.
2013-04-12 13:22:59 +08:00
b3661ab272
on demand release 2.5beta+
2013-04-11 12:38:46 +02:00
f6cec2fd62
Merge branch 'install_master' of git://git.moodle.cz/moodle-install
2013-04-11 12:32:32 +02:00
a96eb3a55f
Revert "MDL-38254 Assignment Module: add avaialble message to all assignment types"
...
This reverts commit 2612e21bd4
2013-04-11 16:52:25 +08:00
3ee53622bf
Merge branch 'm25_MDL-39061_Trivial_incorrect_MD' of https://github.com/scara/moodle
2013-04-11 10:19:10 +08:00
e592ccd860
Merge branch 'MDL-38525-master' of https://github.com/damyon/moodle
2013-04-11 00:56:45 +02:00
2e140437b1
Merge branch 'MDL-38937_master' of git://github.com/dmonllao/moodle
2013-04-11 00:43:59 +02:00
2cef0f7c33
Merge branch 'MDL-38939_master' of git://github.com/dmonllao/moodle
2013-04-11 00:32:40 +02:00
a7ed1eca08
Merge branch 'MDL-38970_master' of git://github.com/dmonllao/moodle
2013-04-11 00:22:42 +02:00
b812305ef6
Merge branch 'w15_MDL-38989_m25_ttfinal' of git://github.com/skodak/moodle
2013-04-10 15:45:16 +02:00
fac8515d63
MDL-38970 behat: New test
...
According to MDLQA-65, a teacher can
prevent or allow assignment submission
changes.
2013-04-10 17:35:01 +08:00
9afb97a701
MDL-38939 behat: New test
...
According to MDLQA-33, a teacher can set
whether glossary entries are always editable.
2013-04-10 16:51:53 +08:00
6b9c866757
MDL-38939 behat: Allow admin setting to be set in non-JS sessions
2013-04-10 16:51:48 +08:00
8580cf8637
MDL-38937 behat: New test
...
According to MDLQA-39, a teacher can
choose whether to provide a printer-friendly
glossary entries list
2013-04-10 16:44:35 +08:00
5e92828603
MDL-38525: Assignment upgrade - Error with comments for unenrolled students.
...
Students with comments on 'upload' assignments cause errors for the upgrade
tool if they are no longer enrolled. The solution is to allow siteadmin to
see student submissions even if the student is not currently enrolled (you
must be siteadmin to run the upgrade tool).
2013-04-10 16:09:56 +08:00
0ddd65d9e0
MDL-38989 add missing test timeout reset
2013-04-10 09:49:19 +02:00
71fc50031d
MDL-38989 detect changed timeout in tests
...
The trouble is that PHPUnit should ideally test mostly low level libraries that should not change the timeouts.
2013-04-10 09:48:57 +02:00
a4b524e931
Merge branch 'MDL-38973-master' of https://github.com/damyon/moodle
2013-04-10 14:48:49 +08:00
c6d7956e55
MDL-38525: Assignment - print exception message when assignment upgrade fails.
...
Change to use getMessage() from the Exception class will prevent "{$a}" when
$e->error is null.
2013-04-10 14:38:05 +08:00
95cd4369bb
Merge branch 'MDL-19072' of git://github.com/jmvedrine/moodle
2013-04-10 14:10:37 +08:00
5ef72f85cf
MDL-38973 Assignment - Attempt history not displaying for blind marking
...
This change makes the attempt history display for teachers and students
even when there is no grade (e.g. blind marking). It also will show the previous
attempt in the grading table when a submission has been newly reopened (instead
of a blank submission).
2013-04-10 13:44:42 +08:00
1711361042
MDL-26649 forms: ensure that both necessary variables are set before altering calendar image
2013-04-10 12:48:13 +08:00
d2b11df8bd
Merge branch 'wip-mdl-35883' of git://github.com/rajeshtaneja/moodle
2013-04-10 12:16:23 +08:00
e870c16077
Merge branch 'MDL-38254' of git://github.com/rwijaya/moodle
2013-04-10 12:08:46 +08:00
aefd2e5d35
Merge branch 'MDL-39041-master' of git://github.com/damyon/moodle
2013-04-10 11:57:49 +08:00
5091b20052
MDL-39041 Assignment - Fix regression in "allow submission changes".
...
A typo was introduced in the assignment attempt history feature that broke
unlock submissions. This was detected by the new behat test in MDL-38970 (yay).
2013-04-10 11:30:41 +08:00
f8ddbd24d7
Merge branch 'MDL-38935' of git://github.com/timhunt/moodle
2013-04-10 11:17:31 +08:00
ac208538b7
Merge branch 'MDL-38030-master' of git://github.com/mouneyrac/moodle
2013-04-10 11:11:47 +08:00
7f2ac368e8
Merge branch 'MDL-38933-master' of git://github.com/damyon/moodle
2013-04-10 11:09:05 +08:00
bf11c1d128
Merge branch 'MDL-22153' of git://github.com/stronk7/moodle
2013-04-10 10:58:32 +08:00
cfaacebb01
Merge branch 'MDL-39059-workshop-settype' of git://github.com/mudrd8mz/moodle
2013-04-10 10:55:45 +08:00
fbd90ba191
Merge branch 'MDL-37410-master' of git://github.com/mouneyrac/moodle
2013-04-10 10:37:29 +08:00
0bedc806f9
Merge branch 'MDL-38999' of git://github.com/stronk7/moodle
2013-04-10 10:35:40 +08:00
70faad655a
MDL-38912 fix incorrect timeout reset
2013-04-10 00:06:34 +02:00
e6c7a5887b
Merge branch 'MDL-38938_master' of git://github.com/dmonllao/moodle
2013-04-09 23:43:46 +02:00
3621633194
Merge branch 'MDL-38950_master' of git://github.com/dmonllao/moodle
2013-04-09 23:42:59 +02:00
67dfcb3df6
MDL-39061 Cache: (trivial) incorrect MD sublisting
2013-04-09 23:40:18 +02:00
8516f270c6
Merge branch 'MDL-38954_master' of git://github.com/dmonllao/moodle
2013-04-09 23:30:43 +02:00
696facb159
Merge branch 'MDL-38952_master' of git://github.com/dmonllao/moodle
2013-04-09 23:30:30 +02:00
b896844942
Merge branch 'MDL-38953_master' of git://github.com/dmonllao/moodle
2013-04-09 23:29:59 +02:00
5bd80500f2
Merge branch 'MDL-38942_master' of git://github.com/dmonllao/moodle
2013-04-09 23:13:44 +02:00
d2f77303b0
Merge branch 'MDL-38969_master' of git://github.com/dmonllao/moodle
2013-04-09 23:13:32 +02:00
a9aa326ea9
Merge branch 'MDL-38967_master' of git://github.com/dmonllao/moodle
2013-04-09 23:13:21 +02:00
5be1be85f4
MDL-39059 Set explicit boolean type of a hidden field in workshop random allocator form
2013-04-09 21:46:18 +02:00
6bb78aedee
Merge branch 'MDL-38945_master' of git://github.com/dmonllao/moodle
2013-04-09 20:24:17 +02:00
d06700cbd6
Merge branch 'MDL-38944_master' of git://github.com/dmonllao/moodle
2013-04-09 20:23:38 +02:00
f7f8ca2420
Merge branch 'MDL-38943_master' of git://github.com/dmonllao/moodle
2013-04-09 20:22:59 +02:00
a2027b873b
Merge branch 'MDL-38822_master' of git://github.com/dmonllao/moodle
2013-04-09 20:00:34 +02:00
c1fc4ba397
Merge branch 'MDL-38820_master' of git://github.com/dmonllao/moodle
2013-04-09 19:59:45 +02:00
26b7bea2c0
Merge branch 'MDL-39012_master' of git://github.com/dmonllao/moodle
2013-04-09 19:55:29 +02:00
David Monllao