Commit graph

66719 commits

Author SHA1 Message Date
David Monllao
702851c071 MDL-44108 behat: Adding a roles data generator 2014-02-21 13:25:44 +08:00
David Monllao
167486b316 MDL-44111 behat: Limiting dump files filename size 2014-02-21 13:21:58 +08:00
David Monllao
67ecac8933 MDL-44286 behat: Updating to our custom Syn library 2014-02-21 10:17:59 +08:00
Sam Hemelryk
854859e1b0 MDL-42279 user: fixed typo in user_get_user_details_courses 2014-02-21 08:34:49 +13:00
Sam Hemelryk
1d2fa3af5a MDL-44279 user: added unit test to trigger known bug 2014-02-21 08:34:49 +13:00
Sam Hemelryk
5cdcfcb988 MDL-44183 mod_workshop: unified @package use 2014-02-21 08:33:40 +13:00
Sam Hemelryk
da9bddbeeb MDL-44182 mod_survey: unified @package use 2014-02-21 08:33:36 +13:00
Sam Hemelryk
593b838546 MDL-44159 mod_wiki: unify @package use 2014-02-21 08:32:58 +13:00
Tim Hunt
dfcaa2450c MDL-44288 qtype_calculatedsimple fix validation notice.
The notice happend if you clicked Save changes before Find the wild
cards {x..} present in the correct answer formulas.
2014-02-20 13:01:47 +00:00
Eloy Lafuente (stronk7)
ec4c8161a4 weekly release 2.7dev 2014-02-20 12:43:03 +01:00
Eloy Lafuente (stronk7)
1a561214af Merge branch 'install_master' of git://git.moodle.org/moodle-install 2014-02-20 12:42:59 +01:00
Mary Evans
e11558bca3 MDL-44269 theme_clean: Change location of navbar (breadcumb) to below logo. 2014-02-19 22:03:38 +00:00
Damyon Wiese
d4e5757992 MDL-44118 question engine: Fix bad merge conflict resolution (again)
This time for sure (sorry).
2014-02-19 10:03:37 +08:00
Damyon Wiese
0d7e83c4e4 MDL-44118 question engine: Fix bad merge conflict resolution
Version numbers were out of order in upgrade file (my bad).
2014-02-19 09:35:57 +08:00
Damyon Wiese
6071a209fe Merge branch 'MDL-44118_2' of git://github.com/timhunt/moodle
Conflicts:
	version.php
2014-02-19 09:08:42 +08:00
Eloy Lafuente (stronk7)
a7bf707974 Merge branch '44213-27' of git://github.com/samhemelryk/moodle 2014-02-19 01:33:20 +01:00
Eloy Lafuente (stronk7)
88f1b3d6b7 Merge branch '44211-27' of git://github.com/samhemelryk/moodle 2014-02-19 01:32:25 +01:00
Eloy Lafuente (stronk7)
86252eb6df Merge branch '44210-27' of git://github.com/samhemelryk/moodle 2014-02-19 01:31:13 +01:00
Eloy Lafuente (stronk7)
8817802bfd Merge branch '44209-27' of git://github.com/samhemelryk/moodle 2014-02-19 01:30:43 +01:00
Eloy Lafuente (stronk7)
6030ef565f Merge branch '44208-27' of git://github.com/samhemelryk/moodle 2014-02-19 01:28:53 +01:00
Eloy Lafuente (stronk7)
bf9c946eef MDL-44207 theme_nimble: fix incorrect tab. 2014-02-19 01:23:59 +01:00
Eloy Lafuente (stronk7)
22e4df8e63 Merge branch '44207-27' of git://github.com/samhemelryk/moodle 2014-02-19 01:23:04 +01:00
Eloy Lafuente (stronk7)
faefe571c5 Merge branch '44206-27' of git://github.com/samhemelryk/moodle 2014-02-19 01:21:16 +01:00
Eloy Lafuente (stronk7)
6151f9de4c Merge branch '44205-27' of git://github.com/samhemelryk/moodle 2014-02-19 01:20:10 +01:00
Eloy Lafuente (stronk7)
bb0949467e Merge branch '44204-27' of git://github.com/samhemelryk/moodle 2014-02-19 01:19:43 +01:00
Eloy Lafuente (stronk7)
5f88a2fc11 Merge branch '44203-27' of git://github.com/samhemelryk/moodle 2014-02-19 01:19:04 +01:00
Eloy Lafuente (stronk7)
360a0b4480 Merge branch '44202-27' of git://github.com/samhemelryk/moodle 2014-02-19 01:12:57 +01:00
Eloy Lafuente (stronk7)
361d13c04a Merge branch '44201-27' of git://github.com/samhemelryk/moodle 2014-02-19 01:11:46 +01:00
Eloy Lafuente (stronk7)
f02613d6d6 Merge branch '44200-27' of git://github.com/samhemelryk/moodle 2014-02-19 01:11:06 +01:00
Eloy Lafuente (stronk7)
c753d76879 Merge branch '44199-27' of git://github.com/samhemelryk/moodle 2014-02-19 01:08:58 +01:00
Eloy Lafuente (stronk7)
0919e70204 Merge branch '44198-27' of git://github.com/samhemelryk/moodle 2014-02-19 01:08:23 +01:00
Eloy Lafuente (stronk7)
0a3f8b26e4 Merge branch '44197-27' of git://github.com/samhemelryk/moodle 2014-02-19 01:03:57 +01:00
Eloy Lafuente (stronk7)
c14a54c230 Merge branch '44196-27' of git://github.com/samhemelryk/moodle 2014-02-19 01:03:22 +01:00
Eloy Lafuente (stronk7)
a9d44ff518 Merge branch '44195-27' of git://github.com/samhemelryk/moodle 2014-02-19 01:02:00 +01:00
Eloy Lafuente (stronk7)
bfe7c33c07 Merge branch '44194-27' of git://github.com/samhemelryk/moodle 2014-02-19 01:01:27 +01:00
Eloy Lafuente (stronk7)
52c5fb1c0f Merge branch '44193-27' of git://github.com/samhemelryk/moodle 2014-02-19 01:00:32 +01:00
Eloy Lafuente (stronk7)
b9b38ea791 MDL-43265 question: incorrect closing parenthesis 2014-02-19 00:10:47 +01:00
Eloy Lafuente (stronk7)
8167063ac1 Merge branch 'MDL-43265_new' of https://github.com/jacks92/moodle 2014-02-18 23:55:52 +01:00
Eloy Lafuente (stronk7)
33ce661816 Merge branch 'MDL-43337-master' of git://github.com/FMCorz/moodle 2014-02-18 23:24:45 +01:00
Eric Merrill
786163a7cb MDL-44264 badges Add badges to the user short profile page. 2014-02-18 15:05:47 -05:00
Daniel Neis Araujo
9d9361e82d MDL-18633 User profile: add last ip field to user view 2014-02-18 09:42:28 -03:00
Tim Hunt
30de48d285 MDL-44118 drop old quiz/question attempt data.
This data should all have been upgraded when moving to Moodle 2.1. It
was only kept as a back-up, and now, after 3 years have past, we can
clean it up.
2014-02-18 11:55:26 +00:00
Tim Hunt
4e8a07d28b MDL-44118 remove the qeupgradehelper tool
and associated code that was only used by it.
2014-02-18 11:55:21 +00:00
Tim Hunt
e4c20157c0 MDL-44118 new environment check are all quiz attempts upgraded.
In Moodle 2.1, there was a major DB upgrade relating to questions, and
it was possible to delay some of that upgrade. Now, those DB tables are
changing again, and the time has come to insist that all the updata has
been upgraded (or deleted).
2014-02-18 11:55:17 +00:00
Damyon Wiese
f68e555684 Merge branch 'MDL-39337' of git://github.com/apsdehal/moodle 2014-02-18 15:37:49 +08:00
Dan Poltawski
7f1a4f6e22 Merge branch '44212-27' of git://github.com/samhemelryk/moodle 2014-02-18 14:41:34 +08:00
Sam Hemelryk
6da956e607 MDL-44181 mod_scorm: unified @package use
Conflicts:
	mod/scorm/db/upgrade.php
2014-02-18 14:19:21 +08:00
Dan Poltawski
197e3ccb8f Merge branch 'master_MDL-43541' of git://github.com/danmarsden/moodle 2014-02-18 14:13:58 +08:00
Damyon Wiese
60c85b8596 Merge branch 'MDL-43802_master' of git://github.com/dmonllao/moodle 2014-02-18 14:01:33 +08:00
Damyon Wiese
b41ea78c39 Merge branch 'MDL-44187-master' of git://github.com/andrewnicols/moodle 2014-02-18 13:56:11 +08:00