moodle/moodle
3
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-08-06 01:16:44 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
60238 commits 37 branches 540 tags 1.3 GiB
Commit graph

60238 commits

This branch
This branch
All branches
Author SHA1 Message Date
Dan Poltawski
ec6089f07b Merge branch 'MDL-38455-master-int' of git://github.com/FMCorz/moodle 2013-04-02 14:53:28 +08:00
Dan Poltawski
534ee16ec0 MDL-35603 backup: fix coding style issues 2013-04-02 14:30:50 +08:00
Dan Poltawski
92d1453bcb Merge branch 'MDL-35603-import-limit' of git://github.com/rlorenzo/moodle 2013-04-02 14:25:35 +08:00
David Monllao
bdf808de30 MDL-38687 behat: New test 
According to MDLQA-4590, an admin
can restore a course back up with
it's settings retained.
 2013-04-02 14:14:01 +08:00
David Monllao
44d5af386c MDL-38687 behat: Add activity step modification 
We are only supposed to look for
the activity name in @class=typename
 2013-04-02 14:13:57 +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
Damyon Wiese
bf6c1d0997 Merge branch 'MDL-38713-master' of git://github.com/danpoltawski/moodle 2013-04-02 13:23:00 +08:00
David Monllao
6cf9a42f6f MDL-38690 behat: New test 
According to MDLQA-327, a teacher can
import data from another course.
 2013-04-02 13:00:30 +08:00
Damyon Wiese
9ab0aece49 Merge branch 'MDL-38700-master' of git://github.com/danpoltawski/moodle 
Conflicts:
	course/tests/courselib_test.php
 2013-04-02 12:48:08 +08:00
David Monllao
2cca40c82b MDL-38785 behat: Steps definitions to add and delete comments 2013-04-02 12:07:19 +08:00
David Monllao
1fb1ccd545 MDL-38785 behat: New tests 
According to MDLQA-943, users can
add comments via a comments block
 2013-04-02 12:07:19 +08:00
Dan Poltawski
08e5aed273 Merge branch 'MDL-38825' of git://github.com/stronk7/moodle 2013-04-02 11:49:24 +08:00
David Monllao
739ac54ab0 MDL-38622 behat: New tests 
Navigation works correctly in paged
mode, according to MDLQA-1633, MDLQA-1639,
MDLQA-1645, MDLQA-1646, MDLQA-1647,
MDLQA-1648, MDLQA-1649, MDLQA-1651,
MDLQA-1652, MDLQA-1653, MDLQA-1654
and MDLQA-1655.
 2013-04-02 11:47:26 +08:00
Dan Poltawski
bf9613dd41 Merge branch 'MDL-38538_clean' of git://github.com/timhunt/moodle 2013-04-02 11:27:32 +08:00
Dan Poltawski
cbaeabbe47 Merge branch 'MDL-38702_master' of git://github.com/lazydaisy/moodle 2013-04-02 10:04:26 +08:00
Eloy Lafuente (stronk7)
a5efbe6161 Merge branch 'MDL-38814_master' of git://github.com/dmonllao/moodle 2013-04-02 03:30:30 +02:00
Eloy Lafuente (stronk7)
51cae58998 Merge branch 'MDL-38689_master' of git://github.com/dmonllao/moodle 2013-04-02 02:41:44 +02:00
Eloy Lafuente (stronk7)
d6dc3019b6 Merge branch 'MDL-38686_master' of git://github.com/dmonllao/moodle 2013-04-02 02:41:33 +02:00
Eloy Lafuente (stronk7)
1c49f7ad19 Merge branch 'MDL-38688_master' of git://github.com/dmonllao/moodle 2013-04-02 02:41:25 +02:00
Eloy Lafuente (stronk7)
49b902f858 MDL-38621 behat: whitespace fix 2013-04-02 02:28:40 +02:00
Eloy Lafuente (stronk7)
342c3f3e6c Merge branch 'MDL-38621_master' of git://github.com/dmonllao/moodle 2013-04-02 02:27:10 +02:00
Eloy Lafuente (stronk7)
3e27548431 Merge branch 'MDL-38620_master' of git://github.com/dmonllao/moodle 2013-04-02 02:26:54 +02: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)
23726a43d4 Merge branch 'MDL-38805_master' of git://github.com/dmonllao/moodle 2013-04-02 01:45:43 +02:00
Eloy Lafuente (stronk7)
cd4c7e9af4 Merge branch 'MDL-38804_master' of git://github.com/dmonllao/moodle 2013-04-02 01:44:59 +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)
62eb5c466e MDL-38547 behat: coding style fixes. 2013-04-01 22:40:50 +02:00
Eloy Lafuente (stronk7)
54e48dc32d Merge branch 'MDL-38547_master' of git://github.com/dmonllao/moodle 2013-04-01 22:32:06 +02:00
Eloy Lafuente (stronk7)
c57c57c575 Merge branch 'MDL-38499_master' of git://github.com/dmonllao/moodle 2013-04-01 22:23:58 +02:00
Eloy Lafuente (stronk7)
0251a62500 Merge branch 'MDL-38486_master' of git://github.com/dmonllao/moodle 2013-04-01 22:17:12 +02:00
Eloy Lafuente (stronk7)
c5f6371f04 MDL-38825 behat: fix composer install url 2013-04-01 18:55:34 +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
Eloy Lafuente (stronk7)
68adfee6d4 Merge branch 'MDL-38788_master' of git://github.com/dmonllao/moodle 2013-04-01 13:17:20 +02:00
Eloy Lafuente (stronk7)
b216376811 Merge branch 'MDL-38787_master' of git://github.com/dmonllao/moodle 2013-04-01 13:12:08 +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
7bc7625e04 MDL-38823 behat: Make default form field manage different HTML elements 2013-04-01 17:51:54 +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
Jean-Michel Vedrine
9219089a72 MDL-38808 Remove deprecated unzip_file from qformat blackboard_six 2013-04-01 09:34:07 +02: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
David Monllao
f076b0d43f MDL-38805 behat: Steps definitions to check students completed activities 2013-04-01 12:32:25 +08:00
David Monllao
abc38a9738 MDL-38805 behat: New test 
According to MDLQA-511, a teacher can
enable students to manually mark an activity
as complete.
 2013-04-01 12:32:25 +08:00