Commit graph

60382 commits

Author SHA1 Message Date
Eloy Lafuente (stronk7)
d3f422bdc1 Merge branch 'MDL-38687_master' of git://github.com/dmonllao/moodle 2013-04-02 20:46:05 +02:00
Eloy Lafuente (stronk7)
80430739d9 Merge branch 'MDL-38785_master' of git://github.com/dmonllao/moodle 2013-04-02 20:41:00 +02:00
Eloy Lafuente (stronk7)
a534e06e47 Merge branch 'MDL-38616_master' of git://github.com/dmonllao/moodle 2013-04-02 18:35:41 +02:00
Tim Hunt
d122fe3245 MDL-38538 question autosave: fix missing method.
Also change the unit tests to detect this problem.
2013-04-02 16:53:25 +01:00
David Mudrák
c9c4d0b24e MDL-38509 Fix false unit test failures in the add-on installer
Previously, the testable validator's get_plugintype_location() used to
return path to a directory that itself did not need to be writable. This
was causing false failures. This patch reimplements the testable
validator's get_plugintype_location() method so that it returns a path
inside $CFG->tempdir which is always writable.

Also, to make all test methods consistent, all of them now use the
testable_tool_installaddon_validator class. Before this patch, some test
methods used the testable class and some used the parent class.
2013-04-02 16:58:12 +02:00
Damyon Wiese
594d66c27e MDL-38840 Statslib - Fix failing unit tests on ci server (DST change) 2013-04-02 16:47:04 +02:00
Eloy Lafuente (stronk7)
871da25a40 Merge branch 'MDL-38622_master' of git://github.com/dmonllao/moodle 2013-04-02 15:51:17 +02:00
David Monllao
08aa2c3b81 MDL-38549 behat: New tests
Group mode activity icons toggle group
mode correctly. According to MDLQA-1603,
MDLQA-1604, MDLQA-1605, MDLQA-1606
and MDLQA-1607
2013-04-02 15:46:38 +02:00
Eloy Lafuente (stronk7)
c9a66fc2b5 MDL-38811 behat: whitespace fixes 2013-04-02 15:45:19 +02:00
David Monllao
46ef87c535 MDL-38811 behat: New test
According to MDLQA-1564, a teacher can
indent items on the course page
2013-04-02 15:44:05 +02:00
Eloy Lafuente (stronk7)
7fb5b7fae1 Merge branch 'MDL-38548_master' of git://github.com/dmonllao/moodle 2013-04-02 15:25:19 +02:00
Dan Poltawski
881afa48bf MDL-38821 enrol_paypal: fix cost param type 2013-04-02 20:05:39 +08:00
Dan Poltawski
6842ab4455 Merge branch 'MDL-38821_master' of git://github.com/dmonllao/moodle 2013-04-02 19:54:46 +08:00
Dan Poltawski
15c2b2c43a Merge branch 'MDL-26956' of git://github.com/timhunt/moodle 2013-04-02 19:49:02 +08:00
Tim Hunt
0e0a980631 MDL-26956 enrol form: add missing setType calls. 2013-04-02 11:57:12 +01:00
Dan Poltawski
73b8f191cc MDL-35073 badges: fix xmldb editor diff
Tut tut tut!
2013-04-02 16:30:42 +08:00
Dan Poltawski
eee20b123b Merge branch 'wip-mdl-38344' of git://github.com/rajeshtaneja/moodle
Conflicts:
	lib/db/upgrade.php
	version.php
2013-04-02 16:23:44 +08:00
Damyon Wiese
cc067484a8 Merge branch 'MDL-38711-master' of git://github.com/danpoltawski/moodle 2013-04-02 16:17:25 +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
2188a69799 MDL-35073 Badges - Set of minor fixes for issues found during integration 2013-04-02 15:55:21 +08:00
Yuliya Bozhko
278065528a MDL-35073 badges: Open badges integration
The badges feature allows to integrate Mozilla "Open Badges" to issue, assign,
manage and display digital badges in Moodle. This feature supports:
-- badge creation and issuing based on criteria
-- badge baking and verification service
-- direct pushing of internal badges to external backpack
-- interanl and external badge display in Moodle
-- Moodle block to display latest badges
2013-04-02 15:49:02 +08:00
David Monllao
1ad8902820 MDL-38821 enrol_self: Fixing setType missing calls 2013-04-02 15:39:44 +08:00
David Monllao
eeb6c4ace8 MDL-38821 enrol_paypal: Fixing setType missing calls 2013-04-02 15:37:21 +08:00
David Monllao
361c4da2fb MDL-38821 enrol_manual: Fixing setType missing calls 2013-04-02 15:37:11 +08:00
David Monllao
3de603a175 MDL-38821 enrol_cohort: Fixing setType missing calls 2013-04-02 15:37:00 +08:00
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