mirror_php/moodle
1
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-01-18 22:08:20 +01:00
Code Issues Projects Releases Wiki Activity
60,048 Commits 36 Branches 519 Tags
Commit Graph

13591 Commits

Author SHA1 Message Date
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
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
David Monllao
2d9cbe8807 MDL-38477 behat: New test 
According to MDLQA-16, teachers can edit
or delete any forum post.
 2013-03-27 16:51:01 +08:00
David Monllao
22d56e46f1 MDL-38476 behat: New test 
According to MDLQA-9, in a single
simple discussion forum only teachers
can start discussions.
 2013-03-27 16:49:59 +08:00
David Monllao
a394e57849 MDL-38475 behat: New test 
According to MDLQA-5, students can choose
from 4 discussion display options and their
choice is remembered.
 2013-03-27 16:47:56 +08:00
David Monllao
68834d4a0d MDL-38475 behat: Step definition to reply a discussion 2013-03-27 16:47:55 +08:00
David Monllao
9449cf8e11 MDL-38439 behat: New test 
According to MDLQA-3, a teacher can
set one of 3 possible options for
tracking read forum posts.
 2013-03-27 16:46:41 +08:00
David Monllao
e6cb6aed64 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-03-27 16:45:01 +08:00
David Monllao
279d86943b MDL-38437 behat: Step definition to add a discussion 2013-03-27 16:45:01 +08:00
Aparup Banerjee
8963212472 Merge branch 'MDL-38632' of git://github.com/stronk7/moodle 2013-03-27 13:07:10 +08:00
Damyon Wiese
ddeea94a35 Merge branch 'MDL-38736-master' of git://github.com/danpoltawski/moodle 2013-03-27 12:17:47 +08:00
Dan Poltawski
8bd1829310 MDL-38736 mod_choice: fix missing param type 2013-03-27 10:19:57 +08:00
Eloy Lafuente (stronk7)
49ef0c56ef Merge branch 'MDL-38552-master' of git://github.com/FMCorz/moodle 2013-03-27 01:51:35 +01:00
Eloy Lafuente (stronk7)
cf140de945 Merge branch 'MDL-38557' of git://github.com/timhunt/moodle 
Conflicts:
	lib/db/upgrade.php
	version.php
 2013-03-26 23:38:07 +01:00
Eloy Lafuente (stronk7)
b741fac308 Merge branch 'MDL-38651' of git://github.com/timhunt/moodle 2013-03-26 23:27:16 +01:00
Eloy Lafuente (stronk7)
d89eed6fca Merge branch 'MDL-38647' of git://github.com/timhunt/moodle 2013-03-26 23:22:25 +01:00
Damyon Wiese
3dbfd15872 Merge branch 'm25_MDL-38336_SCORM_TOC_links_when_Display_course_structure_is_on' of https://github.com/scara/moodle 2013-03-26 15:40:04 +08:00
Damyon Wiese
d0fd9726d1 Merge branch 'MDL-30438_b' of git://github.com/rwijaya/moodle 2013-03-26 14:29:57 +08:00
Damyon Wiese
8af0dffb50 Merge branch 'MDL-34311-master' of git://github.com/danpoltawski/moodle 
Conflicts:
	course/moodleform_mod.php
	lib/upgrade.txt
 2013-03-26 13:46:29 +08:00
Damyon Wiese
1e425d185b Merge branch 'MDL-38429' of git://github.com/rwijaya/moodle 2013-03-26 12:59:53 +08:00
Rossiani Wijaya
ecea65cace MDL-38429 Lesson Module: improve lesson code by reseting NULL value to use lowercase. 2013-03-25 14:07:18 +08:00
Damyon Wiese
35f155519e Merge branch 'w13_MDL-38654_m25_gdversion' of git://github.com/skodak/moodle 
Conflicts:
	lang/en/admin.php
 2013-03-25 14:02:31 +08:00
Roman Tsukanov
1b58651681 MDL-38429: lesson report - Improve lesson statistics code. 2013-03-25 13:58:13 +08:00
Rossiani Wijaya
41e2a9591f MDL-30438 Lesson Module: improve password field to disabled when password protect is set to no. 2013-03-25 11:26:50 +08:00
Dan Poltawski
b716cd2b70 MDL-34311 mod_url: Missing setType on the external url 2013-03-25 09:39:30 +08:00
Matteo Scaramuccia
724dc929c7 MDL-38336 SCORM: incorrect TOC bulding when 'Display course structure' is on 2013-03-24 11:02:41 +01:00
Petr Škoda
689096bc26 MDL-38654 do not test $CFG->gdversion 
GD PHP extension is now required. Add-ons need to remove $CFG->gdversion tests. The worst case regression is that add-on will think GD is not available.
 2013-03-22 16:57:55 +01:00
Tim Hunt
a7a031a4e4 MDL-38651 quiz settings: fix layout of review options. 2013-03-22 15:30:48 +00:00
Eloy Lafuente (stronk7)
d86db37c44 MDL-38632 folder: observe show_expanded on course page 2013-03-22 15:53:53 +01:00
Petr Škoda
c3f31a3ded MDL-38581 move forum discussion and post generators to proper place 2013-03-22 13:21:35 +01:00
Tim Hunt
2515be0e80 MDL-38647 quiz review question issues 
1. Page URL should contain 'step=0' if necessary, but not 'step='.
2. Review specific step was not using the right display options.
 2013-03-22 11:16:02 +00:00
Tim Hunt
7dbde4ed3b MDL-38557 quiz install.php code should actually be in reports. 
I think it is worth moving this code to its correct home in master.
 2013-03-22 10:36:15 +00:00
Tim Hunt
30461b0066 MDL-38557 quiz manual grading should check mod/quiz:grade 2013-03-22 10:36:14 +00:00
Tim Hunt
0559a72aa3 MDL-38557 fix quiz version number mess from MDL-31983 2013-03-22 10:36:13 +00:00
Frederic Massart
b7fc9d5a26 MDL-38552 forms: IMS CP content section expanded by default 2013-03-20 14:31:33 +08:00
Eloy Lafuente (stronk7)
b35dd05521 Merge branch 'MDL-38370-master' of git://github.com/ankitagarwal/moodle 2013-03-20 00:30:49 +01:00
Eloy Lafuente (stronk7)
044566f001 Merge branch 'MDL-38166-m' of git://github.com/andrewnicols/moodle 2013-03-20 00:13:51 +01:00
Eloy Lafuente (stronk7)
e73ac7692e Merge branch 'MDL-38433_master' of git://github.com/dmonllao/moodle 2013-03-19 23:27:50 +01:00
Eloy Lafuente (stronk7)
1d790031c2 Merge branch 'MDL-38411_master' of git://github.com/dmonllao/moodle 2013-03-19 23:26:01 +01:00