moodle.git
7 years agoMDL-25505 behat: Adding a time gap between two cron runs.
David Monllao [Thu, 27 Feb 2014 06:29:20 +0000 (14:29 +0800)]
MDL-25505 behat: Adding a time gap between two cron runs.

According to \core\task\scheduled_task::get_next_scheduled_time() we
wait 61 seconds, as the next scheduled time is in the next minute.

7 years agoMDL-44286 behat: Fixing JS code error
David Monllao [Thu, 27 Feb 2014 03:47:06 +0000 (11:47 +0800)]
MDL-44286 behat: Fixing JS code error

PhantomJS console shows a JS error regarding
an undefined Syn var; as explained by Andrew
Nicols this is caused by Syn supported features
checker, the change in moodle-behat-extension
solves this problem.

7 years agoMerge branch 'MDL-38903-master' of git://github.com/phalacee/moodle
Damyon Wiese [Thu, 27 Feb 2014 05:18:27 +0000 (13:18 +0800)]
Merge branch 'MDL-38903-master' of git://github.com/phalacee/moodle

7 years agoMDL-38903 Filepicker: Improving Bootstrap button support
Jason Fowler [Thu, 27 Feb 2014 02:51:03 +0000 (10:51 +0800)]
MDL-38903 Filepicker: Improving Bootstrap button support

7 years agoMDL-44139 Remove adminwarning from base css.
Damyon Wiese [Wed, 26 Feb 2014 07:30:44 +0000 (15:30 +0800)]
MDL-44139 Remove adminwarning from base css.

Grr. Afterburner has nothing defined for adminwarning before, so this
makes it look all red and splotchy.

7 years agoMDL-44139 Themes: Add default definitions for .adminwarning and .adminerror to base
Damyon Wiese [Wed, 26 Feb 2014 06:07:07 +0000 (14:07 +0800)]
MDL-44139 Themes: Add default definitions for .adminwarning and .adminerror to base

These were missing from base, but were defined in standard and canvas, which 99% of old themes
inherit from. But they are critical for the proper display of moodle and should at least have a
default definition in all themes (e.g. afterburner only inherits from base).

This background color has been tested for contrast accessibility.

7 years agoMDL-25499: Centralise management of all types of cron tasks
Damyon Wiese [Tue, 25 Feb 2014 01:47:39 +0000 (09:47 +0800)]
MDL-25499: Centralise management of all types of cron tasks

Centralise management of all types of cron tasks with registration, scheduling,
parallel task conflicts(blocking) and running once off tasks, all using an
administration screen.

This is a combination of several issues:

MDL-25502: Added "black magic" task allocator for cron
MDL-25503: Add step to cron to run all scheduled tasks
MDL-25504 cron: Refactor to use scheduler
MDL-25505: Add an admin interface to schedule tasks via cron.
MDL-25507: Add support for adhoc tasks.

7 years agoMDL-43723 Blocks drag and drop: Javascript cleanup
Damyon Wiese [Tue, 25 Feb 2014 09:01:45 +0000 (17:01 +0800)]
MDL-43723 Blocks drag and drop: Javascript cleanup

Declare the selector instead of repeating it several times.

7 years agoMerge branch 'MDL-43723-master-nomerge2' of git://github.com/mouneyrac/moodle
Damyon Wiese [Tue, 25 Feb 2014 08:43:56 +0000 (16:43 +0800)]
Merge branch 'MDL-43723-master-nomerge2' of git://github.com/mouneyrac/moodle

7 years agoMerge branch 'MDL-43882_master' of git://github.com/dmonllao/moodle
Dan Poltawski [Tue, 25 Feb 2014 07:33:58 +0000 (15:33 +0800)]
Merge branch 'MDL-43882_master' of git://github.com/dmonllao/moodle

7 years agoMerge branch '44255-27' of git://github.com/samhemelryk/moodle
Damyon Wiese [Tue, 25 Feb 2014 06:14:31 +0000 (14:14 +0800)]
Merge branch '44255-27' of git://github.com/samhemelryk/moodle

Conflicts:
user/profile.php

7 years agoMerge branch 'wip-mdl-40919' of https://github.com/rajeshtaneja/moodle
Damyon Wiese [Tue, 25 Feb 2014 04:44:35 +0000 (12:44 +0800)]
Merge branch 'wip-mdl-40919' of https://github.com/rajeshtaneja/moodle

7 years agoMDL-18633 admin: Added capability string for user:viewlastip
Rajesh Taneja [Tue, 25 Feb 2014 04:02:07 +0000 (12:02 +0800)]
MDL-18633 admin: Added capability string for user:viewlastip

7 years agoMDL-43882 lib: Adding info about the new performance metric
David Monllao [Tue, 25 Feb 2014 03:30:38 +0000 (11:30 +0800)]
MDL-43882 lib: Adding info about the new performance metric

The performance metric was introduced in MDL-43758.

7 years agoMerge branch '44185-27' of git://github.com/samhemelryk/moodle
Dan Poltawski [Tue, 25 Feb 2014 03:22:24 +0000 (11:22 +0800)]
Merge branch '44185-27' of git://github.com/samhemelryk/moodle

7 years agoMerge branch '44315-27' of git://github.com/samhemelryk/moodle
Damyon Wiese [Tue, 25 Feb 2014 03:09:53 +0000 (11:09 +0800)]
Merge branch '44315-27' of git://github.com/samhemelryk/moodle

7 years agoMDL-40619 mod_quiz: Remove commented non-js behat scenario
Damyon Wiese [Tue, 25 Feb 2014 03:02:03 +0000 (11:02 +0800)]
MDL-40619 mod_quiz: Remove commented non-js behat scenario

7 years agoMerge branch 'wip-MDL-40619-master' of git://github.com/marinaglancy/moodle
Damyon Wiese [Tue, 25 Feb 2014 02:53:09 +0000 (10:53 +0800)]
Merge branch 'wip-MDL-40619-master' of git://github.com/marinaglancy/moodle

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 agoMDL-40919 mod_survey: replaced add_to_log with events
Rajesh Taneja [Fri, 21 Feb 2014 02:43:34 +0000 (10:43 +0800)]
MDL-40919 mod_survey: replaced add_to_log with events

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-44185 course: fixed @package typo in report/lib.php
Sam Hemelryk [Sat, 15 Feb 2014 23:04:45 +0000 (12:04 +1300)]
MDL-44185 course: fixed @package typo in report/lib.php

7 years agoMDL-44255 user: tidied up phpdocs and coding style
Sam Hemelryk [Mon, 17 Feb 2014 21:12:42 +0000 (10:12 +1300)]
MDL-44255 user: tidied up phpdocs and coding style

7 years agoMDL-44315 phpdoc: fixed up typos and made up tags
Sam Hemelryk [Sun, 23 Feb 2014 20:13:31 +0000 (09:13 +1300)]
MDL-44315 phpdoc: fixed up typos and made up tags

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-43882 dml: New test for perf_get_xxxx() methods
David Monllao [Mon, 17 Feb 2014 07:41:18 +0000 (15:41 +0800)]
MDL-43882 dml: New test for perf_get_xxxx() methods

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