Damyon Wiese
03b8d9e3c3
Merge branch 'wip-mdl-40919' of https://github.com/rajeshtaneja/moodle
2014-02-25 12:44:35 +08:00
Damyon Wiese
494afb8180
Merge branch '44315-27' of git://github.com/samhemelryk/moodle
2014-02-25 11:09:53 +08:00
Damyon Wiese
a18c3591c6
MDL-40619 mod_quiz: Remove commented non-js behat scenario
2014-02-25 11:02:03 +08:00
Damyon Wiese
fce9daa806
Merge branch 'wip-MDL-40619-master' of git://github.com/marinaglancy/moodle
2014-02-25 10:53:09 +08:00
Dan Poltawski
3d4cec649a
Merge branch 'MDL-40916_master' of https://github.com/markn86/moodle
2014-02-25 10:47:20 +08:00
Dan Poltawski
305b15f4ab
Merge branch 'MDL-43478-master-v4' of git://github.com/jamiepratt/moodle
2014-02-25 09:27:35 +08:00
Damyon Wiese
6258e288ae
Merge branch '44159-27' of git://github.com/samhemelryk/moodle
2014-02-24 15:26:05 +08:00
Damyon Wiese
956c7f2c39
Merge branch '41175-27' of git://github.com/samhemelryk/moodle
2014-02-24 15:15:00 +08:00
Damyon Wiese
5bc18d295a
Merge branch '41176-27' of git://github.com/samhemelryk/moodle
2014-02-24 15:13:00 +08:00
Damyon Wiese
801e26ed64
Merge branch '41177-27' of git://github.com/samhemelryk/moodle
2014-02-24 15:10:53 +08:00
Damyon Wiese
9383bef658
Merge branch '41178-27' of git://github.com/samhemelryk/moodle
2014-02-24 15:08:33 +08:00
Rajesh Taneja
9e176aa2f5
MDL-40919 mod_survey: replaced add_to_log with events
2014-02-24 15:00:00 +08:00
Damyon Wiese
18bc3faef9
Merge branch '41179-27' of git://github.com/samhemelryk/moodle
2014-02-24 14:51:08 +08:00
Damyon Wiese
5c47971b4a
Merge branch '44182-27' of git://github.com/samhemelryk/moodle
2014-02-24 14:49:10 +08:00
Damyon Wiese
b68658325b
Merge branch '44183-27' of git://github.com/samhemelryk/moodle
2014-02-24 14:46:16 +08:00
Damyon Wiese
2926b25492
Merge branch 'MDL-44247-master' of git://github.com/FMCorz/moodle
2014-02-24 14:32:49 +08:00
Sam Hemelryk
2ef8ff9e05
MDL-44315 phpdoc: fixed up typos and made up tags
2014-02-24 09:13:31 +13:00
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
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
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
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
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
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
Damyon Wiese
62f641efd3
Merge branch 'MDL-41646' of git://github.com/apsdehal/moodle
2014-02-18 12:40:56 +08:00
Mark Nelson
a2a7726f54
MDL-40916 mod_imscp: replaced 'view all' add_to_log call with an event
2014-02-17 19:07:48 -08:00
Mark Nelson
09e125f7d4
MDL-40916 mod_imscp: replaced 'view' add_to_log call with an event
2014-02-17 18:54:23 -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)
21f323781d
Merge branch '44103-27' of git://github.com/samhemelryk/moodle
2014-02-18 01:47:31 +01:00
Eloy Lafuente (stronk7)
993414fdf6
MDL-44151 Amend subplugin packages.
...
This commit fixed the @package for all assignment subplugins.
Also adds a tiny change in the community block (MDL-44120).
2014-02-18 01:33:05 +01:00
Eloy Lafuente (stronk7)
450ddd2e4d
Merge branch '44151-27' of git://github.com/samhemelryk/moodle
2014-02-18 01:27:04 +01:00
Eloy Lafuente (stronk7)
5234427f2d
Merge branch '44152-27' of git://github.com/samhemelryk/moodle
2014-02-18 00:56:26 +01:00
Eloy Lafuente (stronk7)
e6b9b5538d
Merge branch '44153-27' of git://github.com/samhemelryk/moodle
2014-02-18 00:55:53 +01:00
Eloy Lafuente (stronk7)
7927245288
Merge branch '44154-27' of git://github.com/samhemelryk/moodle
2014-02-18 00:55:19 +01:00
Eloy Lafuente (stronk7)
b629de817a
Merge branch '44155-27' of git://github.com/samhemelryk/moodle
2014-02-18 00:54:28 +01:00
Eloy Lafuente (stronk7)
08e622b248
Merge branch '44156-27' of git://github.com/samhemelryk/moodle
2014-02-18 00:53:22 +01:00
Eloy Lafuente (stronk7)
6a586f0036
Merge branch '44157-27' of git://github.com/samhemelryk/moodle
2014-02-18 00:51:33 +01:00
Sam Hemelryk
ca3aff3de2
MDL-44151 mod_assignment: unified @package use
2014-02-18 11:26:05 +13:00
Sam Hemelryk
a6be3193d8
MDL-44152 mod_chat: unified @package use
2014-02-18 11:25:08 +13:00
Sam Hemelryk
c7afe6b76f
MDL-44153 mod_choice: unified @package use
2014-02-18 11:24:30 +13:00
Sam Hemelryk
002a2a44a7
MDL-44154 mod_data: unified @package use
2014-02-18 11:22:41 +13:00
Sam Hemelryk
11e41f1ae4
MDL-44156 mod_resource: unified @package use
2014-02-18 11:19:33 +13:00
Sam Hemelryk
01030f1be6
MDL-44157 mod_forum: unified @package use
2014-02-18 11:15:10 +13:00
Sam Hemelryk
9714baa1bb
MDL-44155 mod_feedback: unified @package use
2014-02-18 10:50:13 +13:00
Damyon Wiese
a0cb27f72a
Merge branch 'MDL-43539-master' of https://github.com/jamiepratt/moodle
2014-02-17 16:08:50 +08:00
Frederic Massart
159c6e2666
MDL-44247 mod_scorm: Reference to SYSTEM_CONTEXT instead of real context
2014-02-17 15:58:44 +08:00
Damyon Wiese
9e72fa97a9
Merge branch 'MDL-41759-master' of https://github.com/jamiepratt/moodle
2014-02-17 15:32:45 +08:00
