72477 Commits

Author SHA1 Message Date
Eric Merrill
c803fa6855 MDL-49298 backup: Make tgz file format standard for backups 2015-03-05 10:07:58 -05:00
Eloy Lafuente (stronk7)
b90f98dade weekly release 2.9dev 2015-03-05 11:26:30 +01:00
Rajesh Taneja
4ba58b4540 MDL-48962 mod_lesson: New lesson should not be timed 2015-03-05 14:55:18 +08:00
Rajesh Taneja
8b88ba475e MDL-48962 mod_lesson: Fixed behat with new timeout setting and string 2015-03-05 14:55:18 +08:00
Eloy Lafuente (stronk7)
d687c29f26 Merge branch 'MDL-48912' of git://github.com/jmvedrine/moodle 2015-03-05 00:24:49 +01:00
Jean-Michel Vedrine
5df7f12398 MDL-48912 mod_lesson: fix problems found during testing 2015-03-04 21:50:33 +01:00
Jetha Chan
d10ac16a2f MDL-48060 messaging: contact list paging bar style fixup 2015-03-04 17:37:04 +01:00
Eloy Lafuente (stronk7)
de2f05d50d Merge branch 'MDL-49379_master' of git://github.com/markn86/moodle 2015-03-04 10:46:18 +01:00
Mark Nelson
05536ad165 MDL-49379 core_webservice: fixed ability to edit services 2015-03-04 01:36:45 -08:00
David Monllao
553319be03 MDL-49204 core_message: Checking current user 2015-03-04 10:05:26 +08:00
Andrew Nicols
4b38a19aec Merge branch 'MDL-49164_old_rego' of https://github.com/andyjdavis/moodle 2015-03-04 08:57:00 +08:00
Andrew Nicols
8506c95c9f Merge branch 'MDL-49364' of git://github.com/timhunt/moodle 2015-03-04 08:51:21 +08:00
Andrew Davis
858e92fefe MDL-49164 admin: removed unused registration config setting 2015-03-04 08:50:39 +08:00
Andrew Nicols
a1955c1784 Merge branch 'master_MDL-46390' of https://github.com/danmarsden/moodle 2015-03-04 07:52:55 +08:00
Eloy Lafuente (stronk7)
0967a20d02 Merge branch 'MDL-48962' of git://github.com/jmvedrine/moodle 2015-03-04 00:00:16 +01:00
Dan Marsden
f47a8a6f81 MDL-46390 mod_scorm: Find correct sco to launch when org based sco is selected
Also tidies up some redundant code in scorm_format_toc_for_droplist()
2015-03-04 09:27:45 +13:00
Eloy Lafuente (stronk7)
9c3df39d63 Merge branch 'MDL-49214_master' of git://github.com/lazydaisy/moodle 2015-03-03 19:34:49 +01:00
Eloy Lafuente (stronk7)
3d944d37dd Merge branch 'MDL-48912' of git://github.com/jmvedrine/moodle 2015-03-03 19:30:00 +01:00
Dan Poltawski
e2d8685247 Merge branch 'MDL-49335' of git://github.com/timhunt/moodle 2015-03-03 14:46:34 +00:00
Dan Poltawski
2076324e7d Merge branch 'MDL-49334' of git://github.com/timhunt/moodle 2015-03-03 13:25:33 +00:00
Dan Poltawski
f7681b5181 Merge branch 'MDL-47000-master' of git://github.com/merrill-oakland/moodle 2015-03-03 13:21:30 +00:00
Dan Poltawski
7cbdb75699 Merge branch 'MDL-49246-master' of git://github.com/lameze/moodle 2015-03-03 13:19:36 +00:00
Tim Hunt
8b6fcfa958 MDL-49364 quiz statistics: escape output in the response analysis 2015-03-03 13:04:18 +00:00
Eloy Lafuente (stronk7)
6442803f76 MDL-48984 mod_lesson: explicitly close some recordsets 2015-03-03 12:52:40 +01:00
Eloy Lafuente (stronk7)
6230f717bf Merge branch 'MDL-48984' of git://github.com/jmvedrine/moodle 2015-03-03 12:52:20 +01:00
Dan Poltawski
6a4caa0128 Merge branch 'MDL-34006_m29v6' of https://github.com/sbourget/moodle
Conflicts:
	mod/lesson/version.php
	mod/lesson/db/upgrade.php
	mod/lesson/db/install.xml
2015-03-03 11:40:17 +00:00
Tim Hunt
867b0430b0 MDL-49335 quiz behat: new test of attempting a quiz
This separates out attempting the quiz into a separate .feature, away
from the monolithic add_quiz.feature. At some point we should clean that
up, but for now I am just adding this.

Really, the main reason for this test is to verify the two Behat
enhancememnts I just did.
2015-03-03 11:19:48 +00:00
Tim Hunt
eeb7552589 MDL-49335 quiz behat: improved step for adding questions to a quiz
Explicit headings make the script more readable, and pave the way for
new options that are due to be added.
2015-03-03 11:19:48 +00:00
Tim Hunt
92caa214ef MDL-49335 Behat: new question selector
So you can say things like
    And I click on "True" "radio" in the "First question" "question"
2015-03-03 11:19:48 +00:00
Tim Hunt
f70fbc05e1 MDL-49334 behat: sort selector lists 2015-03-03 11:13:31 +00:00
Eloy Lafuente (stronk7)
6d46e3a4f7 Merge branch 'MDL-45621_m29v3' of git://github.com/sbourget/moodle 2015-03-03 10:54:30 +01:00
Dan Poltawski
74293eef0c Merge branch 'MDL-48975_rego_strings2' of https://github.com/andyjdavis/moodle 2015-03-03 09:12:35 +00:00
Dan Poltawski
8eed9a9f42 Merge branch 'MDL-49160-master' of git://github.com/merrill-oakland/moodle 2015-03-03 08:34:31 +00:00
Dan Poltawski
3d25edb5d9 Merge branch 'MDL-35995-master' of git://github.com/xow/moodle 2015-03-03 08:33:02 +00:00
Andrew Nicols
ebb18182a6 MDL-49285 mod_quiz: Remove unnecessary linebreak 2015-03-03 16:23:13 +08:00
Andrew Nicols
aa0de891d1 Merge branch 'MDL-49285-master' of git://github.com/merrill-oakland/moodle 2015-03-03 16:22:01 +08:00
Andrew Nicols
6c3a06fdc7 Merge branch 'MDL-38485-master' of git://github.com/ankitagarwal/moodle 2015-03-03 16:05:03 +08:00
Andrew Nicols
596b86d6b2 Merge branch 'MDL-49075-master' of https://github.com/lucisgit/moodle 2015-03-03 15:32:13 +08:00
Jean-Michel Vedrine
a1300e98bb MDL-48984 mod_lesson: some lesson_answers answers should be plain text
Branch tables jump descriptions, short answer question answers
and numerical question answers should be plain text, and no editor
should be available here.
2015-03-03 08:24:24 +01:00
Andrew Nicols
962d7359a3 Merge branch 'MDL-49234_master' of git://github.com/crazyserver/moodle 2015-03-03 15:12:29 +08:00
Andrew Nicols
5ce0741490 Merge branch 'MDL-49247' of git://github.com/timhunt/moodle 2015-03-03 14:56:39 +08:00
Andrew Nicols
5b0f2ad976 Merge branch 'MDL-49284' of git://github.com/timhunt/moodle 2015-03-03 13:40:53 +08:00
Eloy Lafuente (stronk7)
8d9bdd28e0 MDL-49087 mdeploy: now relying on config.php documented 2015-03-03 02:45:44 +01:00
Andrew Nicols
2820930f57 MDL-49087 mnet: Ensure typeroot is in dirroot 2015-03-03 02:37:09 +01:00
Andrew Nicols
9b92620ff1 MDL-49087 mnet: Use real dataroot instead of user-provided 2015-03-03 02:37:09 +01:00
Stephen Bourget
fad20e3c82 MDL-45621 Portfolio: Allow portfolios to be uninstalled 2015-03-02 20:20:10 -05:00
Eloy Lafuente (stronk7)
e24066ff85 Merge branch 'MDL-37470' of https://github.com/mike-grant/moodle 2015-03-03 01:43:47 +01:00
Eloy Lafuente (stronk7)
fbc4839a0c Merge branch 'MDL-49240-master' of git://github.com/damyon/moodle 2015-03-03 01:11:16 +01:00
Eloy Lafuente (stronk7)
caa7022ed0 Merge branch 'MDL-49237-master' of git://github.com/mastnym/moodle 2015-03-02 21:41:35 +01:00
Dan Poltawski
63b0d7ab21 Merge branch 'master' of https://github.com/mitstek/moodle 2015-03-02 17:27:13 +00:00