mirror_php/moodle
1
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-01-31 04:33:13 +01:00
Code Issues Projects Releases Wiki Activity
60,515 Commits 36 Branches 519 Tags
Commit Graph

60515 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Eloy Lafuente (stronk7)
bd3d4c9e8d Merge branch 'MDL-38963_master' of git://github.com/dmonllao/moodle 2013-04-11 16:30:08 +02:00
Eloy Lafuente (stronk7)
33fcbe89d4 Merge branch 'MDL-38940_master' of git://github.com/dmonllao/moodle 2013-04-11 16:11:40 +02:00
Eloy Lafuente (stronk7)
c51e1fa37e Merge branch 'MDL-38957_master' of git://github.com/dmonllao/moodle 2013-04-11 15:56:45 +02:00
Eloy Lafuente (stronk7)
e9bcf8019b Merge branch 'MDL-38958_master' of git://github.com/dmonllao/moodle 2013-04-11 15:52:53 +02:00
Eloy Lafuente (stronk7)
b3661ab272 on demand release 2.5beta+ 2013-04-11 12:38:46 +02:00
Eloy Lafuente (stronk7)
f6cec2fd62 Merge branch 'install_master' of git://git.moodle.cz/moodle-install 2013-04-11 12:32:32 +02:00
David Monllao
07fd6882b8 MDL-38963 behat: New test 
According to MDLQA-113, a teacher can
set a wiki to be collaborative or
individual.
 2013-04-11 17:28:24 +08:00
David Monllao
58c2fae525 MDL-38940 behat: New test 
According to MDLQA-32, glossary entries
can be searched or browsed by alphabet,
category, date or author.
 2013-04-11 17:26:53 +08:00
David Monllao
d72a183645 MDL-38957 behat: New test 
According to MDLQA-94, a teacher can
sort questions in the question bank.
 2013-04-11 17:24:12 +08:00
David Monllao
a97d274c92 MDL-38958 behat: New test 
According to MDLQA-91, a teacher can
edit questions in the question bank.
 2013-04-11 17:23:08 +08:00
Dan Poltawski
a96eb3a55f Revert "MDL-38254 Assignment Module: add avaialble message to all assignment types" 
This reverts commit 2612e21bd4450bf94b7e5ac259e2d0b0b3bbcf7b.
 2013-04-11 16:52:25 +08:00
David Monllao
1303eb290f MDL-38958 behat: Step definitions to interact with popup windows 2013-04-11 13:58:11 +08:00
David Monllao
336b5b5914 MDL-38958 behat: Step definition to add questions 2013-04-11 11:47:03 +08:00
David Monllao
f7040fef91 MDL-38940 behat: Step definition to create glossary categories 2013-04-11 10:46:11 +08:00
Dan Poltawski
3ee53622bf Merge branch 'm25_MDL-39061_Trivial_incorrect_MD' of https://github.com/scara/moodle 2013-04-11 10:19:10 +08:00
Eloy Lafuente (stronk7)
e592ccd860 Merge branch 'MDL-38525-master' of https://github.com/damyon/moodle 2013-04-11 00:56:45 +02:00
Eloy Lafuente (stronk7)
2e140437b1 Merge branch 'MDL-38937_master' of git://github.com/dmonllao/moodle 2013-04-11 00:43:59 +02:00
Eloy Lafuente (stronk7)
2cef0f7c33 Merge branch 'MDL-38939_master' of git://github.com/dmonllao/moodle 2013-04-11 00:32:40 +02:00
Eloy Lafuente (stronk7)
a7ed1eca08 Merge branch 'MDL-38970_master' of git://github.com/dmonllao/moodle 2013-04-11 00:22:42 +02:00
Eloy Lafuente (stronk7)
b812305ef6 Merge branch 'w15_MDL-38989_m25_ttfinal' of git://github.com/skodak/moodle 2013-04-10 15:45:16 +02:00
David Monllao
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
David Monllao
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
David Monllao
6b9c866757 MDL-38939 behat: Allow admin setting to be set in non-JS sessions 2013-04-10 16:51:48 +08:00
David Monllao
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
Damyon Wiese
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
Petr Škoda
0ddd65d9e0 MDL-38989 add missing test timeout reset 2013-04-10 09:49:19 +02:00
Petr Škoda
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
Dan Poltawski
a4b524e931 Merge branch 'MDL-38973-master' of https://github.com/damyon/moodle 2013-04-10 14:48:49 +08:00
Ryan Panning
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
Dan Poltawski
95cd4369bb Merge branch 'MDL-19072' of git://github.com/jmvedrine/moodle 2013-04-10 14:10:37 +08:00
Damyon Wiese
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
Mark Nelson
1711361042 MDL-26649 forms: ensure that both necessary variables are set before altering calendar image 2013-04-10 12:48:13 +08:00
Dan Poltawski
d2b11df8bd Merge branch 'wip-mdl-35883' of git://github.com/rajeshtaneja/moodle 2013-04-10 12:16:23 +08:00
Dan Poltawski
e870c16077 Merge branch 'MDL-38254' of git://github.com/rwijaya/moodle 2013-04-10 12:08:46 +08:00
Dan Poltawski
aefd2e5d35 Merge branch 'MDL-39041-master' of git://github.com/damyon/moodle 2013-04-10 11:57:49 +08:00
Damyon Wiese
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
Damyon Wiese
f8ddbd24d7 Merge branch 'MDL-38935' of git://github.com/timhunt/moodle 2013-04-10 11:17:31 +08:00
Dan Poltawski
ac208538b7 Merge branch 'MDL-38030-master' of git://github.com/mouneyrac/moodle 2013-04-10 11:11:47 +08:00
Dan Poltawski
7f2ac368e8 Merge branch 'MDL-38933-master' of git://github.com/damyon/moodle 2013-04-10 11:09:05 +08:00
Dan Poltawski
bf11c1d128 Merge branch 'MDL-22153' of git://github.com/stronk7/moodle 2013-04-10 10:58:32 +08:00
Dan Poltawski
cfaacebb01 Merge branch 'MDL-39059-workshop-settype' of git://github.com/mudrd8mz/moodle 2013-04-10 10:55:45 +08:00
Dan Poltawski
fbd90ba191 Merge branch 'MDL-37410-master' of git://github.com/mouneyrac/moodle 2013-04-10 10:37:29 +08:00
Dan Poltawski
0bedc806f9 Merge branch 'MDL-38999' of git://github.com/stronk7/moodle 2013-04-10 10:35:40 +08:00
Petr Škoda
70faad655a MDL-38912 fix incorrect timeout reset 2013-04-10 00:06:34 +02:00
Eloy Lafuente (stronk7)
e6c7a5887b Merge branch 'MDL-38938_master' of git://github.com/dmonllao/moodle 2013-04-09 23:43:46 +02:00
Eloy Lafuente (stronk7)
3621633194 Merge branch 'MDL-38950_master' of git://github.com/dmonllao/moodle 2013-04-09 23:42:59 +02:00
Matteo Scaramuccia
67dfcb3df6 MDL-39061 Cache: (trivial) incorrect MD sublisting 2013-04-09 23:40:18 +02:00
Eloy Lafuente (stronk7)
8516f270c6 Merge branch 'MDL-38954_master' of git://github.com/dmonllao/moodle 2013-04-09 23:30:43 +02:00
Eloy Lafuente (stronk7)
696facb159 Merge branch 'MDL-38952_master' of git://github.com/dmonllao/moodle 2013-04-09 23:30:30 +02:00
Eloy Lafuente (stronk7)
b896844942 Merge branch 'MDL-38953_master' of git://github.com/dmonllao/moodle 2013-04-09 23:29:59 +02:00