mirror_php/moodle
1
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-02-07 16:45:16 +01:00
Code Issues Projects Releases Wiki Activity
60,472 Commits 36 Branches 523 Tags
Commit Graph

13679 Commits

Author SHA1 Message Date
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
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
Tim Hunt
aa81e35847 MDL-38209 quiz css: fix minor regression. 2013-04-04 11:17:39 +01:00
Damyon Wiese
6ed18a6828 Merge branch 'MDL-38633' of git://github.com/stronk7/moodle 2013-04-04 14:26:15 +08:00
Damyon Wiese
b38f932abf Merge branch 'MDL-38823_master-fix' of git://github.com/dmonllao/moodle 2013-04-04 10:34:50 +08:00
Eloy Lafuente (stronk7)
0c7ad0ab13 Merge branch 'MDL-38612-master-int' of git://github.com/FMCorz/moodle 2013-04-04 01:15:34 +02:00
Eloy Lafuente (stronk7)
1b882ab87b Merge branch 'MDL-38590-master-int' of git://github.com/FMCorz/moodle 2013-04-04 01:14:36 +02:00
Eloy Lafuente (stronk7)
a37a698417 Merge branch 'MDL-38611-master-int' of git://github.com/FMCorz/moodle 2013-04-04 00:53:05 +02:00
Eloy Lafuente (stronk7)
75fb383260 Merge branch 'MDL-38599-master-int' of git://github.com/FMCorz/moodle 
Conflicts:
	mod/glossary/mod_form.php
 2013-04-04 00:51:47 +02:00
Eloy Lafuente (stronk7)
0e864c3f21 Merge branch 'MDL-38733-workshop-rubric-css' of git://github.com/mudrd8mz/moodle 2013-04-03 20:06:49 +02:00
Dan Poltawski
626403eb73 Merge branch 'MDL-38538_clean' of git://github.com/timhunt/moodle 2013-04-03 20:22:03 +08:00
Tim Hunt
000fbcf2bd MDL-38538 quiz autosave: fix language string. 
This feature does not actually provide spiritual salvation.
 2013-04-03 11:23:41 +01:00
Dan Poltawski
aed60c64af Merge branch 'MDL-36804-master' of git://github.com/damyon/moodle 2013-04-03 17:32:15 +08:00
Damyon Wiese
e84900648b MDL-36804 Assign attempt history: Fix course unit tests 
Handle missing attemptreopenmethod in add/update instance.
 2013-04-03 17:31:12 +08:00
Dan Poltawski
369496c31e Merge branch 'm25_MDL-38678_SCORM_RTE_not_required_for_SCO_Assets' of https://github.com/scara/moodle 2013-04-03 17:22:38 +08:00
Aparup Banerjee
b8eb2f3dc6 Merge branch 'm25_MDL-38745_SCORM_API_Debugging_trivial_issue' of git://github.com/scara/moodle 2013-04-03 16:48:53 +08:00
Dan Poltawski
71573249ae Merge branch 'MDL-36804-master' of git://github.com/damyon/moodle 2013-04-03 16:47:15 +08:00
Damyon Wiese
c9c34c7a65 MDL-36804 Assign attempt history - Add missing index to upgrade step. 2013-04-03 16:44:31 +08:00
Aparup Banerjee
7a2a430aa5 Merge branch 'MDL-38809' of git://github.com/timhunt/moodle 2013-04-03 16:32:42 +08:00