Damyon Wiese [Mon, 24 Feb 2014 07:04:33 +0000 (15:04 +0800)]
MDL-44319 phpdocs mod_page: Remove @subpackage tags and add @category
Damyon Wiese [Mon, 24 Feb 2014 06:51:08 +0000 (14:51 +0800)]
Merge branch '41179-27' of git://github.com/samhemelryk/moodle
Damyon Wiese [Mon, 24 Feb 2014 06:49:10 +0000 (14:49 +0800)]
Merge branch '44182-27' of git://github.com/samhemelryk/moodle
Damyon Wiese [Mon, 24 Feb 2014 06:46:16 +0000 (14:46 +0800)]
Merge branch '44183-27' of git://github.com/samhemelryk/moodle
Damyon Wiese [Mon, 24 Feb 2014 06:41:29 +0000 (14:41 +0800)]
Merge branch 'MDL-44214-master' of git://github.com/andrewnicols/moodle
Damyon Wiese [Mon, 24 Feb 2014 06:32:49 +0000 (14:32 +0800)]
Merge branch 'MDL-44247-master' of git://github.com/FMCorz/moodle
Damyon Wiese [Mon, 24 Feb 2014 05:46:13 +0000 (13:46 +0800)]
MDL-44264 Badges: Cleanup imports in previous commit.
Damyon Wiese [Mon, 24 Feb 2014 05:40:47 +0000 (13:40 +0800)]
Merge branch 'MDL-44264' of https://github.com/merrill-oakland/moodle
Damyon Wiese [Mon, 24 Feb 2014 05:37:52 +0000 (13:37 +0800)]
Merge branch '44279-27' of git://github.com/samhemelryk/moodle
Damyon Wiese [Mon, 24 Feb 2014 05:29:58 +0000 (13:29 +0800)]
Merge branch 'MDL-44286_master' of git://github.com/dmonllao/moodle
Damyon Wiese [Mon, 24 Feb 2014 05:27:12 +0000 (13:27 +0800)]
Merge branch 'MDL-44288' of git://github.com/timhunt/moodle
Damyon Wiese [Mon, 24 Feb 2014 05:19:17 +0000 (13:19 +0800)]
MDL-18633 User: Fixed calls to html_writer on user/profile page.
Damyon Wiese [Mon, 24 Feb 2014 05:10:22 +0000 (13:10 +0800)]
Merge branch 'MDL-18633' of https://github.com/danielneis/moodle
Damyon Wiese [Mon, 24 Feb 2014 04:30:55 +0000 (12:30 +0800)]
Merge branch 'MDL-44006-m' of https://github.com/micaherne/moodle
Damyon Wiese [Mon, 24 Feb 2014 03:42:51 +0000 (11:42 +0800)]
Merge branch 'MDL-44269_master' of git://github.com/lazydaisy/moodle
Damyon Wiese [Mon, 24 Feb 2014 03:13:38 +0000 (11:13 +0800)]
Merge branch '44217-27' of git://github.com/samhemelryk/moodle
Damyon Wiese [Mon, 24 Feb 2014 03:08:03 +0000 (11:08 +0800)]
Merge branch 'MDL-34319_master' of https://github.com/markn86/moodle
Sam Hemelryk [Tue, 18 Feb 2014 20:41:53 +0000 (09:41 +1300)]
MDL-44217 theme_bootstrapbase: darkend link colour by 5% for accessibility
Damyon Wiese [Mon, 24 Feb 2014 01:57:15 +0000 (09:57 +0800)]
Merge branch 'MDL-41767-master' of git://github.com/FMCorz/moodle
David Monllao [Thu, 20 Feb 2014 06:40:59 +0000 (14:40 +0800)]
MDL-44286 behat: Updating to our custom Syn library
Sam Hemelryk [Wed, 19 Feb 2014 20:43:22 +0000 (09:43 +1300)]
MDL-42279 user: fixed typo in user_get_user_details_courses
Sam Hemelryk [Wed, 19 Feb 2014 20:53:36 +0000 (09:53 +1300)]
MDL-44279 user: added unit test to trigger known bug
Sam Hemelryk [Sat, 15 Feb 2014 23:01:40 +0000 (12:01 +1300)]
MDL-44183 mod_workshop: unified @package use
Sam Hemelryk [Sat, 15 Feb 2014 23:00:56 +0000 (12:00 +1300)]
MDL-44182 mod_survey: unified @package use
Tim Hunt [Thu, 20 Feb 2014 11:44:28 +0000 (11:44 +0000)]
MDL-44288 qtype_calculatedsimple fix validation notice.
The notice happend if you clicked Save changes before Find the wild
cards {x..} present in the correct answer formulas.
Eloy Lafuente (stronk7) [Thu, 20 Feb 2014 11:43:03 +0000 (12:43 +0100)]
weekly release 2.7dev
Eloy Lafuente (stronk7) [Thu, 20 Feb 2014 11:42:59 +0000 (12:42 +0100)]
Merge branch 'install_master' of git://git.moodle.org/moodle-install
Mary Evans [Wed, 19 Feb 2014 22:03:38 +0000 (22:03 +0000)]
MDL-44269 theme_clean: Change location of navbar (breadcumb) to below logo.
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
Eric Merrill [Tue, 18 Feb 2014 14:43:51 +0000 (09:43 -0500)]
MDL-44264 badges Add badges to the user short profile page.
Daniel Neis Araujo [Mon, 29 Jul 2013 14:21:38 +0000 (11:21 -0300)]
MDL-18633 User profile: add last ip field to user view
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
