66740 Commits

Author SHA1 Message Date
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
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
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
Petr Škoda
114e3209b1 MDL-42889 cleanup obsolete clam relatd code
Since 2.0 all uploaded files need to go through the file picker which does the scanning,
the idea is that it is more important to warn users that their computer is crawling
with viruses. All teachers are supposed to have local up-to-date antivirus software!

Since 2.0 we are not scanning existing files on server, in future we might use the
status flag in files table to indicate the file is problematic, but still we should
never detele anthing from the filedir...
2014-02-18 09:22:30 +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