mirror_php/moodle
1
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-03-24 09:30:17 +01:00
Code Issues Projects Releases Wiki Activity
60,505 Commits 36 Branches 527 Tags
Commit Graph

13697 Commits

Author SHA1 Message Date
prateeksachan
1bd6a2d051 MDL-38794 passed overflowdiv parameter 2013-04-17 20:35:52 +05:30
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
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
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
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
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
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
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
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)
5bd80500f2 Merge branch 'MDL-38942_master' of git://github.com/dmonllao/moodle 2013-04-09 23:13:44 +02:00
Eloy Lafuente (stronk7)
d2f77303b0 Merge branch 'MDL-38969_master' of git://github.com/dmonllao/moodle 2013-04-09 23:13:32 +02:00
Eloy Lafuente (stronk7)
a9aa326ea9 Merge branch 'MDL-38967_master' of git://github.com/dmonllao/moodle 2013-04-09 23:13:21 +02:00
David Mudrák
5be1be85f4 MDL-39059 Set explicit boolean type of a hidden field in workshop random allocator form 2013-04-09 21:46:18 +02:00
David Monllao
9bfdaaa541 MDL-38938 behat: New test 
According to MDLQA-38, a teacher can
choose whether to allow duplicate
entries in a glossary.
 2013-04-09 16:02:16 +08:00
David Monllao
00d373efc5 MDL-38938 behat: Step definition to add glossary entries 2013-04-09 16:01:43 +08:00
David Monllao
eb18e0232f MDL-38967 behat: New test 
According to MDLQA-58, in an assignment
students can upload files for assessment.
 2013-04-09 10:50:29 +08:00
Dan Poltawski
fadec475d4 Merge branch 'MDL-38766/master' of github.com:kemitix/moodle 2013-04-09 10:37:23 +08:00
David Monllao
912a46dbce MDL-38969 behat: New test 
According to MDLQA-59, in an assignment
students can add and edit text online.
 2013-04-09 10:32:05 +08:00
Dan Poltawski
b11c74f492 Merge branch 'wip-MDL-38541-m25' of git://github.com/marinaglancy/moodle 2013-04-09 09:47:47 +08:00
Marina Glancy
4202471a36 MDL-38541 Make sure course cache is cleared properly during upgrade 
- Core upgrade MUST NOT call rebuild_course_cache() at all - update DB directly instead
- Plugins MUST call rebuild_course_cache(.., TRUE) for clearing the course cache and can not update DB directly
- Plugins MUST NOT call rebuild_course_cache() unless for clearing the cache
- Created function upgrade_ensure_not_running() to be included in other functions that can not be used during upgrade
 2013-04-09 11:31:18 +10:00
David Monllao
ad2f644087 MDL-38942 behat: New test 
According to MDLQA-4582, a teacher can
set a group assignment.
 2013-04-08 17:33:37 +08:00
Tim Hunt
a6f849cbe6 MDL-38935 quiz autosave: save HTML editor contents. 
Also, ignore changes in scrollpos.
 2013-04-08 10:29:58 +01:00
Dan Poltawski
bf48be3c7c Merge branch 'MDL-38634' of git://github.com/rlorenzo/moodle 2013-04-08 11:55:55 +08:00
Tim Lock
be47011d3c MDL-35868: quiz: Use correct attemptnumber when a last attempt exists. 2013-04-08 11:09:04 +08:00
Rex Lorenzo
1207ae1a34 MDL-38634 folder: Problems displaying multiple folder resources inline in the course page 2013-04-07 17:28:24 -07:00
Eloy Lafuente (stronk7)
c1782ec626 MDL-22153 backup: delete old, unused, 1.9 files 2013-04-07 17:20:41 +02:00
Dan Poltawski
8b8641876b Merge branch 'MDL-36804-fix3' of git://github.com/damyon/moodle 2013-04-05 16:43:43 +08:00
Damyon Wiese
9f014461db MDL-36804 Assign attempt history: Submit button missing 2013-04-05 16:40:16 +08:00
Paul Campbell
4f6c447be1 MDL-38766 wiki2.0: fix redirects 
Signed-off-by: Paul Campbell <pcampbell@carnegiecollege.ac.uk>
 2013-04-05 09:36:46 +01:00
Dan Poltawski
31f2822a5e Merge branch 'MDL-36804-master-fix2' of git://github.com/damyon/moodle 2013-04-05 16:00:35 +08:00
Damyon Wiese
e7af192606 MDL-36804 Assign history: Fix automatic coding error when using auto-reopen method 
This fix should call the gradebook function is_passed - but the gradebook is returning a record with
not enough information to create an instance of grade_grade.
 2013-04-05 15:53:38 +08:00
Dan Poltawski
c39896e85d Revert "MDL-38678 SCORM: Runtime Environment (RTE) checks not required in case of SCO Assets" 
This reverts commit fe104762c9acb0e178ae1d5ffe514c8109f48f0a.
 2013-04-05 14:34:07 +08:00
Damyon Wiese
f39aaadb35 MDL-38933 Assign - improved wording for help string. 2013-04-05 14:20:45 +08:00
Damyon Wiese
a8fdb36cf2 MDL-36804 Assignment attempt history: Fix warning on saving a new grade. 
This is a fix for the case when there is a submission but no grade.
 2013-04-05 10:03:00 +08:00
Tim Hunt
e3485c5f75 MDL-38538 quiz autosave: fix JavaScript errors. 
1. Make cancelling the delay more robust.
2. Ignore changes in flag state. They are already saved using AJAX.
3. Typo that caused an error when there was no TinyMCE on the page.
 2013-04-04 12:32:54 +01:00