moodle.git
9 years agoMerge branch 'master_MDL-34544' of git://github.com/danmarsden/moodle
Eloy Lafuente (stronk7) [Tue, 11 Sep 2012 19:33:06 +0000 (21:33 +0200)]
Merge branch 'master_MDL-34544' of git://github.com/danmarsden/moodle

9 years agoMDL-34962 whitespace fix
Eloy Lafuente (stronk7) [Tue, 11 Sep 2012 18:09:08 +0000 (20:09 +0200)]
MDL-34962 whitespace fix

9 years agoMDL-34962 Tidy up tests a bit
Eloy Lafuente (stronk7) [Tue, 11 Sep 2012 17:38:12 +0000 (19:38 +0200)]
MDL-34962 Tidy up tests a bit

9 years agoMerge branch 'MDL-34962' of git://github.com/Lightwork-Marking/moodle
Eloy Lafuente (stronk7) [Tue, 11 Sep 2012 16:53:35 +0000 (18:53 +0200)]
Merge branch 'MDL-34962' of git://github.com/Lightwork-Marking/moodle

9 years agoMerge branch 'MDL-34984' of git://github.com/rwijaya/moodle
Eloy Lafuente (stronk7) [Tue, 11 Sep 2012 14:28:46 +0000 (16:28 +0200)]
Merge branch 'MDL-34984' of git://github.com/rwijaya/moodle

9 years agoMerge branch 'MDL-34970' of git://github.com/mouneyrac/moodle
Aparup Banerjee [Tue, 11 Sep 2012 11:12:29 +0000 (19:12 +0800)]
Merge branch 'MDL-34970' of git://github.com/mouneyrac/moodle

9 years agoMerge branch 'MDL-34972' of git://github.com/mouneyrac/moodle
Aparup Banerjee [Tue, 11 Sep 2012 10:41:01 +0000 (18:41 +0800)]
Merge branch 'MDL-34972' of git://github.com/mouneyrac/moodle

9 years agoMerge branch 'MDL-34973' of git://github.com/mouneyrac/moodle
Aparup Banerjee [Tue, 11 Sep 2012 09:16:20 +0000 (17:16 +0800)]
Merge branch 'MDL-34973' of git://github.com/mouneyrac/moodle

9 years agoMDL-31276 mod_assign Phpdocs polish
Aparup Banerjee [Tue, 11 Sep 2012 08:53:56 +0000 (16:53 +0800)]
MDL-31276 mod_assign Phpdocs polish

9 years agoMerge branch 'MDL-31276-NOCSVLIB' of git://github.com/netspotau/moodle-mod_assign
Aparup Banerjee [Tue, 11 Sep 2012 08:39:30 +0000 (16:39 +0800)]
Merge branch 'MDL-31276-NOCSVLIB' of git://github.com/netspotau/moodle-mod_assign

9 years agoMDL-31276: Phpdocs cleanup for offline grading feature
Damyon Wiese [Tue, 11 Sep 2012 07:48:19 +0000 (15:48 +0800)]
MDL-31276: Phpdocs cleanup for offline grading feature

9 years agoMerge branch 'wip-MDL-29463-master' of git://github.com/phalacee/moodle
Aparup Banerjee [Tue, 11 Sep 2012 06:46:44 +0000 (14:46 +0800)]
Merge branch 'wip-MDL-29463-master' of git://github.com/phalacee/moodle

9 years agoMerge branch 'MDL-35190' of git://github.com/mouneyrac/moodle
Sam Hemelryk [Tue, 11 Sep 2012 04:46:13 +0000 (16:46 +1200)]
Merge branch 'MDL-35190' of git://github.com/mouneyrac/moodle

9 years agoMDL-34765 Course: Fixed missing argument in course reordering
Frederic Massart [Tue, 11 Sep 2012 03:53:26 +0000 (11:53 +0800)]
MDL-34765 Course: Fixed missing argument in course reordering

9 years agoMerge branch 'MDL-34765-master' of git://github.com/FMCorz/moodle
Sam Hemelryk [Tue, 11 Sep 2012 03:31:32 +0000 (15:31 +1200)]
Merge branch 'MDL-34765-master' of git://github.com/FMCorz/moodle

9 years agoMerge branch 'MDL-30018' of https://github.com/stronk7/moodle
Sam Hemelryk [Tue, 11 Sep 2012 03:22:39 +0000 (15:22 +1200)]
Merge branch 'MDL-30018' of https://github.com/stronk7/moodle

9 years agoMerge branch 'MDL-10259_master' of git://github.com/dmonllao/moodle
Sam Hemelryk [Tue, 11 Sep 2012 03:19:16 +0000 (15:19 +1200)]
Merge branch 'MDL-10259_master' of git://github.com/dmonllao/moodle

9 years agoMerge branch 'MDL-30857_master' of git://github.com/dmonllao/moodle
Sam Hemelryk [Tue, 11 Sep 2012 03:10:59 +0000 (15:10 +1200)]
Merge branch 'MDL-30857_master' of git://github.com/dmonllao/moodle

9 years agoMerge branch 'master_MDL-33755' of git://github.com/danmarsden/moodle
Sam Hemelryk [Tue, 11 Sep 2012 03:08:11 +0000 (15:08 +1200)]
Merge branch 'master_MDL-33755' of git://github.com/danmarsden/moodle

9 years agoMerge branch 'wip-MDL-30898-master' of git://github.com/phalacee/moodle
Aparup Banerjee [Tue, 11 Sep 2012 03:05:25 +0000 (11:05 +0800)]
Merge branch 'wip-MDL-30898-master' of git://github.com/phalacee/moodle

9 years agoMerge branch 'master_MDL-34755' of git://github.com/danmarsden/moodle
Sam Hemelryk [Tue, 11 Sep 2012 03:02:30 +0000 (15:02 +1200)]
Merge branch 'master_MDL-34755' of git://github.com/danmarsden/moodle

9 years agoMerge branch 'wip-MDL-30818-master' of git://github.com/phalacee/moodle
Aparup Banerjee [Tue, 11 Sep 2012 01:19:33 +0000 (09:19 +0800)]
Merge branch 'wip-MDL-30818-master' of git://github.com/phalacee/moodle

9 years agoMerge branch 'MDL-35134_master' of git://github.com/pauln/moodle
Eloy Lafuente (stronk7) [Tue, 11 Sep 2012 00:50:56 +0000 (02:50 +0200)]
Merge branch 'MDL-35134_master' of git://github.com/pauln/moodle

9 years agoMerge branch 'MDL-35171' of git://github.com/merrill-oakland/moodle
Eloy Lafuente (stronk7) [Tue, 11 Sep 2012 00:44:30 +0000 (02:44 +0200)]
Merge branch 'MDL-35171' of git://github.com/merrill-oakland/moodle

9 years agoMDL-34338 mod_folder: delete unused $browser var.
Eloy Lafuente (stronk7) [Tue, 11 Sep 2012 00:18:38 +0000 (02:18 +0200)]
MDL-34338 mod_folder: delete unused $browser var.

9 years agoMerge branch 'wip-MDL-34338-master' of git://github.com/marinaglancy/moodle
Eloy Lafuente (stronk7) [Tue, 11 Sep 2012 00:17:30 +0000 (02:17 +0200)]
Merge branch 'wip-MDL-34338-master' of git://github.com/marinaglancy/moodle

9 years agoMerge branch 'master_MDL-35255' of git://github.com/danmarsden/moodle
Sam Hemelryk [Tue, 11 Sep 2012 00:11:02 +0000 (12:11 +1200)]
Merge branch 'master_MDL-35255' of git://github.com/danmarsden/moodle

9 years agoMerge branch 'MDL-34660' of git://github.com/raymondAntonio/moodle
Eloy Lafuente (stronk7) [Tue, 11 Sep 2012 00:08:41 +0000 (02:08 +0200)]
Merge branch 'MDL-34660' of git://github.com/raymondAntonio/moodle

9 years agoMerge branch 'MDL-34916_master' of git://github.com/kordan/moodle
Sam Hemelryk [Tue, 11 Sep 2012 00:06:26 +0000 (12:06 +1200)]
Merge branch 'MDL-34916_master' of git://github.com/kordan/moodle

9 years agoMerge branch 'master_MDL-35123' of git://github.com/danmarsden/moodle
Eloy Lafuente (stronk7) [Tue, 11 Sep 2012 00:02:49 +0000 (02:02 +0200)]
Merge branch 'master_MDL-35123' of git://github.com/danmarsden/moodle

9 years agoMerge branch 'master_MDL-35208' of git://github.com/danmarsden/moodle
Eloy Lafuente (stronk7) [Mon, 10 Sep 2012 23:56:51 +0000 (01:56 +0200)]
Merge branch 'master_MDL-35208' of git://github.com/danmarsden/moodle

9 years agoMerge branch 'MDL-35257-master' of git://github.com/danpoltawski/moodle
Eloy Lafuente (stronk7) [Mon, 10 Sep 2012 23:53:17 +0000 (01:53 +0200)]
Merge branch 'MDL-35257-master' of git://github.com/danpoltawski/moodle

9 years agoMerge branch 'w37_MDL-35270_m24_oracohort' of git://github.com/skodak/moodle
Eloy Lafuente (stronk7) [Mon, 10 Sep 2012 23:48:34 +0000 (01:48 +0200)]
Merge branch 'w37_MDL-35270_m24_oracohort' of git://github.com/skodak/moodle

9 years agoMDL-34794 mod_assign: Fixed up style after integration
Sam Hemelryk [Mon, 10 Sep 2012 23:33:41 +0000 (11:33 +1200)]
MDL-34794 mod_assign: Fixed up style after integration

9 years agoMerge branch 'MDL-34794' of git://github.com/raymondAntonio/moodle
Sam Hemelryk [Mon, 10 Sep 2012 23:33:04 +0000 (11:33 +1200)]
Merge branch 'MDL-34794' of git://github.com/raymondAntonio/moodle

9 years agoMerge branch 'MDL-27786-master' of git://github.com/ankitagarwal/moodle
Sam Hemelryk [Mon, 10 Sep 2012 23:15:45 +0000 (11:15 +1200)]
Merge branch 'MDL-27786-master' of git://github.com/ankitagarwal/moodle

9 years agoMerge branch 'MDL-33374-master' of git://github.com/ankitagarwal/moodle
Sam Hemelryk [Mon, 10 Sep 2012 23:10:39 +0000 (11:10 +1200)]
Merge branch 'MDL-33374-master' of git://github.com/ankitagarwal/moodle

9 years agoMerge branch 'MDL-35007-master' of git://github.com/ankitagarwal/moodle
Sam Hemelryk [Mon, 10 Sep 2012 23:07:29 +0000 (11:07 +1200)]
Merge branch 'MDL-35007-master' of git://github.com/ankitagarwal/moodle

9 years agoMerge branch 'MDL-35272-typo' of git://github.com/mudrd8mz/moodle
Eloy Lafuente (stronk7) [Mon, 10 Sep 2012 23:03:06 +0000 (01:03 +0200)]
Merge branch 'MDL-35272-typo' of git://github.com/mudrd8mz/moodle

9 years agoMerge branch 'wip-MDL-32785-master-v3' of git://github.com/abgreeve/moodle
Sam Hemelryk [Mon, 10 Sep 2012 22:38:23 +0000 (10:38 +1200)]
Merge branch 'wip-MDL-32785-master-v3' of git://github.com/abgreeve/moodle

9 years agoMerge branch 'MDL-35301-master' of git://github.com/FMCorz/moodle
Eloy Lafuente (stronk7) [Mon, 10 Sep 2012 21:45:47 +0000 (23:45 +0200)]
Merge branch 'MDL-35301-master' of git://github.com/FMCorz/moodle

9 years agoMerge branch 'MDL-8307-master' of git://github.com/FMCorz/moodle
Eloy Lafuente (stronk7) [Mon, 10 Sep 2012 21:35:12 +0000 (23:35 +0200)]
Merge branch 'MDL-8307-master' of git://github.com/FMCorz/moodle

9 years agoMerge branch 'w37_MDL-35284_m24_borkedtoolbar' of git://github.com/skodak/moodle
Eloy Lafuente (stronk7) [Mon, 10 Sep 2012 20:13:36 +0000 (22:13 +0200)]
Merge branch 'w37_MDL-35284_m24_borkedtoolbar' of git://github.com/skodak/moodle

Conflicts:
lib/editor/tinymce/version.php

9 years agoMDL-35284 patch empty toolbar crashing TinyMCE
Petr Škoda [Fri, 7 Sep 2012 20:46:15 +0000 (22:46 +0200)]
MDL-35284 patch empty toolbar crashing TinyMCE

9 years agoMerge branch 'w37_MDL-35318_m24_stringrevisions' of git://github.com/skodak/moodle
Eloy Lafuente (stronk7) [Mon, 10 Sep 2012 18:39:19 +0000 (20:39 +0200)]
Merge branch 'w37_MDL-35318_m24_stringrevisions' of git://github.com/skodak/moodle

9 years agoMDL-35318 fix lang revision incrementation conditions
Petr Škoda [Mon, 10 Sep 2012 18:23:14 +0000 (20:23 +0200)]
MDL-35318 fix lang revision incrementation conditions

9 years agoMerge branch 'w37_MDL-35289_m24_tinymcelangs' of git://github.com/skodak/moodle
Eloy Lafuente (stronk7) [Mon, 10 Sep 2012 14:54:43 +0000 (16:54 +0200)]
Merge branch 'w37_MDL-35289_m24_tinymcelangs' of git://github.com/skodak/moodle

9 years agoMerge branch 'MDL-35343' of git://github.com/timhunt/moodle
Eloy Lafuente (stronk7) [Mon, 10 Sep 2012 14:41:25 +0000 (16:41 +0200)]
Merge branch 'MDL-35343' of git://github.com/timhunt/moodle

9 years agoMDL-35343 JavaScript visible in multichoice choice feedback.
Tim Hunt [Mon, 10 Sep 2012 12:06:47 +0000 (13:06 +0100)]
MDL-35343 JavaScript visible in multichoice choice feedback.

Also, Match correct answer, and calculated multi and multianswer
feedback.

9 years agoMerge branch 'MDL-34944-master' of git://github.com/ankitagarwal/moodle
Aparup Banerjee [Mon, 10 Sep 2012 09:15:00 +0000 (17:15 +0800)]
Merge branch 'MDL-34944-master' of git://github.com/ankitagarwal/moodle

9 years agoMerge branch 'MDL-35223-master' of git://github.com/ankitagarwal/moodle
Aparup Banerjee [Mon, 10 Sep 2012 09:00:16 +0000 (17:00 +0800)]
Merge branch 'MDL-35223-master' of git://github.com/ankitagarwal/moodle

9 years agoMDL-30857 block_community Removing comments hardcoded height
David Monllao [Mon, 10 Sep 2012 06:51:32 +0000 (14:51 +0800)]
MDL-30857 block_community Removing comments hardcoded height

9 years agoMerge branch 'MDL-35264_master' of git://github.com/dmonllao/moodle
Aparup Banerjee [Mon, 10 Sep 2012 06:37:40 +0000 (14:37 +0800)]
Merge branch 'MDL-35264_master' of git://github.com/dmonllao/moodle

9 years agoMerge branch 'MDL-27398_master' of git://github.com/dmonllao/moodle
Aparup Banerjee [Mon, 10 Sep 2012 06:29:47 +0000 (14:29 +0800)]
Merge branch 'MDL-27398_master' of git://github.com/dmonllao/moodle

9 years agoMDL-31276: Fixes for offline marking and team submissions
Damyon Wiese [Mon, 3 Sep 2012 04:04:21 +0000 (12:04 +0800)]
MDL-31276: Fixes for offline marking and team submissions

Filenames in zip of all submission now contains the team group name.

9 years agoMDL-31276: Offline marking. Includes download/upload of csv grades.
Damyon Wiese [Mon, 23 Jul 2012 06:14:25 +0000 (14:14 +0800)]
MDL-31276: Offline marking. Includes download/upload of csv grades.

Also provides bulk upload/download of feedback files via zips.

9 years agoMDL-27398 mod_chat Removing PAGE references
David Monllao [Tue, 4 Sep 2012 02:24:45 +0000 (10:24 +0800)]
MDL-27398 mod_chat Removing PAGE references

9 years agoMDL-27398 mod_chat Adding file basic doc
David Monllao [Tue, 4 Sep 2012 02:23:56 +0000 (10:23 +0800)]
MDL-27398 mod_chat Adding file basic doc

9 years agoMDL-27398 mod_chat Removing deprecated calls and moving dependencies
David Monllao [Tue, 4 Sep 2012 02:22:47 +0000 (10:22 +0800)]
MDL-27398 mod_chat Removing deprecated calls and moving dependencies

Credit to Jorge Villalon

9 years agoMDL-27398 mod_chat Adding CLI_SCRIPT to chat daemon
David Monllao [Thu, 23 Aug 2012 02:24:10 +0000 (10:24 +0800)]
MDL-27398 mod_chat Adding CLI_SCRIPT to chat daemon

Credit to Jorge Villalon

9 years agoMDL-32785 - lib - Ignorning hard frozen fields when submitting data.
Adrian Greeve [Thu, 30 Aug 2012 07:42:54 +0000 (15:42 +0800)]
MDL-32785 - lib - Ignorning hard frozen fields when submitting data.

9 years agoMDL-30018 restore: better answer matching. Credit goes to Tyler Bannister, thanks!
Eloy Lafuente (stronk7) [Mon, 27 Aug 2012 01:24:10 +0000 (03:24 +0200)]
MDL-30018 restore: better answer matching. Credit goes to Tyler Bannister, thanks!

On backup, contents are cleaned to be safe utf8. That was leading to
some matching problems on restore against not cleaned DB contents (for
already existing questions). This commit adds one fallback method to
perform the match against cleaned DB contents.

9 years agoMDL-35318 use new lang revision to invalidate TinyMCE lang caches
Petr Škoda [Sun, 9 Sep 2012 10:05:52 +0000 (12:05 +0200)]
MDL-35318 use new lang revision to invalidate TinyMCE lang caches

9 years agoMDL-35318 add lang revision counter and improve PHPUnit test reset
Petr Škoda [Sun, 9 Sep 2012 09:55:31 +0000 (11:55 +0200)]
MDL-35318 add lang revision counter and improve PHPUnit test reset

We need this for hacks that need to find out if strings changed.

9 years agoMDL-35289 use unmodified TinyMCE
Petr Škoda [Fri, 7 Sep 2012 11:56:16 +0000 (13:56 +0200)]
MDL-35289 use unmodified TinyMCE

9 years agoMDL-35270 fix ambiguously defined column
Petr Škoda [Sat, 8 Sep 2012 08:49:00 +0000 (10:49 +0200)]
MDL-35270 fix ambiguously defined column

Credit goes to Sara Arjona, thanks.

9 years agoMDL-29463 - Chat - Change socket_setopt to socket_set_options
Jason Fowler [Tue, 21 Aug 2012 07:13:00 +0000 (15:13 +0800)]
MDL-29463 - Chat - Change socket_setopt to socket_set_options

9 years agoMDL-30898 - Accessibility/Themes - Removing blink style selector to prevent use of...
Jason Fowler [Wed, 5 Sep 2012 05:46:29 +0000 (13:46 +0800)]
MDL-30898 - Accessibility/Themes - Removing blink style selector to prevent use of blinking text

9 years agoMDL-30818 - Accessibility/Themes - Adding hover to activity elements to allow visual...
Jason Fowler [Wed, 5 Sep 2012 06:50:16 +0000 (14:50 +0800)]
MDL-30818 - Accessibility/Themes - Adding hover to activity elements to allow visual link between activity and course completion markings

9 years agoMDL-35289 use new TinyMCE en lang import
Petr Škoda [Fri, 7 Sep 2012 07:19:58 +0000 (09:19 +0200)]
MDL-35289 use new TinyMCE en lang import

AMOS BEGIN
  MOV [common:browsemedia,editor_tinymce],[moodlemedia:browsemedia,tinymce_moodlemedia]
  MOV [common:browseimage,editor_tinymce],[moodleimage:browseimage,tinymce_moodleimage]
AMOS END

9 years agoMDL-34984 admin setting: fixed labeling and shortname display for admin setting
Rossiani Wijaya [Tue, 4 Sep 2012 10:12:26 +0000 (18:12 +0800)]
MDL-34984 admin setting: fixed labeling and shortname display for admin setting

9 years agoMDL-34794: Add reset course feature in mod_assign (new assignment (2.3))
Raymond Wijaya [Tue, 21 Aug 2012 07:50:56 +0000 (15:50 +0800)]
MDL-34794: Add reset course feature in  mod_assign (new assignment (2.3))

9 years agoMDL-34962 added release number to returned values
Paul Charsley [Wed, 5 Sep 2012 01:05:43 +0000 (13:05 +1200)]
MDL-34962 added release number to returned values

9 years agoMerge branch 'master' of https://github.com/moodle/moodle
Paul Charsley [Fri, 7 Sep 2012 06:08:02 +0000 (18:08 +1200)]
Merge branch 'master' of https://github.com/moodle/moodle

9 years agoMDL-34068 mod_chat Sending text/html headers when sending the messages frame output...
David Monllao [Thu, 6 Sep 2012 01:14:44 +0000 (09:14 +0800)]
MDL-34068 mod_chat Sending text/html headers when sending the messages frame output for the first time

9 years agoMDL-35264 mod_chat Changing the input frame of chat daemon method to a embedded page...
David Monllao [Thu, 6 Sep 2012 02:28:52 +0000 (10:28 +0800)]
MDL-35264 mod_chat Changing the input frame of chat daemon method to a embedded page layout

9 years agoMDL-10259 core Adding a search courses box if there are too many courses
David Monllao [Mon, 3 Sep 2012 07:20:52 +0000 (15:20 +0800)]
MDL-10259 core Adding a search courses box if there are too many courses

9 years agoMDL-35301 Unit Tests: Test cases for course requests
Frederic Massart [Fri, 7 Sep 2012 03:12:56 +0000 (11:12 +0800)]
MDL-35301 Unit Tests: Test cases for course requests

9 years agoMDL-35301 Unit Tests: Basic test for create_course()
Frederic Massart [Fri, 7 Sep 2012 01:34:39 +0000 (09:34 +0800)]
MDL-35301 Unit Tests: Basic test for create_course()

9 years agoMDL-8307 Course: Course requests can suggest a category
Frederic Massart [Thu, 16 Aug 2012 06:10:39 +0000 (14:10 +0800)]
MDL-8307 Course: Course requests can suggest a category

9 years agoMDL-35257 lib: if $CFG->logguests is disabled, avoid some log actions
Dan Poltawski [Wed, 5 Sep 2012 02:34:51 +0000 (10:34 +0800)]
MDL-35257 lib: if $CFG->logguests is disabled, avoid some log actions

This is for performance, else there can be great contention on the guest
user record as we've seen on moodle.org.

9 years agoMDL-27786 calendar: Changing the eventname string for accessibility
Ankit Agarwal [Thu, 6 Sep 2012 03:10:45 +0000 (11:10 +0800)]
MDL-27786 calendar: Changing the eventname string for accessibility

9 years agoMDL-33374 profile: Use correct text for buttons when creating a new user
Ankit Agarwal [Mon, 3 Sep 2012 08:37:44 +0000 (16:37 +0800)]
MDL-33374 profile: Use correct text for buttons when creating a new user

9 years agoMDL-34944 book: Implementing reset framework for book
Ankit Agarwal [Tue, 4 Sep 2012 03:12:22 +0000 (11:12 +0800)]
MDL-34944 book: Implementing reset framework for book

9 years agoMDL-35007 book: Adding rule to parse links to book chapters from 1.9 backups
Ankit Agarwal [Tue, 4 Sep 2012 03:56:21 +0000 (11:56 +0800)]
MDL-35007 book: Adding rule to parse links to book chapters from 1.9 backups

9 years agoMDL-35223 book: use chapter names in page titles
Ankit Agarwal [Thu, 6 Sep 2012 03:28:45 +0000 (11:28 +0800)]
MDL-35223 book: use chapter names in page titles

9 years agoMDL-34338: renderer for mod_folder should not use file_info
Marina Glancy [Tue, 4 Sep 2012 02:29:37 +0000 (10:29 +0800)]
MDL-34338: renderer for mod_folder should not use file_info

9 years agoweekly release 2.4dev
Eloy Lafuente (stronk7) [Fri, 7 Sep 2012 00:39:21 +0000 (02:39 +0200)]
weekly release 2.4dev

9 years agofix permissions
Eloy Lafuente (stronk7) [Fri, 7 Sep 2012 00:36:04 +0000 (02:36 +0200)]
fix permissions

9 years agoMerge branch 'install_master' of git://git.moodle.cz/moodle-install
Eloy Lafuente (stronk7) [Fri, 7 Sep 2012 00:17:55 +0000 (02:17 +0200)]
Merge branch 'install_master' of git://git.moodle.cz/moodle-install

9 years agoMerge branch 'MDL-34945-master' of git://github.com/FMCorz/moodle
Eloy Lafuente (stronk7) [Thu, 6 Sep 2012 18:11:53 +0000 (20:11 +0200)]
Merge branch 'MDL-34945-master' of git://github.com/FMCorz/moodle

9 years agoMerge branch 'MDL-34985' of git://github.com/merrill-oakland/moodle
Eloy Lafuente (stronk7) [Thu, 6 Sep 2012 18:06:30 +0000 (20:06 +0200)]
Merge branch 'MDL-34985' of git://github.com/merrill-oakland/moodle

9 years agoMDL-6424 - blocks - Add missing global vars.
Eloy Lafuente (stronk7) [Thu, 6 Sep 2012 17:39:49 +0000 (19:39 +0200)]
MDL-6424 - blocks - Add missing global vars.

9 years agoMerge branch 'wip-MDL-6424-master' of git://github.com/abgreeve/moodle
Eloy Lafuente (stronk7) [Thu, 6 Sep 2012 17:31:43 +0000 (19:31 +0200)]
Merge branch 'wip-MDL-6424-master' of git://github.com/abgreeve/moodle

9 years agoMDL-31291 assign: Fix diffs between installed & upgraded DB schema
Eloy Lafuente (stronk7) [Thu, 6 Sep 2012 16:31:26 +0000 (18:31 +0200)]
MDL-31291 assign: Fix diffs between installed & upgraded DB schema

9 years agoMerge branch 'MDL-31291-POST23' of git://github.com/netspotau/moodle-mod_assign
Aparup Banerjee [Thu, 6 Sep 2012 11:43:15 +0000 (19:43 +0800)]
Merge branch 'MDL-31291-POST23' of git://github.com/netspotau/moodle-mod_assign

9 years agoMerge branch 'MDL-31284-POST23' of git://github.com/netspotau/moodle-mod_assign
Aparup Banerjee [Thu, 6 Sep 2012 11:36:24 +0000 (19:36 +0800)]
Merge branch 'MDL-31284-POST23' of git://github.com/netspotau/moodle-mod_assign

9 years agoMDL-31365 Regions for pagelayout 'secure'
Martin Vögeli [Thu, 6 Sep 2012 07:48:52 +0000 (09:48 +0200)]
MDL-31365 Regions for pagelayout 'secure'

9 years agoMDL-31365 Follow up after discussion
Martin Vögeli [Wed, 5 Sep 2012 20:31:26 +0000 (22:31 +0200)]
MDL-31365 Follow up after discussion

9 years agoMerge branch 'w36_MDL-35172_m24_editortoolbar' of git://github.com/skodak/moodle
Eloy Lafuente (stronk7) [Thu, 6 Sep 2012 10:08:26 +0000 (12:08 +0200)]
Merge branch 'w36_MDL-35172_m24_editortoolbar' of git://github.com/skodak/moodle