moodle.git
8 years agoMDL-36591 Assignment - rewrite image urls in online text summaries
Damyon Wiese [Wed, 28 Nov 2012 02:04:18 +0000 (10:04 +0800)]
MDL-36591 Assignment - rewrite image urls in online text summaries

8 years agoMDL-36768 cache: Fixed regression in cache stores by reordering classes
Sam Hemelryk [Mon, 26 Nov 2012 23:14:48 +0000 (12:14 +1300)]
MDL-36768 cache: Fixed regression in cache stores by reordering classes

8 years agoMerge branch 'MDL-36826-master' of git://github.com/damyon/moodle
Sam Hemelryk [Mon, 26 Nov 2012 22:38:57 +0000 (11:38 +1300)]
Merge branch 'MDL-36826-master' of git://github.com/damyon/moodle

8 years agoMerge branch 'wip-MDL-36795-master' of git://github.com/abgreeve/moodle
Sam Hemelryk [Mon, 26 Nov 2012 22:22:08 +0000 (11:22 +1300)]
Merge branch 'wip-MDL-36795-master' of git://github.com/abgreeve/moodle

8 years agoMerge branch 'MDL-35760_master' of git://github.com/markn86/moodle
Sam Hemelryk [Mon, 26 Nov 2012 22:10:37 +0000 (11:10 +1300)]
Merge branch 'MDL-35760_master' of git://github.com/markn86/moodle

8 years agoMerge branch 'MDL-36829' of https://github.com/kastashov/moodle
Sam Hemelryk [Mon, 26 Nov 2012 22:05:40 +0000 (11:05 +1300)]
Merge branch 'MDL-36829' of https://github.com/kastashov/moodle

8 years agoMerge branch 'MDL-36760' of git://github.com/timhunt/moodle
Sam Hemelryk [Mon, 26 Nov 2012 21:41:41 +0000 (10:41 +1300)]
Merge branch 'MDL-36760' of git://github.com/timhunt/moodle

8 years agoMDL-35717|NOBUG - fix trailing whitespace problems
Dan Poltawski [Mon, 26 Nov 2012 07:01:31 +0000 (15:01 +0800)]
MDL-35717|NOBUG - fix trailing whitespace problems

8 years agoMDL-36795 - lib / administration: maxsections now limits the default setting for...
Adrian Greeve [Fri, 23 Nov 2012 07:50:11 +0000 (15:50 +0800)]
MDL-36795 - lib / administration: maxsections now limits the default setting for numsections.

In the default course settings, setting the maximum number topics / weeks  to 0 would not
change the default number of sections on the same page as any other number would.
A more appropriate check has been put in place.

This also incorporates a fix for MDL-28584. The course edit screen now also checks to see
if maxsections is set or numeric. If it is not set or numeric then it defaults to 52.

8 years agoMDL-36829: Fix outcome value not being saved when grading a submission
Kirill Astashov [Mon, 26 Nov 2012 05:53:02 +0000 (16:23 +1030)]
MDL-36829: Fix outcome value not being saved when grading a submission

8 years agoMDL-36826: Group assignment - Feedback files are not sent entire group
Damyon Wiese [Mon, 26 Nov 2012 05:33:13 +0000 (13:33 +0800)]
MDL-36826: Group assignment - Feedback files are not sent entire group

8 years agoMerge branch 'MDL-35717-quiz-attempt-checkstate' of git://github.com/mpetrowi/moodle
Dan Poltawski [Mon, 26 Nov 2012 04:07:04 +0000 (12:07 +0800)]
Merge branch 'MDL-35717-quiz-attempt-checkstate' of git://github.com/mpetrowi/moodle

Conflicts:
mod/quiz/tests/generator/lib.php

8 years agoMerge branch 'wip-MDL-36066-master' of git://github.com/marinaglancy/moodle
Dan Poltawski [Mon, 26 Nov 2012 03:42:35 +0000 (11:42 +0800)]
Merge branch 'wip-MDL-36066-master' of git://github.com/marinaglancy/moodle

8 years agoMDL-36066 Removed accidentally added image file causing wrong filemanager display
Marina Glancy [Mon, 26 Nov 2012 02:32:08 +0000 (10:32 +0800)]
MDL-36066 Removed accidentally added image file causing wrong filemanager display

8 years agoMDL-36728: Assignment - submission statement default - Add a langstring fix
Damyon Wiese [Mon, 26 Nov 2012 02:30:37 +0000 (10:30 +0800)]
MDL-36728: Assignment - submission statement default - Add a langstring fix

8 years agoMDL-36728: Assignment - Improve usability of require submission statement setting.
Damyon Wiese [Thu, 22 Nov 2012 05:03:56 +0000 (13:03 +0800)]
MDL-36728: Assignment - Improve usability of require submission statement setting.

This change will hide the setting "Require that students accept the submission statement" at
the assignment level if no submission statement has been configured for a site. It also includes a
change to the help text to separate the assignment level setting from the site level setting. This
change also sets a default assignment submission statement.

AMOS BEGIN
 CPY [requiresubmissionstatement,mod_assign],[requiresubmissionstatementassignment,mod_assign]
AMOS END

8 years agoMerge branch 'MDL-36609_master' of git://github.com/markn86/moodle
Sam Hemelryk [Mon, 26 Nov 2012 01:58:13 +0000 (14:58 +1300)]
Merge branch 'MDL-36609_master' of git://github.com/markn86/moodle

8 years agoMerge branch 'MDL-35569-master' of git://git.luns.net.uk/moodle
Sam Hemelryk [Mon, 26 Nov 2012 01:46:25 +0000 (14:46 +1300)]
Merge branch 'MDL-35569-master' of git://git.luns.net.uk/moodle

8 years agoMerge branch 'wip-MDL-36551-master' of git://github.com/abgreeve/moodle
Sam Hemelryk [Mon, 26 Nov 2012 01:44:40 +0000 (14:44 +1300)]
Merge branch 'wip-MDL-36551-master' of git://github.com/abgreeve/moodle

8 years agoMerge branch 'wip-MDL-36819-m24-rb' of git://github.com/samhemelryk/moodle
Eloy Lafuente (stronk7) [Mon, 26 Nov 2012 01:29:58 +0000 (02:29 +0100)]
Merge branch 'wip-MDL-36819-m24-rb' of git://github.com/samhemelryk/moodle

8 years agoMerge branch 'wip-MDL-36768-m24-r2' of git://github.com/samhemelryk/moodle
Eloy Lafuente (stronk7) [Mon, 26 Nov 2012 01:28:12 +0000 (02:28 +0100)]
Merge branch 'wip-MDL-36768-m24-r2' of git://github.com/samhemelryk/moodle

8 years agoMDL-36819 cache: implemented cache_is_configurable interface
Sam Hemelryk [Sun, 25 Nov 2012 19:31:06 +0000 (08:31 +1300)]
MDL-36819 cache: implemented cache_is_configurable interface

8 years agoMDL-36768 cache: replaced cache_store interface with abstract class
Sam Hemelryk [Fri, 23 Nov 2012 01:22:44 +0000 (14:22 +1300)]
MDL-36768 cache: replaced cache_store interface with abstract class

8 years agoMerge branch 'MDL-36763-master' of git://git.luns.net.uk/moodle
Sam Hemelryk [Sun, 25 Nov 2012 22:42:28 +0000 (11:42 +1300)]
Merge branch 'MDL-36763-master' of git://git.luns.net.uk/moodle

8 years agoMerge branch 'MDL-36400-master' of git://github.com/ankitagarwal/moodle
Sam Hemelryk [Sun, 25 Nov 2012 22:01:15 +0000 (11:01 +1300)]
Merge branch 'MDL-36400-master' of git://github.com/ankitagarwal/moodle

8 years agoMerge branch 'MDL-35963-master' of git://github.com/damyon/moodle
Sam Hemelryk [Sun, 25 Nov 2012 21:40:58 +0000 (10:40 +1300)]
Merge branch 'MDL-35963-master' of git://github.com/damyon/moodle

8 years agoMerge branch 'master_MDL-36772' of git://github.com/danmarsden/moodle
Sam Hemelryk [Sun, 25 Nov 2012 21:24:42 +0000 (10:24 +1300)]
Merge branch 'master_MDL-36772' of git://github.com/danmarsden/moodle

8 years agoMDL-36768 cache: Implemented abstract cache store base class
Sam Hemelryk [Thu, 22 Nov 2012 21:32:51 +0000 (10:32 +1300)]
MDL-36768 cache: Implemented abstract cache store base class

8 years agoMDL-36760 formslib: fix frozen elements with [] in name.
Tim Hunt [Thu, 22 Nov 2012 15:20:38 +0000 (15:20 +0000)]
MDL-36760 formslib: fix frozen elements with [] in name.

This was a regression caused by MDL-30845 or, to be precise, the related
issue MDL-32785.

Form elements with names like multipier[0] require special handling,
such as is present in HTML_QuickForm_element::_prepareValue. I have
added equivalent handling to MoodleQuickForm::exportValues. I am afraid
that I could not think of a way to do this reliably without duplicating
code.

8 years agoOn demand release 2.4beta+
Dan Poltawski [Fri, 23 Nov 2012 08:07:34 +0000 (16:07 +0800)]
On demand release 2.4beta+

8 years agoMDL-36436 - fix ie9 svg compatibility
Dan Poltawski [Fri, 23 Nov 2012 08:06:30 +0000 (16:06 +0800)]
MDL-36436 - fix ie9 svg compatibility

8 years agoOn demand release 2.4beta+
Dan Poltawski [Fri, 23 Nov 2012 07:21:00 +0000 (15:21 +0800)]
On demand release 2.4beta+

8 years agoMDL-36772 SCORM add boilerplate and remove <!-- as it cause jscache to crash and...
Dan Marsden [Fri, 23 Nov 2012 07:20:46 +0000 (20:20 +1300)]
MDL-36772 SCORM add boilerplate and remove <!-- as it cause jscache to crash and burn.

8 years agoMerge branch 'install_master' of git://git.moodle.cz/moodle-install
Dan Poltawski [Fri, 23 Nov 2012 07:11:14 +0000 (15:11 +0800)]
Merge branch 'install_master' of git://git.moodle.cz/moodle-install

8 years agoMerge branch 'w47_MDL-36780_m24_redirect' of git://github.com/skodak/moodle
Aparup Banerjee [Fri, 23 Nov 2012 06:47:25 +0000 (14:47 +0800)]
Merge branch 'w47_MDL-36780_m24_redirect' of git://github.com/skodak/moodle

8 years agoMDL-36779 fix undefined NO_MOODLE_COOKIE after failed db connect
Petr Škoda [Thu, 22 Nov 2012 09:31:58 +0000 (10:31 +0100)]
MDL-36779 fix undefined NO_MOODLE_COOKIE after failed db connect

8 years agoMerge branch 'MDL-36204-files-with-spaces' of git://github.com/mudrd8mz/moodle
Dan Poltawski [Fri, 23 Nov 2012 03:28:51 +0000 (11:28 +0800)]
Merge branch 'MDL-36204-files-with-spaces' of git://github.com/mudrd8mz/moodle

8 years agoMDL-36204 Improve moodle1 conversion of embedded files
David Mudrák [Wed, 21 Nov 2012 19:35:57 +0000 (20:35 +0100)]
MDL-36204 Improve moodle1 conversion of embedded files

URL of files referenced in HTML fields via $@FILEPHP$@ are usually
encoded if they were linked using the HTML editor. So if they contain
spaces or plus signs in the name, their URL is encoded to use %20 and
%2B respectively.

Sometimes, for example when the HTML was edited manually in 1.9 without
the editor, non-encoded file names may be put into the HTML text. Such a
link used to work in 1.9 so we add an explicit support for it, too.

However, we do not support partially encoded URLs (e.g. only spaces are
encoded while plus signs are not). Such links are unmodified and will
rely on Legacy files support.

8 years agoMDL-36763 Remove onclick event when creating activity left indent link
Andrew Robert Nicols [Thu, 22 Nov 2012 10:47:49 +0000 (10:47 +0000)]
MDL-36763 Remove onclick event when creating activity left indent link

The left indent onclick is now handled by a Y.delegate so there is no need
for a seperate event handler.

8 years agoMDL-36780 add SESSION cleanup to web installer
Petr Škoda [Thu, 22 Nov 2012 10:29:57 +0000 (11:29 +0100)]
MDL-36780 add SESSION cleanup to web installer

This might help prevent some SESSION problems at the end
of installation.

8 years agoMDL-36780 fix login redirect in require_login()
Petr Škoda [Thu, 22 Nov 2012 10:27:10 +0000 (11:27 +0100)]
MDL-36780 fix login redirect in require_login()

We can not redirect to login page when user is already logged in.

8 years agoAutomatically generated installer lang files
AMOS bot [Thu, 22 Nov 2012 09:05:22 +0000 (09:05 +0000)]
Automatically generated installer lang files

8 years agoMerge branch 'w47_MDL-36701_m24_composer' of git://github.com/skodak/moodle
Aparup Banerjee [Thu, 22 Nov 2012 08:23:20 +0000 (16:23 +0800)]
Merge branch 'w47_MDL-36701_m24_composer' of git://github.com/skodak/moodle

8 years agoMDL-36701 add composer to phpunit readme
Petr Škoda [Thu, 22 Nov 2012 06:28:59 +0000 (07:28 +0100)]
MDL-36701 add composer to phpunit readme

Thanks Aparup for reminding me!

8 years agoMDL-36753 fix invalid sectionid in backup tests
Petr Škoda [Wed, 21 Nov 2012 11:40:17 +0000 (12:40 +0100)]
MDL-36753 fix invalid sectionid in backup tests

8 years agoMDL-35569 AJAX Move auto-submitting selects to separate YUI module
Andrew Robert Nicols [Fri, 21 Sep 2012 14:17:22 +0000 (15:17 +0100)]
MDL-35569 AJAX Move auto-submitting selects to separate YUI module

8 years agoMerge branch 'w47_MDL-36743_m24_blognotice' of git://github.com/skodak/moodle
Dan Poltawski [Wed, 21 Nov 2012 08:13:21 +0000 (16:13 +0800)]
Merge branch 'w47_MDL-36743_m24_blognotice' of git://github.com/skodak/moodle

8 years agoMDL-36400 calendar: Allow only ics file type in ical import
Ankit Agarwal [Wed, 21 Nov 2012 05:22:25 +0000 (13:22 +0800)]
MDL-36400 calendar: Allow only ics file type in ical import

8 years agoMDL-36743 fix blog notices in installer
Petr Škoda [Wed, 21 Nov 2012 08:00:17 +0000 (09:00 +0100)]
MDL-36743 fix blog notices in installer

8 years agoMerge branch 'MDL-36470-master' of git://github.com/FMCorz/moodle
Dan Poltawski [Wed, 21 Nov 2012 07:58:19 +0000 (15:58 +0800)]
Merge branch 'MDL-36470-master' of git://github.com/FMCorz/moodle

8 years agoMerge branch 'w47_MDL-36211_m24_sesslocking' of git://github.com/skodak/moodle
Dan Poltawski [Wed, 21 Nov 2012 07:44:34 +0000 (15:44 +0800)]
Merge branch 'w47_MDL-36211_m24_sesslocking' of git://github.com/skodak/moodle

8 years agoMDL-36211 prevent session problems in installer
Petr Škoda [Wed, 21 Nov 2012 07:34:28 +0000 (08:34 +0100)]
MDL-36211 prevent session problems in installer

8 years agoMerge branch 'w47_MDL-36547_m24_sectiongen' of git://github.com/skodak/moodle
Dan Poltawski [Wed, 21 Nov 2012 07:26:15 +0000 (15:26 +0800)]
Merge branch 'w47_MDL-36547_m24_sectiongen' of git://github.com/skodak/moodle

8 years agoMDL-36630 usability: 16x16 version of drag and drop icon
Barbara Ramiro [Tue, 20 Nov 2012 09:02:00 +0000 (17:02 +0800)]
MDL-36630 usability: 16x16 version of drag and drop icon

8 years agoMerge branch 'MDL-30884' of git://github.com/timhunt/moodle
Dan Poltawski [Wed, 21 Nov 2012 07:19:15 +0000 (15:19 +0800)]
Merge branch 'MDL-30884' of git://github.com/timhunt/moodle

8 years agoMerge branch 'MDL-36639-master-int' of git://github.com/FMCorz/moodle
Dan Poltawski [Wed, 21 Nov 2012 07:15:23 +0000 (15:15 +0800)]
Merge branch 'MDL-36639-master-int' of git://github.com/FMCorz/moodle

8 years agoMDL-36639 blog: Resized associated module icon
Frederic Massart [Fri, 16 Nov 2012 07:00:12 +0000 (15:00 +0800)]
MDL-36639 blog: Resized associated module icon

8 years agoMerge branch 'MDL-36720-updates-via-https' of git://github.com/mudrd8mz/moodle
Dan Poltawski [Wed, 21 Nov 2012 05:48:04 +0000 (13:48 +0800)]
Merge branch 'MDL-36720-updates-via-https' of git://github.com/mudrd8mz/moodle

8 years agoMDL-35963: Assignment - do not accept empty submissions
Damyon Wiese [Mon, 19 Nov 2012 08:56:02 +0000 (16:56 +0800)]
MDL-35963: Assignment - do not accept empty submissions

8 years agoMDL-35760 filemanager: ensuring the dnd arrow displays in the center of the filemanag...
Mark Nelson [Wed, 21 Nov 2012 04:03:54 +0000 (12:03 +0800)]
MDL-35760 filemanager: ensuring the dnd arrow displays in the center of the filemanager for all supported browsers

8 years agoMerge branch 'MDL-35675-master' of git://github.com/FMCorz/moodle
Dan Poltawski [Wed, 21 Nov 2012 04:02:48 +0000 (12:02 +0800)]
Merge branch 'MDL-35675-master' of git://github.com/FMCorz/moodle

8 years agoMerge branch 'MDL-36289' of git://github.com/netspotau/moodle-mod_assign
Dan Poltawski [Wed, 21 Nov 2012 04:00:28 +0000 (12:00 +0800)]
Merge branch 'MDL-36289' of git://github.com/netspotau/moodle-mod_assign

8 years agoMerge branch 'w47_MDL-36211_m24_sesslocking' of git://github.com/skodak/moodle
Dan Poltawski [Wed, 21 Nov 2012 03:56:44 +0000 (11:56 +0800)]
Merge branch 'w47_MDL-36211_m24_sesslocking' of git://github.com/skodak/moodle

8 years agoMerge branch 'MDL-30377_master' of git://github.com/markn86/moodle
Dan Poltawski [Wed, 21 Nov 2012 03:52:32 +0000 (11:52 +0800)]
Merge branch 'MDL-30377_master' of git://github.com/markn86/moodle

8 years agoMerge branch 'MDL-36170_master' of https://github.com/jfilip/moodle
Dan Poltawski [Wed, 21 Nov 2012 03:47:17 +0000 (11:47 +0800)]
Merge branch 'MDL-36170_master' of https://github.com/jfilip/moodle

8 years agoMDL-36614 fixed version upgrade conflict (git why you no tell me about conflict!)
Aparup Banerjee [Wed, 21 Nov 2012 02:49:44 +0000 (10:49 +0800)]
MDL-36614 fixed version upgrade conflict (git why you no tell me about conflict!)

8 years agoMerge branch 'MDL-36614-master' of git://github.com/ankitagarwal/moodle
Aparup Banerjee [Wed, 21 Nov 2012 02:29:04 +0000 (10:29 +0800)]
Merge branch 'MDL-36614-master' of git://github.com/ankitagarwal/moodle

Conflicts:
calendar/lib.php (MDL-36615)
calendar/managesubscriptions_form.php (MDL-36352)

8 years agoMDL-36551 - mod_data: Onsite presets now retain the advanced search template.
Adrian Greeve [Wed, 14 Nov 2012 04:22:51 +0000 (12:22 +0800)]
MDL-36551 - mod_data: Onsite presets now retain the advanced search template.

Presets that were saved to the site would lose the advanced search template when being used.
The previous check was put in place to see if the advanced search template existed or not (presets pre 1.9),
This checked external files properly but not onsite files.

Now checks are being done on both internal and external preset files.

8 years agoMerge branch 'w47_MDL-36719_m24_borkedcachingfront' of git://github.com/skodak/moodle
Eloy Lafuente (stronk7) [Tue, 20 Nov 2012 23:55:18 +0000 (00:55 +0100)]
Merge branch 'w47_MDL-36719_m24_borkedcachingfront' of git://github.com/skodak/moodle

8 years agoMerge branch 'wip-MDL-28583-master' of git://github.com/marinaglancy/moodle
Sam Hemelryk [Tue, 20 Nov 2012 20:15:34 +0000 (09:15 +1300)]
Merge branch 'wip-MDL-28583-master' of git://github.com/marinaglancy/moodle

8 years agoMerge branch 'MDL-25552_master' of git://github.com/markn86/moodle
Sam Hemelryk [Tue, 20 Nov 2012 20:00:35 +0000 (09:00 +1300)]
Merge branch 'MDL-25552_master' of git://github.com/markn86/moodle

8 years agoMDL-36720 Fetch available updates info via HTTPS
David Mudrák [Tue, 20 Nov 2012 14:51:35 +0000 (15:51 +0100)]
MDL-36720 Fetch available updates info via HTTPS

8 years agoMDL-36719 try to work around course format caching issue in installer
Petr Škoda [Tue, 20 Nov 2012 14:40:19 +0000 (15:40 +0100)]
MDL-36719 try to work around course format caching issue in installer

8 years agoMDL-36719 update $SITE caches in rebuild_course_cache()
Petr Škoda [Tue, 20 Nov 2012 14:39:43 +0000 (15:39 +0100)]
MDL-36719 update $SITE caches in rebuild_course_cache()

8 years agoMDL-36170 - mod/data - Don't display the blocks editing button within table HTML...
Justin Filip [Mon, 29 Oct 2012 04:18:06 +0000 (12:18 +0800)]
MDL-36170 - mod/data - Don't display the blocks editing button within table HTML, use a standard API to create it.

8 years agoMDL-30884 quiz: ARIA attribute for the coutdown timer.
Tim Hunt [Thu, 27 Sep 2012 11:19:56 +0000 (12:19 +0100)]
MDL-30884 quiz: ARIA attribute for the coutdown timer.

8 years agoMDL-36436 use hacky aspect ratio to work around IE9 issues
Petr Škoda [Tue, 20 Nov 2012 12:01:27 +0000 (13:01 +0100)]
MDL-36436 use hacky aspect ratio to work around IE9 issues

8 years agoMDL-36436 add simple svg hacking tool for icon designers
Petr Škoda [Wed, 14 Nov 2012 21:21:18 +0000 (22:21 +0100)]
MDL-36436 add simple svg hacking tool for icon designers

This should solve some IE9 issues with icon cut-off.

8 years agoMDL-36701 support for PHPUnit installation via Composer packaging system
Petr Škoda [Mon, 19 Nov 2012 21:16:17 +0000 (22:16 +0100)]
MDL-36701 support for PHPUnit installation via Composer packaging system

See http://getcomposer.org/doc/00-intro.md

8 years agoMDL-25552 mod_lesson: changing filepicker element to filemanager to allow the deletio...
Mark Nelson [Tue, 20 Nov 2012 09:43:50 +0000 (17:43 +0800)]
MDL-25552 mod_lesson: changing filepicker element to filemanager to allow the deletion of a file

8 years agoMerge branch 'wip-mdl-36707' of git://github.com/rajeshtaneja/moodle
Aparup Banerjee [Tue, 20 Nov 2012 08:22:27 +0000 (16:22 +0800)]
Merge branch 'wip-mdl-36707' of git://github.com/rajeshtaneja/moodle

8 years agoMerge branch 'MDL-33863' of git://github.com/timhunt/moodle
Dan Poltawski [Tue, 20 Nov 2012 08:15:16 +0000 (16:15 +0800)]
Merge branch 'MDL-33863' of git://github.com/timhunt/moodle

8 years agoMerge branch 'MDL-36634-master' of git://github.com/FMCorz/moodle
Dan Poltawski [Tue, 20 Nov 2012 08:09:49 +0000 (16:09 +0800)]
Merge branch 'MDL-36634-master' of git://github.com/FMCorz/moodle

8 years agoMerge branch 'MDL-36624-master-int' of git://github.com/FMCorz/moodle
Dan Poltawski [Tue, 20 Nov 2012 08:07:59 +0000 (16:07 +0800)]
Merge branch 'MDL-36624-master-int' of git://github.com/FMCorz/moodle

8 years agoMerge branch 'MDL-36659-master' of git://github.com/FMCorz/moodle
Dan Poltawski [Tue, 20 Nov 2012 08:06:08 +0000 (16:06 +0800)]
Merge branch 'MDL-36659-master' of git://github.com/FMCorz/moodle

8 years agoMerge branch 'MDL-36022-master' of git://git.luns.net.uk/moodle
Dan Poltawski [Tue, 20 Nov 2012 08:04:08 +0000 (16:04 +0800)]
Merge branch 'MDL-36022-master' of git://git.luns.net.uk/moodle

8 years agoMerge branch 'w47_MDL-36703_m24_enrolgenerator' of git://github.com/skodak/moodle
Dan Poltawski [Tue, 20 Nov 2012 08:01:41 +0000 (16:01 +0800)]
Merge branch 'w47_MDL-36703_m24_enrolgenerator' of git://github.com/skodak/moodle

8 years agoMerge branch 'm24_MDL-36142_Incorrect_query_returns_HTTP_404' of https://github.com...
Dan Poltawski [Tue, 20 Nov 2012 07:57:53 +0000 (15:57 +0800)]
Merge branch 'm24_MDL-36142_Incorrect_query_returns_HTTP_404' of https://github.com/scara/moodle

8 years agoMerge branch 'MDL-30731-master' of git://github.com/FMCorz/moodle
Dan Poltawski [Tue, 20 Nov 2012 07:31:27 +0000 (15:31 +0800)]
Merge branch 'MDL-30731-master' of git://github.com/FMCorz/moodle

8 years agoMerge branch 'MDL-36679-master' of github.com:damyon/moodle
Dan Poltawski [Tue, 20 Nov 2012 07:25:20 +0000 (15:25 +0800)]
Merge branch 'MDL-36679-master' of github.com:damyon/moodle

8 years agoMerge branch 'wip-MDL-35678-master' of git://github.com/abgreeve/moodle
Dan Poltawski [Tue, 20 Nov 2012 07:15:43 +0000 (15:15 +0800)]
Merge branch 'wip-MDL-35678-master' of git://github.com/abgreeve/moodle

8 years agoMerge branch 'MDL-36646' of git://github.com/timhunt/moodle
Dan Poltawski [Tue, 20 Nov 2012 07:06:21 +0000 (15:06 +0800)]
Merge branch 'MDL-36646' of git://github.com/timhunt/moodle

8 years agoMerge branch 'MDL-36613-master' of git://github.com/FMCorz/moodle
Dan Poltawski [Tue, 20 Nov 2012 07:03:39 +0000 (15:03 +0800)]
Merge branch 'MDL-36613-master' of git://github.com/FMCorz/moodle

8 years agoMerge branch 'MDL-36571' of git://github.com/timhunt/moodle
Dan Poltawski [Tue, 20 Nov 2012 06:59:34 +0000 (14:59 +0800)]
Merge branch 'MDL-36571' of git://github.com/timhunt/moodle

8 years agoMDL-30731 calendar: Fixed display of images in event descriptions
Frederic Massart [Fri, 2 Nov 2012 05:08:07 +0000 (13:08 +0800)]
MDL-30731 calendar: Fixed display of images in event descriptions

8 years agoMerge branch 'MDL-36564-master-int' of git://github.com/FMCorz/moodle
Dan Poltawski [Tue, 20 Nov 2012 06:46:54 +0000 (14:46 +0800)]
Merge branch 'MDL-36564-master-int' of git://github.com/FMCorz/moodle

8 years agoMerge branch 'MDL-36548_master' of git://github.com/pauln/moodle
Dan Poltawski [Tue, 20 Nov 2012 06:44:35 +0000 (14:44 +0800)]
Merge branch 'MDL-36548_master' of git://github.com/pauln/moodle

8 years agoMerge branch 'wip-MDL-36544-m24' of github.com:amygroshek/moodle
Dan Poltawski [Tue, 20 Nov 2012 06:36:53 +0000 (14:36 +0800)]
Merge branch 'wip-MDL-36544-m24' of github.com:amygroshek/moodle

8 years agoMerge branch 'wip-MDL-36453-master' of git://github.com/abgreeve/moodle
Dan Poltawski [Tue, 20 Nov 2012 06:31:53 +0000 (14:31 +0800)]
Merge branch 'wip-MDL-36453-master' of git://github.com/abgreeve/moodle

8 years agoMDL-36707 Course: set conditionalhidden class properly, so it doesn't overlap with...
Rajesh Taneja [Tue, 20 Nov 2012 05:40:25 +0000 (13:40 +0800)]
MDL-36707 Course: set conditionalhidden class properly, so it doesn't overlap with dimmed class