moodle/moodle
3
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-08-09 02:46:40 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
61751 commits 37 branches 544 tags 1.3 GiB
Commit graph

13945 commits

Author SHA1 Message Date
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
Dan Poltawski
5e45f6a569 Merge branch 'MDL-36804-master' of git://github.com/damyon/moodle 2013-04-03 16:18:50 +08:00
Damyon Wiese
74c9283854 MDL-36804: Assign attempt history - add upgrade.txt 2013-04-03 16:16:21 +08:00
Dan Poltawski
89ea5ecd45 Merge branch 'MDL-37602-workshop-overall-feedback' of git://github.com/mudrd8mz/moodle 2013-04-03 15:39:48 +08:00
Damyon Wiese
b64a05b996 MDL-26644 Course - Remove completion tracking begins on enrolment setting from behat. 2013-04-03 15:30:49 +08:00
David Mudrák
5582ea0a9b MDL-37602 Fix broken workshop unit tests 2013-04-03 09:28:11 +02:00
Damyon Wiese
9855770d6c Merge branch 'MDL-38610-master-int' of git://github.com/FMCorz/moodle 2013-04-03 14:48:06 +08:00
Damyon Wiese
fab5cb3604 MDL-36804: Assign resubmission history - remove locked/mailed 
Remove locked/mailed flags from the grade record in the unit tests.
It just would not have done anything because the columns dont exist.
 2013-04-03 14:17:00 +08:00
David Monllao
7a6204ce1d MDL-38823 behat: Fixing related scenarios 2013-04-03 13:56:31 +08:00
Dan Poltawski
f27be4c1aa Merge branch 'MDL-37602-workshop-overall-feedback' of git://github.com/mudrd8mz/moodle 2013-04-03 12:30:12 +08:00
Damyon Wiese
5423f9a0af Merge branch 'MDL-38712-master' of git://github.com/danpoltawski/moodle 2013-04-02 16:14:44 +08:00
Dan Poltawski
899fd9372f Merge branch 'master_MDL-38715' of git://github.com/danmarsden/moodle 2013-04-02 16:11:01 +08:00
Damyon Wiese
95bef9d170 MDL-36804 Assign: Fix undeclared global $USER and undefined variable $userid 2013-04-02 13:44:25 +08:00
Damyon Wiese
3a9dc7f22f MDL-36804 Assign submission history - One language string change. 2013-04-02 13:37:51 +08:00
Damyon Wiese
7b647abcb8 MDL-36804 Assignment submisison history - fix width column 
Fix the width of the left column in the history and submission tables so
they all line up on the page.
 2013-04-02 13:37:51 +08:00
Damyon Wiese
a13fbf5fe8 MDL-36804 Assignment - Make sure webservice only returns the last submission/grade. 2013-04-02 13:37:51 +08:00
Damyon Wiese
df211804f1 MDL-36804 mod_assign - allow students to resubmit work and display a submission + grading history 
This is based on work by Davo Smith with input from Fernando Oliveira (Thanks guys!).
 2013-04-02 13:37:51 +08:00
Dan Poltawski
bf9613dd41 Merge branch 'MDL-38538_clean' of git://github.com/timhunt/moodle 2013-04-02 11:27:32 +08:00
Eloy Lafuente (stronk7)
12879418e9 Merge branch 'MDL-38823_master' of git://github.com/dmonllao/moodle 
Conflicts:
	mod/forum/tests/behat/behat_mod_forum.php
 2013-04-02 01:47:40 +02:00
Eloy Lafuente (stronk7)
0f8fd3a7eb Merge branch 'MDL-38477_master' of git://github.com/dmonllao/moodle 2013-04-02 01:06:18 +02:00
Eloy Lafuente (stronk7)
2bb24f16e0 Merge branch 'MDL-38476_master' of git://github.com/dmonllao/moodle 2013-04-02 01:06:05 +02:00
Eloy Lafuente (stronk7)
55a2081d28 Merge branch 'MDL-38475_master' of git://github.com/dmonllao/moodle 2013-04-02 01:04:44 +02:00
Eloy Lafuente (stronk7)
c1bccc8ef5 Merge branch 'MDL-38439_master' of git://github.com/dmonllao/moodle 2013-04-02 01:04:31 +02:00
Eloy Lafuente (stronk7)
9f0700fb6c Merge branch 'MDL-38437_master' of git://github.com/dmonllao/moodle 2013-04-02 01:03:26 +02:00
Eloy Lafuente (stronk7)
d4a5896f8a Merge branch 'MDL-38817_master' of git://github.com/dmonllao/moodle 2013-04-01 13:25:31 +02:00
David Monllao
be0e1825d3 MDL-38823 behat: New test 
According to MDLQA-521, a teacher can set a certain
number of discussions as a completion condition for
a forum.
 2013-04-01 17:52:46 +08:00
David Monllao
125765ed18 MDL-38437 behat: Behat feature for mod_forum 
Basic add an activity, MDLQA-2 (students
can edit or delete their forum posts within
a set time limit).
 2013-04-01 16:27:16 +08:00
David Monllao
74508a5ddb MDL-38437 behat: Step definition to add a discussion 2013-04-01 16:27:09 +08:00
David Monllao
424f56fc90 MDL-38817 behat: New test 
According to MDLQA-50, in a survey activity
a teacher can set three types of survey
 2013-04-01 13:57:01 +08:00
prateeksachan
f7884095de MDL-38361: Fixed typos in mod/assign/locallib.php 2013-03-30 23:39:56 +05:30
Tim Hunt
0561fdf167 MDL-38809 quiz manual grading: delete expensive unnecssary code. 2013-03-30 17:25:52 +00:00
Matteo Scaramuccia
fd10686843 MDL-38745 SCORM: fixed appending 'API logging is on|off', once per launch 2013-03-28 22:28:06 +01:00
Matteo Scaramuccia
cc351edaf0 MDL-38745 SCORM: fixed doubling double quotes for 'even' and 'odd' 2013-03-28 22:28:03 +01:00
Matteo Scaramuccia
fe104762c9 MDL-38678 SCORM: Runtime Environment (RTE) checks not required in case of SCO Assets 2013-03-28 22:22:19 +01:00
Tim Hunt
595708884a MDL-38538 quiz auto-save front end. 
1. There is a new admin setting to control whether this feature is
enabled. The admin can set the auto-save frequency to 1, 2 or 5 minutes,
or disable it.

2. When autosave is enabled, there is code in the quiz that monitors the
main quiz form, and does an ajax save call at the given frequency when
changes are being made by the student.

3. The ajax saves go to a new script that calls the question engine to
do the work.

4. To avoid simultaneous autosave + submit and finish, the auto-save
system shuts down shortly before time expires in a timed quiz.
 2013-03-28 16:57:24 +00:00
Eloy Lafuente (stronk7)
35601d77f9 MDL-38633 folder: support show_expanded in backup. 2013-03-28 17:00:46 +01:00
Frederic Massart
8783e17b0f MDL-38590 data: Reformat settings form 
AMOS BEGIN
 CPY [allowcomments,mod_glossary],[allowcomments,mod_data]
AMOS END
 2013-03-28 10:53:58 +08:00