Damyon Wiese [Wed, 19 Feb 2014 02:03:37 +0000 (10:03 +0800)]
MDL-44118 question engine: Fix bad merge conflict resolution (again)
This time for sure (sorry).
Damyon Wiese [Wed, 19 Feb 2014 01:35:57 +0000 (09:35 +0800)]
MDL-44118 question engine: Fix bad merge conflict resolution
Version numbers were out of order in upgrade file (my bad).
Damyon Wiese [Wed, 19 Feb 2014 01:08:42 +0000 (09:08 +0800)]
Merge branch 'MDL-44118_2' of git://github.com/timhunt/moodle
Conflicts:
version.php
Eloy Lafuente (stronk7) [Wed, 19 Feb 2014 00:33:20 +0000 (01:33 +0100)]
Merge branch '44213-27' of git://github.com/samhemelryk/moodle
Eloy Lafuente (stronk7) [Wed, 19 Feb 2014 00:32:25 +0000 (01:32 +0100)]
Merge branch '44211-27' of git://github.com/samhemelryk/moodle
Eloy Lafuente (stronk7) [Wed, 19 Feb 2014 00:31:13 +0000 (01:31 +0100)]
Merge branch '44210-27' of git://github.com/samhemelryk/moodle
Eloy Lafuente (stronk7) [Wed, 19 Feb 2014 00:30:43 +0000 (01:30 +0100)]
Merge branch '44209-27' of git://github.com/samhemelryk/moodle
Eloy Lafuente (stronk7) [Wed, 19 Feb 2014 00:28:53 +0000 (01:28 +0100)]
Merge branch '44208-27' of git://github.com/samhemelryk/moodle
Eloy Lafuente (stronk7) [Wed, 19 Feb 2014 00:23:59 +0000 (01:23 +0100)]
MDL-44207 theme_nimble: fix incorrect tab.
Eloy Lafuente (stronk7) [Wed, 19 Feb 2014 00:23:04 +0000 (01:23 +0100)]
Merge branch '44207-27' of git://github.com/samhemelryk/moodle
Eloy Lafuente (stronk7) [Wed, 19 Feb 2014 00:21:16 +0000 (01:21 +0100)]
Merge branch '44206-27' of git://github.com/samhemelryk/moodle
Eloy Lafuente (stronk7) [Wed, 19 Feb 2014 00:20:10 +0000 (01:20 +0100)]
Merge branch '44205-27' of git://github.com/samhemelryk/moodle
Eloy Lafuente (stronk7) [Wed, 19 Feb 2014 00:19:43 +0000 (01:19 +0100)]
Merge branch '44204-27' of git://github.com/samhemelryk/moodle
Eloy Lafuente (stronk7) [Wed, 19 Feb 2014 00:19:04 +0000 (01:19 +0100)]
Merge branch '44203-27' of git://github.com/samhemelryk/moodle
Eloy Lafuente (stronk7) [Wed, 19 Feb 2014 00:12:57 +0000 (01:12 +0100)]
Merge branch '44202-27' of git://github.com/samhemelryk/moodle
Eloy Lafuente (stronk7) [Wed, 19 Feb 2014 00:11:46 +0000 (01:11 +0100)]
Merge branch '44201-27' of git://github.com/samhemelryk/moodle
Eloy Lafuente (stronk7) [Wed, 19 Feb 2014 00:11:06 +0000 (01:11 +0100)]
Merge branch '44200-27' of git://github.com/samhemelryk/moodle
Eloy Lafuente (stronk7) [Wed, 19 Feb 2014 00:08:58 +0000 (01:08 +0100)]
Merge branch '44199-27' of git://github.com/samhemelryk/moodle
Eloy Lafuente (stronk7) [Wed, 19 Feb 2014 00:08:23 +0000 (01:08 +0100)]
Merge branch '44198-27' of git://github.com/samhemelryk/moodle
Eloy Lafuente (stronk7) [Wed, 19 Feb 2014 00:03:57 +0000 (01:03 +0100)]
Merge branch '44197-27' of git://github.com/samhemelryk/moodle
Eloy Lafuente (stronk7) [Wed, 19 Feb 2014 00:03:22 +0000 (01:03 +0100)]
Merge branch '44196-27' of git://github.com/samhemelryk/moodle
Eloy Lafuente (stronk7) [Wed, 19 Feb 2014 00:02:00 +0000 (01:02 +0100)]
Merge branch '44195-27' of git://github.com/samhemelryk/moodle
Eloy Lafuente (stronk7) [Wed, 19 Feb 2014 00:01:27 +0000 (01:01 +0100)]
Merge branch '44194-27' of git://github.com/samhemelryk/moodle
Eloy Lafuente (stronk7) [Wed, 19 Feb 2014 00:00:32 +0000 (01:00 +0100)]
Merge branch '44193-27' of git://github.com/samhemelryk/moodle
Eloy Lafuente (stronk7) [Tue, 18 Feb 2014 23:10:47 +0000 (00:10 +0100)]
MDL-43265 question: incorrect closing parenthesis
Eloy Lafuente (stronk7) [Tue, 18 Feb 2014 22:55:52 +0000 (23:55 +0100)]
Merge branch 'MDL-43265_new' of https://github.com/jacks92/moodle
Eloy Lafuente (stronk7) [Tue, 18 Feb 2014 22:24:45 +0000 (23:24 +0100)]
Merge branch 'MDL-43337-master' of git://github.com/FMCorz/moodle
Tim Hunt [Thu, 13 Feb 2014 14:24:20 +0000 (14:24 +0000)]
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.
Tim Hunt [Thu, 13 Feb 2014 12:35:30 +0000 (12:35 +0000)]
MDL-44118 remove the qeupgradehelper tool
and associated code that was only used by it.
Tim Hunt [Thu, 13 Feb 2014 12:26:32 +0000 (12:26 +0000)]
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).
Damyon Wiese [Tue, 18 Feb 2014 07:37:49 +0000 (15:37 +0800)]
Merge branch 'MDL-39337' of git://github.com/apsdehal/moodle
Dan Poltawski [Tue, 18 Feb 2014 06:41:34 +0000 (14:41 +0800)]
Merge branch '44212-27' of git://github.com/samhemelryk/moodle
Sam Hemelryk [Sat, 15 Feb 2014 23:00:06 +0000 (12:00 +1300)]
MDL-44181 mod_scorm: unified @package use
Conflicts:
mod/scorm/db/upgrade.php
Dan Poltawski [Tue, 18 Feb 2014 06:13:58 +0000 (14:13 +0800)]
Merge branch 'master_MDL-43541' of git://github.com/danmarsden/moodle
Damyon Wiese [Tue, 18 Feb 2014 06:01:33 +0000 (14:01 +0800)]
Merge branch 'MDL-43802_master' of git://github.com/dmonllao/moodle
Damyon Wiese [Tue, 18 Feb 2014 05:56:11 +0000 (13:56 +0800)]
Merge branch 'MDL-44187-master' of git://github.com/andrewnicols/moodle
David Monllao [Mon, 10 Feb 2014 09:25:33 +0000 (17:25 +0800)]
MDL-43802 behat: Testing deleted activity with JS enabled
Damyon Wiese [Tue, 18 Feb 2014 05:18:49 +0000 (13:18 +0800)]
MDL-40921 mod_workshop: Add assertEventContextNotUsed to events tests.
Damyon Wiese [Tue, 18 Feb 2014 05:46:11 +0000 (13:46 +0800)]
Merge branch 'w06_MDL-40921_m27_workshopevents' of https://github.com/skodak/moodle
Dan Poltawski [Tue, 18 Feb 2014 05:39:08 +0000 (13:39 +0800)]
Merge branch 'MDL-35103' of git://github.com/jmvedrine/moodle
Damyon Wiese [Tue, 18 Feb 2014 04:40:56 +0000 (12:40 +0800)]
Merge branch 'MDL-41646' of git://github.com/apsdehal/moodle
Damyon Wiese [Tue, 18 Feb 2014 04:00:45 +0000 (12:00 +0800)]
Merge branch 'w07_MDL-42541_m27_portevent' of git://github.com/skodak/moodle
Conflicts:
version.php
Damyon Wiese [Tue, 18 Feb 2014 02:16:15 +0000 (10:16 +0800)]
Merge branch 'MDL-43479-master' of https://github.com/jamiepratt/moodle
Eloy Lafuente (stronk7) [Tue, 18 Feb 2014 00:55:23 +0000 (01:55 +0100)]
Merge branch '43822-27' of git://github.com/samhemelryk/moodle
Eloy Lafuente (stronk7) [Tue, 18 Feb 2014 00:50:24 +0000 (01:50 +0100)]
Merge branch '44184-27' of git://github.com/samhemelryk/moodle
Eloy Lafuente (stronk7) [Tue, 18 Feb 2014 00:47:31 +0000 (01:47 +0100)]
Merge branch '44103-27' of git://github.com/samhemelryk/moodle
Eloy Lafuente (stronk7) [Tue, 18 Feb 2014 00:46:47 +0000 (01:46 +0100)]
Merge branch '44104-27' of git://github.com/samhemelryk/moodle
Eloy Lafuente (stronk7) [Tue, 18 Feb 2014 00:46:14 +0000 (01:46 +0100)]
Merge branch '44105-27' of git://github.com/samhemelryk/moodle
Eloy Lafuente (stronk7) [Tue, 18 Feb 2014 00:33:05 +0000 (01:33 +0100)]
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).
Eloy Lafuente (stronk7) [Tue, 18 Feb 2014 00:27:04 +0000 (01:27 +0100)]
Merge branch '44151-27' of git://github.com/samhemelryk/moodle
Eloy Lafuente (stronk7) [Tue, 18 Feb 2014 00:02:22 +0000 (01:02 +0100)]
Merge branch '44120-27' of git://github.com/samhemelryk/moodle
Eloy Lafuente (stronk7) [Mon, 17 Feb 2014 23:56:26 +0000 (00:56 +0100)]
Merge branch '44152-27' of git://github.com/samhemelryk/moodle
Eloy Lafuente (stronk7) [Mon, 17 Feb 2014 23:55:53 +0000 (00:55 +0100)]
Merge branch '44153-27' of git://github.com/samhemelryk/moodle
Eloy Lafuente (stronk7) [Mon, 17 Feb 2014 23:55:19 +0000 (00:55 +0100)]
Merge branch '44154-27' of git://github.com/samhemelryk/moodle
Eloy Lafuente (stronk7) [Mon, 17 Feb 2014 23:54:28 +0000 (00:54 +0100)]
Merge branch '44155-27' of git://github.com/samhemelryk/moodle
Eloy Lafuente (stronk7) [Mon, 17 Feb 2014 23:53:22 +0000 (00:53 +0100)]
Merge branch '44156-27' of git://github.com/samhemelryk/moodle
Eloy Lafuente (stronk7) [Mon, 17 Feb 2014 23:51:33 +0000 (00:51 +0100)]
Merge branch '44157-27' of git://github.com/samhemelryk/moodle
Sam Hemelryk [Fri, 14 Feb 2014 03:54:46 +0000 (16:54 +1300)]
MDL-44151 mod_assignment: unified @package use
Sam Hemelryk [Fri, 14 Feb 2014 03:56:59 +0000 (16:56 +1300)]
MDL-44152 mod_chat: unified @package use
Sam Hemelryk [Fri, 14 Feb 2014 03:58:23 +0000 (16:58 +1300)]
MDL-44153 mod_choice: unified @package use
Sam Hemelryk [Fri, 14 Feb 2014 03:59:20 +0000 (16:59 +1300)]
MDL-44154 mod_data: unified @package use
Sam Hemelryk [Fri, 14 Feb 2014 04:04:59 +0000 (17:04 +1300)]
MDL-44156 mod_resource: unified @package use
Sam Hemelryk [Fri, 14 Feb 2014 04:10:32 +0000 (17:10 +1300)]
MDL-44157 mod_forum: unified @package use
Sam Hemelryk [Fri, 14 Feb 2014 04:01:49 +0000 (17:01 +1300)]
MDL-44155 mod_feedback: unified @package use
Sam Hemelryk [Sun, 16 Feb 2014 22:23:58 +0000 (11:23 +1300)]
MDL-44213 theme_standardold: unified @package use and improved coding style
David Monllao [Tue, 11 Feb 2014 08:06:55 +0000 (16:06 +0800)]
MDL-44085 course: Replace JS confirm() by YUI confirm
Sam Hemelryk [Mon, 17 Feb 2014 20:31:32 +0000 (09:31 +1300)]
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
Sam Hemelryk [Mon, 17 Feb 2014 20:30:50 +0000 (09:30 +1300)]
Merge branch 'MDL-44161-master' of git://github.com/andrewnicols/moodle
Eloy Lafuente (stronk7) [Mon, 17 Feb 2014 14:45:01 +0000 (15:45 +0100)]
Merge branch 'MDL-41759-master' of https://github.com/jamiepratt/moodle
James Pratt [Mon, 17 Feb 2014 10:31:36 +0000 (17:31 +0700)]
MDL-41759 quiz statistics : install.xml & upgrade.php difference
Damyon Wiese [Mon, 17 Feb 2014 08:08:50 +0000 (16:08 +0800)]
Merge branch 'MDL-43539-master' of https://github.com/jamiepratt/moodle
Damyon Wiese [Mon, 17 Feb 2014 07:32:45 +0000 (15:32 +0800)]
Merge branch 'MDL-41759-master' of https://github.com/jamiepratt/moodle
Damyon Wiese [Mon, 17 Feb 2014 07:04:05 +0000 (15:04 +0800)]
Merge branch 'MDL-41758-master' of git://github.com/jamiepratt/moodle
Damyon Wiese [Mon, 17 Feb 2014 07:01:45 +0000 (15:01 +0800)]
Merge branch 'MDL-41755-master-v2' of git://github.com/jamiepratt/moodle
Dan Marsden [Tue, 28 Jan 2014 01:15:31 +0000 (14:15 +1300)]
MDL-43541 SCORM: set first launchable sco correctly.
Dan Poltawski [Mon, 17 Feb 2014 06:48:01 +0000 (14:48 +0800)]
Merge branch '44158-27' of git://github.com/samhemelryk/moodle
Dan Poltawski [Mon, 17 Feb 2014 06:41:05 +0000 (14:41 +0800)]
MDL-33099 deprecatedlib: clarify some comments
Dan Poltawski [Mon, 17 Feb 2014 06:40:36 +0000 (14:40 +0800)]
Merge branch 'MDL-33099-master' of git://github.com/andrewnicols/moodle
Damyon Wiese [Mon, 17 Feb 2014 06:37:18 +0000 (14:37 +0800)]
Merge branch 'MDL-40062-master' of git://github.com/danpoltawski/moodle
Damyon Wiese [Mon, 17 Feb 2014 06:19:36 +0000 (14:19 +0800)]
Merge branch 'MDL-43504-master' of git://github.com/andrewnicols/moodle
Damyon Wiese [Mon, 17 Feb 2014 06:12:16 +0000 (14:12 +0800)]
Merge branch 'MDL-23514-master' of https://github.com/danielneis/moodle
Conflicts:
lang/en/admin.php
Andrew Nicols [Mon, 10 Feb 2014 07:17:46 +0000 (15:17 +0800)]
MDL-33099 Javascript: Deprecate the ajaxenabled function
Dan Poltawski [Mon, 17 Feb 2014 06:04:27 +0000 (14:04 +0800)]
MDL-40062 mod_forum: Add discussion_updated event
Dan Poltawski [Wed, 12 Feb 2014 07:54:41 +0000 (15:54 +0800)]
MDL-40062 mod_forum: add event unit tests
And bump forum version for new events.
Dan Poltawski [Mon, 10 Feb 2014 01:54:06 +0000 (09:54 +0800)]
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.
Dan Poltawski [Mon, 10 Feb 2014 07:03:30 +0000 (15:03 +0800)]
MDL-40062 mod_forum: read tracking events
* readtracking_enabled
* readtracking_disabled
Dan Poltawski [Fri, 7 Feb 2014 07:38:51 +0000 (15:38 +0800)]
MDL-40062 mod_forum: subscription events
Events for forum mail subscriptions
* subscription_created
* subscription_deleted
* subscribers_viewed
Dan Poltawski [Thu, 13 Feb 2014 08:44:02 +0000 (16:44 +0800)]
MDL-40062 mod_forum: discussion events
* discussion_created
* discussion_deleted
* discussion_moved
* discussion_viewed
Damyon Wiese [Mon, 17 Feb 2014 05:14:45 +0000 (13:14 +0800)]
Merge branch 'MDL-40061_master' of https://github.com/markn86/moodle
Dan Poltawski [Mon, 17 Feb 2014 04:13:39 +0000 (12:13 +0800)]
Merge branch 'MDL-42618_master' of git://github.com/SWiT/moodle
Dan Poltawski [Mon, 17 Feb 2014 04:06:42 +0000 (12:06 +0800)]
Merge branch 'MDL-27414' of git://github.com/jmvedrine/moodle
Andrew Nicols [Mon, 17 Feb 2014 03:33:50 +0000 (11:33 +0800)]
MDL-43504 Course: Include the course/category collapse JS correctly
This was previously only included when there were hidden categories to show
which were not yet visible. As a result, if all categories were visible,
then the JS was not included.
Andrew Nicols [Mon, 10 Feb 2014 07:44:19 +0000 (15:44 +0800)]
MDL-43504 Javascript: Frontpage collapsing should not depend on enableajax
This is an oversight, but we should not depend on the enableajax setting
which we're trying to deprecate.
Andrew Nicols [Wed, 5 Feb 2014 15:57:32 +0000 (23:57 +0800)]
MDL-43997 Javascript: Make all informative dialogues display correctly
Most of the moodle core dialogue types should be shown modally, and
centred. They should also be shown on instantiation.
Rather than re-define all of these settings, this patch introduces a new
subclass of M.core.dialogue which sets them up with the same settings.
Dan Poltawski [Mon, 17 Feb 2014 02:32:33 +0000 (10:32 +0800)]
Merge branch 'MDL-42033' of git://github.com/jmvedrine/moodle
Dan Poltawski [Mon, 10 Feb 2014 04:56:21 +0000 (12:56 +0800)]
MDL-40062 mod_forum: convert viewed events
* course_module_instance_list_viewed
* forum_viewed
* course_searched
* userreport_viewed
Dan Poltawski [Thu, 13 Feb 2014 07:41:50 +0000 (15:41 +0800)]
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.
Damyon Wiese [Mon, 17 Feb 2014 01:14:46 +0000 (09:14 +0800)]
Merge branch 'MDL-44018' of git://github.com/timhunt/moodle
Sam Hemelryk [Sun, 16 Feb 2014 22:15:07 +0000 (11:15 +1300)]
MDL-44196 theme_base: unified @package use and improved coding style
Sam Hemelryk [Sun, 16 Feb 2014 22:14:37 +0000 (11:14 +1300)]
MDL-44195 theme_arialist: unified @package use and improved coding style
