moodle.git
7 years agoMerge branch 'MDL-40916_master' of https://github.com/markn86/moodle
Dan Poltawski [Tue, 25 Feb 2014 02:47:20 +0000 (10:47 +0800)]
Merge branch 'MDL-40916_master' of https://github.com/markn86/moodle

7 years agoMerge branch 'w08_MDL-42889_m27_vir' of https://github.com/skodak/moodle
Damyon Wiese [Tue, 25 Feb 2014 02:32:44 +0000 (10:32 +0800)]
Merge branch 'w08_MDL-42889_m27_vir' of https://github.com/skodak/moodle

7 years agoMerge branch 'MDL-43405_master' of https://github.com/markn86/moodle
Dan Poltawski [Tue, 25 Feb 2014 02:30:35 +0000 (10:30 +0800)]
Merge branch 'MDL-43405_master' of https://github.com/markn86/moodle

7 years agoMerge branch 'MDL-42923' of git://github.com/jleyva/moodle
Damyon Wiese [Tue, 25 Feb 2014 02:26:22 +0000 (10:26 +0800)]
Merge branch 'MDL-42923' of git://github.com/jleyva/moodle

Conflicts:
version.php

7 years agoMerge branch 'MDL-43478-master-v4' of git://github.com/jamiepratt/moodle
Dan Poltawski [Tue, 25 Feb 2014 01:27:35 +0000 (09:27 +0800)]
Merge branch 'MDL-43478-master-v4' of git://github.com/jamiepratt/moodle

7 years agoMDL-38903: Version bump for lang strings
Damyon Wiese [Tue, 25 Feb 2014 01:25:43 +0000 (09:25 +0800)]
MDL-38903: Version bump for lang strings

7 years agoMerge branch 'MDL-38903-master' of git://github.com/phalacee/moodle
Damyon Wiese [Tue, 25 Feb 2014 01:21:30 +0000 (09:21 +0800)]
Merge branch 'MDL-38903-master' of git://github.com/phalacee/moodle

Conflicts:
theme/bootstrapbase/style/moodle.css

7 years agoMDL-38903 File picker: making upload form with more semantic HTML
Jason Fowler [Fri, 17 Jan 2014 03:23:59 +0000 (11:23 +0800)]
MDL-38903 File picker: making upload form with more semantic HTML

7 years agoMerge branch 'MDL-43837_master' of git://github.com/dmonllao/moodle
Damyon Wiese [Mon, 24 Feb 2014 08:56:05 +0000 (16:56 +0800)]
Merge branch 'MDL-43837_master' of git://github.com/dmonllao/moodle

7 years agoMDL-44101 Javascript: Apply widget-focusonclose to some core dialogues
Andrew Nicols [Tue, 11 Feb 2014 10:01:36 +0000 (18:01 +0800)]
MDL-44101 Javascript: Apply widget-focusonclose to some core dialogues

Conflicts:
lib/yui/build/moodle-core-notification-dialogue/moodle-core-notification-dialogue-min.js

7 years agoMDL-44101 Javascript: Introduce a module to focus after widget close
Andrew Nicols [Tue, 11 Feb 2014 10:01:29 +0000 (18:01 +0800)]
MDL-44101 Javascript: Introduce a module to focus after widget close

This module supports focusing on a specified Node, or attempting to
determine the Node which caused the displayed the Widget to return focus to
that location.

7 years agoMerge branch 'MDL-44108_master' of git://github.com/dmonllao/moodle
Damyon Wiese [Mon, 24 Feb 2014 07:42:32 +0000 (15:42 +0800)]
Merge branch 'MDL-44108_master' of git://github.com/dmonllao/moodle

7 years agoMerge branch 'MDL-44111_master' of git://github.com/dmonllao/moodle
Damyon Wiese [Mon, 24 Feb 2014 07:39:32 +0000 (15:39 +0800)]
Merge branch 'MDL-44111_master' of git://github.com/dmonllao/moodle

7 years agoMerge branch 'wip-MDL-44139-master' of git://github.com/ds125v/moodle
Damyon Wiese [Mon, 24 Feb 2014 07:28:51 +0000 (15:28 +0800)]
Merge branch 'wip-MDL-44139-master' of git://github.com/ds125v/moodle

Conflicts:
theme/bootstrapbase/style/moodle.css

7 years agoMerge branch '44159-27' of git://github.com/samhemelryk/moodle
Damyon Wiese [Mon, 24 Feb 2014 07:26:05 +0000 (15:26 +0800)]
Merge branch '44159-27' of git://github.com/samhemelryk/moodle

7 years agoMerge branch 'wip-MDL-44168-master' of git://github.com/ds125v/moodle
Damyon Wiese [Mon, 24 Feb 2014 07:20:49 +0000 (15:20 +0800)]
Merge branch 'wip-MDL-44168-master' of git://github.com/ds125v/moodle

Conflicts:
theme/bootstrapbase/style/moodle.css

7 years agoMerge branch '41175-27' of git://github.com/samhemelryk/moodle
Damyon Wiese [Mon, 24 Feb 2014 07:15:00 +0000 (15:15 +0800)]
Merge branch '41175-27' of git://github.com/samhemelryk/moodle

7 years agoMerge branch '41176-27' of git://github.com/samhemelryk/moodle
Damyon Wiese [Mon, 24 Feb 2014 07:13:00 +0000 (15:13 +0800)]
Merge branch '41176-27' of git://github.com/samhemelryk/moodle

7 years agoMerge branch '41177-27' of git://github.com/samhemelryk/moodle
Damyon Wiese [Mon, 24 Feb 2014 07:10:53 +0000 (15:10 +0800)]
Merge branch '41177-27' of git://github.com/samhemelryk/moodle

7 years agoMerge branch '41178-27' of git://github.com/samhemelryk/moodle
Damyon Wiese [Mon, 24 Feb 2014 07:08:33 +0000 (15:08 +0800)]
Merge branch '41178-27' of git://github.com/samhemelryk/moodle

7 years agoMerge branch '41179-27' of git://github.com/samhemelryk/moodle
Damyon Wiese [Mon, 24 Feb 2014 06:51:08 +0000 (14:51 +0800)]
Merge branch '41179-27' of git://github.com/samhemelryk/moodle

7 years agoMerge branch '44182-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

7 years agoMerge branch '44183-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

7 years agoMerge branch 'MDL-44214-master' of git://github.com/andrewnicols/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

7 years agoMerge branch 'MDL-44247-master' of git://github.com/FMCorz/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

7 years agoMDL-44264 Badges: Cleanup imports in previous commit.
Damyon Wiese [Mon, 24 Feb 2014 05:46:13 +0000 (13:46 +0800)]
MDL-44264 Badges: Cleanup imports in previous commit.

7 years agoMerge branch 'MDL-44264' of https://github.com/merrill-oakland/moodle
Damyon Wiese [Mon, 24 Feb 2014 05:40:47 +0000 (13:40 +0800)]
Merge branch 'MDL-44264' of https://github.com/merrill-oakland/moodle

7 years agoMerge branch '44279-27' of git://github.com/samhemelryk/moodle
Damyon Wiese [Mon, 24 Feb 2014 05:37:52 +0000 (13:37 +0800)]
Merge branch '44279-27' of git://github.com/samhemelryk/moodle

7 years agoMerge branch 'MDL-44286_master' of git://github.com/dmonllao/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

7 years agoMerge branch 'MDL-44288' of git://github.com/timhunt/moodle
Damyon Wiese [Mon, 24 Feb 2014 05:27:12 +0000 (13:27 +0800)]
Merge branch 'MDL-44288' of git://github.com/timhunt/moodle

7 years agoMDL-18633 User: Fixed calls to html_writer on user/profile page.
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.

7 years agoMerge branch 'MDL-18633' of https://github.com/danielneis/moodle
Damyon Wiese [Mon, 24 Feb 2014 05:10:22 +0000 (13:10 +0800)]
Merge branch 'MDL-18633' of https://github.com/danielneis/moodle

7 years agoMerge branch 'MDL-44006-m' of https://github.com/micaherne/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

7 years agoMerge branch 'MDL-44269_master' of git://github.com/lazydaisy/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

7 years agoMerge branch '44217-27' of git://github.com/samhemelryk/moodle
Damyon Wiese [Mon, 24 Feb 2014 03:13:38 +0000 (11:13 +0800)]
Merge branch '44217-27' of git://github.com/samhemelryk/moodle

7 years agoMerge branch 'MDL-34319_master' of https://github.com/markn86/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

7 years agoMDL-44217 theme_bootstrapbase: darkend link colour by 5% for accessibility
Sam Hemelryk [Tue, 18 Feb 2014 20:41:53 +0000 (09:41 +1300)]
MDL-44217 theme_bootstrapbase: darkend link colour by 5% for accessibility

7 years agoMerge branch 'MDL-41767-master' of git://github.com/FMCorz/moodle
Damyon Wiese [Mon, 24 Feb 2014 01:57:15 +0000 (09:57 +0800)]
Merge branch 'MDL-41767-master' of git://github.com/FMCorz/moodle

7 years agoMDL-43837 behat: Adding reduced timeouts
David Monllao [Thu, 13 Feb 2014 03:47:50 +0000 (11:47 +0800)]
MDL-43837 behat: Adding reduced timeouts

There are steps where we want to check that
"something" does not appear in the page
or does not exist. We still have to spin
but we don't need to spin for 6 seconds.

7 years agoMDL-43478 quiz responses report : display last / first / all tries
James Pratt [Thu, 13 Feb 2014 07:01:00 +0000 (14:01 +0700)]
MDL-43478 quiz responses report : display last / first / all tries

when using multiple try question behaviour

7 years agoMDL-42923 Add renamed web services to the Mobile app service
Juan Leyva [Fri, 21 Feb 2014 14:26:45 +0000 (15:26 +0100)]
MDL-42923 Add renamed web services to the Mobile app service

Keep the deprecated ones for backwards compatibility

7 years agoMDL-44108 behat: Adding a roles data generator
David Monllao [Thu, 13 Feb 2014 03:32:49 +0000 (11:32 +0800)]
MDL-44108 behat: Adding a roles data generator

7 years agoMDL-44111 behat: Limiting dump files filename size
David Monllao [Wed, 12 Feb 2014 09:37:58 +0000 (17:37 +0800)]
MDL-44111 behat: Limiting dump files filename size

7 years agoMDL-44286 behat: Updating to our custom Syn library
David Monllao [Thu, 20 Feb 2014 06:40:59 +0000 (14:40 +0800)]
MDL-44286 behat: Updating to our custom Syn library

7 years agoMDL-42279 user: fixed typo in user_get_user_details_courses
Sam Hemelryk [Wed, 19 Feb 2014 20:43:22 +0000 (09:43 +1300)]
MDL-42279 user: fixed typo in user_get_user_details_courses

7 years agoMDL-44279 user: added unit test to trigger known bug
Sam Hemelryk [Wed, 19 Feb 2014 20:53:36 +0000 (09:53 +1300)]
MDL-44279 user: added unit test to trigger known bug

7 years agoMDL-44183 mod_workshop: unified @package use
Sam Hemelryk [Sat, 15 Feb 2014 23:01:40 +0000 (12:01 +1300)]
MDL-44183 mod_workshop: unified @package use

7 years agoMDL-44182 mod_survey: unified @package use
Sam Hemelryk [Sat, 15 Feb 2014 23:00:56 +0000 (12:00 +1300)]
MDL-44182 mod_survey: unified @package use

7 years agoMDL-44159 mod_wiki: unify @package use
Sam Hemelryk [Fri, 14 Feb 2014 04:25:09 +0000 (17:25 +1300)]
MDL-44159 mod_wiki: unify @package use

7 years agoMDL-44288 qtype_calculatedsimple fix validation notice.
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.

7 years agoweekly release 2.7dev
Eloy Lafuente (stronk7) [Thu, 20 Feb 2014 11:43:03 +0000 (12:43 +0100)]
weekly release 2.7dev

7 years agoMerge branch 'install_master' of git://git.moodle.org/moodle-install
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

7 years agoMDL-44269 theme_clean: Change location of navbar (breadcumb) to below logo.
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.

7 years agoMDL-44118 question engine: Fix bad merge conflict resolution (again)
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).

7 years agoMDL-44118 question engine: Fix bad merge conflict resolution
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).

7 years agoMerge branch 'MDL-44118_2' of git://github.com/timhunt/moodle
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

7 years agoMerge branch '44213-27' of git://github.com/samhemelryk/moodle
Eloy Lafuente (stronk7) [Wed, 19 Feb 2014 00:33:20 +0000 (01:33 +0100)]
Merge branch '44213-27' of git://github.com/samhemelryk/moodle

7 years agoMerge branch '44211-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

7 years agoMerge branch '44210-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

7 years agoMerge branch '44209-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

7 years agoMerge branch '44208-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

7 years agoMDL-44207 theme_nimble: fix incorrect tab.
Eloy Lafuente (stronk7) [Wed, 19 Feb 2014 00:23:59 +0000 (01:23 +0100)]
MDL-44207 theme_nimble: fix incorrect tab.

7 years agoMerge branch '44207-27' of git://github.com/samhemelryk/moodle
Eloy Lafuente (stronk7) [Wed, 19 Feb 2014 00:23:04 +0000 (01:23 +0100)]
Merge branch '44207-27' of git://github.com/samhemelryk/moodle

7 years agoMerge branch '44206-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

7 years agoMerge branch '44205-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

7 years agoMerge branch '44204-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

7 years agoMerge branch '44203-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

7 years agoMerge branch '44202-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

7 years agoMerge branch '44201-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

7 years agoMerge branch '44200-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

7 years agoMerge branch '44199-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

7 years agoMerge branch '44198-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

7 years agoMerge branch '44197-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

7 years agoMerge branch '44196-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

7 years agoMerge branch '44195-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

7 years agoMerge branch '44194-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

7 years agoMerge branch '44193-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

7 years agoMDL-43265 question: incorrect closing parenthesis
Eloy Lafuente (stronk7) [Tue, 18 Feb 2014 23:10:47 +0000 (00:10 +0100)]
MDL-43265 question: incorrect closing parenthesis

7 years agoMerge branch 'MDL-43265_new' of https://github.com/jacks92/moodle
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

7 years agoMerge branch 'MDL-43337-master' of git://github.com/FMCorz/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

7 years agoMDL-44264 badges Add badges to the user short profile page.
Eric Merrill [Tue, 18 Feb 2014 14:43:51 +0000 (09:43 -0500)]
MDL-44264 badges Add badges to the user short profile page.

7 years agoMDL-18633 User profile: add last ip field to user view
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

7 years agoMDL-44118 drop old quiz/question attempt data.
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.

7 years agoMDL-44118 remove the qeupgradehelper tool
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.

7 years agoMDL-44118 new environment check are all quiz attempts upgraded.
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).

7 years agoMerge branch 'MDL-39337' of git://github.com/apsdehal/moodle
Damyon Wiese [Tue, 18 Feb 2014 07:37:49 +0000 (15:37 +0800)]
Merge branch 'MDL-39337' of git://github.com/apsdehal/moodle

7 years agoMerge branch '44212-27' of git://github.com/samhemelryk/moodle
Dan Poltawski [Tue, 18 Feb 2014 06:41:34 +0000 (14:41 +0800)]
Merge branch '44212-27' of git://github.com/samhemelryk/moodle

7 years agoMDL-44181 mod_scorm: unified @package use
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

7 years agoMerge branch 'master_MDL-43541' of git://github.com/danmarsden/moodle
Dan Poltawski [Tue, 18 Feb 2014 06:13:58 +0000 (14:13 +0800)]
Merge branch 'master_MDL-43541' of git://github.com/danmarsden/moodle

7 years agoMerge branch 'MDL-43802_master' of git://github.com/dmonllao/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

7 years agoMerge branch 'MDL-44187-master' of git://github.com/andrewnicols/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

7 years agoMDL-43802 behat: Testing deleted activity with JS enabled
David Monllao [Mon, 10 Feb 2014 09:25:33 +0000 (17:25 +0800)]
MDL-43802 behat: Testing deleted activity with JS enabled

7 years agoMDL-40921 mod_workshop: Add assertEventContextNotUsed to events tests.
Damyon Wiese [Tue, 18 Feb 2014 05:18:49 +0000 (13:18 +0800)]
MDL-40921 mod_workshop: Add assertEventContextNotUsed to events tests.

7 years agoMerge branch 'w06_MDL-40921_m27_workshopevents' of https://github.com/skodak/moodle
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

7 years agoMerge branch 'MDL-35103' of git://github.com/jmvedrine/moodle
Dan Poltawski [Tue, 18 Feb 2014 05:39:08 +0000 (13:39 +0800)]
Merge branch 'MDL-35103' of git://github.com/jmvedrine/moodle

7 years agoMerge branch 'MDL-41646' of git://github.com/apsdehal/moodle
Damyon Wiese [Tue, 18 Feb 2014 04:40:56 +0000 (12:40 +0800)]
Merge branch 'MDL-41646' of git://github.com/apsdehal/moodle

7 years agoMerge branch 'w07_MDL-42541_m27_portevent' of git://github.com/skodak/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

7 years agoMDL-40916 mod_imscp: replaced 'view all' add_to_log call with an event
Mark Nelson [Tue, 18 Feb 2014 02:58:07 +0000 (18:58 -0800)]
MDL-40916 mod_imscp: replaced 'view all' add_to_log call with an event

7 years agoMDL-40916 mod_imscp: replaced 'view' add_to_log call with an event
Mark Nelson [Tue, 18 Feb 2014 02:54:23 +0000 (18:54 -0800)]
MDL-40916 mod_imscp: replaced 'view' add_to_log call with an event

7 years agoMerge branch 'MDL-43479-master' of https://github.com/jamiepratt/moodle
Damyon Wiese [Tue, 18 Feb 2014 02:16:15 +0000 (10:16 +0800)]
Merge branch 'MDL-43479-master' of https://github.com/jamiepratt/moodle