66589 Commits

Author SHA1 Message Date
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
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
Eloy Lafuente (stronk7)
af928012ef Merge branch '44105-27' of git://github.com/samhemelryk/moodle 2014-02-18 01:46:14 +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)
6f9b4cccb4 Merge branch '44120-27' of git://github.com/samhemelryk/moodle 2014-02-18 01:02:22 +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
David Monllao
0807908f17 MDL-44085 course: Replace JS confirm() by YUI confirm 2014-02-18 09:44:05 +13:00
Sam Hemelryk
c10affa57b Merge branch 'MDL-43997-master' of git://github.com/andrewnicols/moodle
Conflicts:
	lib/yui/build/moodle-core-notification-dialogue/moodle-core-notification-dialogue-min.js
2014-02-18 09:31:32 +13:00
Sam Hemelryk
38226a3f4a Merge branch 'MDL-44161-master' of git://github.com/andrewnicols/moodle 2014-02-18 09:30:50 +13:00
Eloy Lafuente (stronk7)
1f09c26298 Merge branch 'MDL-41759-master' of https://github.com/jamiepratt/moodle 2014-02-17 15:45:01 +01:00
James Pratt
9d3d859c7f MDL-41759 quiz statistics : install.xml & upgrade.php difference 2014-02-17 19:25:10 +07:00
Damyon Wiese
a0cb27f72a Merge branch 'MDL-43539-master' of https://github.com/jamiepratt/moodle 2014-02-17 16:08:50 +08:00
Damyon Wiese
9e72fa97a9 Merge branch 'MDL-41759-master' of https://github.com/jamiepratt/moodle 2014-02-17 15:32:45 +08:00
Damyon Wiese
1265a7c4c5 Merge branch 'MDL-41758-master' of git://github.com/jamiepratt/moodle 2014-02-17 15:04:05 +08:00
Damyon Wiese
1d35590029 Merge branch 'MDL-41755-master-v2' of git://github.com/jamiepratt/moodle 2014-02-17 15:01:45 +08:00
Dan Marsden
02bff1ad82 MDL-43541 SCORM: set first launchable sco correctly. 2014-02-17 19:56:40 +13:00
Dan Poltawski
a500fd06ce Merge branch '44158-27' of git://github.com/samhemelryk/moodle 2014-02-17 14:48:01 +08:00
Dan Poltawski
89542d2888 MDL-33099 deprecatedlib: clarify some comments 2014-02-17 14:45:12 +08:00
Dan Poltawski
a24ef7d7cd Merge branch 'MDL-33099-master' of git://github.com/andrewnicols/moodle 2014-02-17 14:40:36 +08:00
Damyon Wiese
4339015aca Merge branch 'MDL-40062-master' of git://github.com/danpoltawski/moodle 2014-02-17 14:37:18 +08:00