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
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
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
Marina Glancy
7f051de21d
MDL-40619 behat: test for creating a one-question quiz
2014-02-17 14:19:32 +08:00
Andrew Nicols
af64bc6179
MDL-33099 Javascript: Deprecate the ajaxenabled function
2014-02-17 14:11:21 +08:00
Dan Poltawski
97802bea3a
MDL-40062 mod_forum: Add discussion_updated event
2014-02-17 14:07:14 +08:00
Dan Poltawski
a52c04d549
MDL-40062 mod_forum: add event unit tests
...
And bump forum version for new events.
2014-02-17 14:05:54 +08:00
Dan Poltawski
2d3f692bfe
MDL-40062 mod_forum: post events
...
* post_created
* post_updated
* post_deleted
Prune post (split discussion) has been converted to multiple events as
splitting a post actually means new discussion created.
2014-02-17 14:05:54 +08:00
Dan Poltawski
e70ebc55f8
MDL-40062 mod_forum: read tracking events
...
* readtracking_enabled
* readtracking_disabled
2014-02-17 14:05:54 +08:00
Dan Poltawski
de2770501e
MDL-40062 mod_forum: subscription events
...
Events for forum mail subscriptions
* subscription_created
* subscription_deleted
* subscribers_viewed
2014-02-17 14:05:54 +08:00
Dan Poltawski
71595d0053
MDL-40062 mod_forum: discussion events
...
* discussion_created
* discussion_deleted
* discussion_moved
* discussion_viewed
2014-02-17 14:05:53 +08:00
Damyon Wiese
09c7f57fd2
Merge branch 'MDL-40061_master' of https://github.com/markn86/moodle
2014-02-17 13:14:45 +08:00
Dan Poltawski
2288139207
MDL-40062 mod_forum: convert viewed events
...
* course_module_instance_list_viewed
* forum_viewed
* course_searched
* userreport_viewed
2014-02-17 10:03:23 +08:00
Dan Poltawski
33c40cc633
MDL-40062 mod_forum: remove invalid add_to_log() calls
...
* debugging add_to_log() calls - the Moodle log is not the
place for these kind of messages
* subscribeall/unsusbcribeall - now individual subscriptions
will fire events, there is no need for a catch all.
* remove read tracking log entries - read tracking individual
log entries do not provide enough reliable information, as
the posts can be marked as read automatically after emailing
or an expiry period.
2014-02-17 10:03:23 +08:00
Sam Hemelryk
9e7fb3e848
Merge branch 'MDL-44055-master' of git://github.com/andrewnicols/moodle
2014-02-17 09:04:48 +13:00
Sam Hemelryk
87643ff599
Merge branch 'MDL-44079-master' of git://github.com/andrewnicols/moodle
...
Conflicts:
lib/yui/build/moodle-core-notification-dialogue/moodle-core-notification-dialogue-min.js
2014-02-17 08:48:39 +13:00
Sam Hemelryk
d01fb561db
MDL-44158 mod_glossary: unified @package use
2014-02-16 12:15:02 +13:00
Sam Hemelryk
7db38cd53f
MDL-44103 mod_wiki: fixed copyright typo
2014-02-16 12:14:25 +13:00