James Pratt
99caa248a8
MDL-43478 quiz responses report : display last / first / all tries
...
when using multiple try question behaviour
2014-02-23 13:39:08 +07: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
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
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
David Monllao
fbd904ef41
MDL-43802 behat: Testing deleted activity with JS enabled
2014-02-18 13:55:08 +08:00
Damyon Wiese
603427a9e1
MDL-40921 mod_workshop: Add assertEventContextNotUsed to events tests.
2014-02-18 13:46:24 +08:00
Damyon Wiese
5c219bbc84
Merge branch 'w06_MDL-40921_m27_workshopevents' of https://github.com/skodak/moodle
2014-02-18 13:46:11 +08:00
Dan Poltawski
d08598bc8b
Merge branch 'MDL-35103' of git://github.com/jmvedrine/moodle
2014-02-18 13:39:08 +08:00
Damyon Wiese
62f641efd3
Merge branch 'MDL-41646' of git://github.com/apsdehal/moodle
2014-02-18 12:40:56 +08:00
Damyon Wiese
0e84ecefcc
Merge branch 'w07_MDL-42541_m27_portevent' of git://github.com/skodak/moodle
...
Conflicts:
version.php
2014-02-18 12:00:45 +08:00
Damyon Wiese
d306807e02
Merge branch 'MDL-43479-master' of https://github.com/jamiepratt/moodle
2014-02-18 10:16:15 +08:00
Eloy Lafuente (stronk7)
974cc3b0c2
Merge branch '43822-27' of git://github.com/samhemelryk/moodle
2014-02-18 01:55:23 +01:00
Eloy Lafuente (stronk7)
f3da891068
Merge branch '44184-27' of git://github.com/samhemelryk/moodle
2014-02-18 01:50:24 +01:00
Eloy Lafuente (stronk7)
21f323781d
Merge branch '44103-27' of git://github.com/samhemelryk/moodle
2014-02-18 01:47:31 +01:00
Eloy Lafuente (stronk7)
a6d5288e41
Merge branch '44104-27' of git://github.com/samhemelryk/moodle
2014-02-18 01:46:47 +01:00
