moodle.git
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 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-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-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-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-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-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-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

9 years agoRevert "MDL-34257 quiz 'secure' mode: PAGE initialisation order issues."
Aparup Banerjee [Thu, 6 Sep 2012 09:35:40 +0000 (17:35 +0800)]
Revert "MDL-34257 quiz 'secure' mode: PAGE initialisation order issues."

This reverts commit 0e708c34760ee274990e1c5bad96583301a6cc79.

note : there is another commit prefixed with MDL-34257 hash 'ddda79c' which was really for MDL-34187. 'ddda79c' is not being reverted as its not really about MDL-34257.

9 years agoMDL-35123 SCORM: cleaner version of get_last_attempt and get_last_completed_attempt...
Dan Marsden [Wed, 29 Aug 2012 21:26:08 +0000 (09:26 +1200)]
MDL-35123 SCORM: cleaner version of get_last_attempt and get_last_completed_attempt, fixes support for MS Sql driver

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

9 years agoMerge branch 'MDL-27799' of git://github.com/timhunt/moodle
Eloy Lafuente (stronk7) [Wed, 5 Sep 2012 23:29:04 +0000 (01:29 +0200)]
Merge branch 'MDL-27799' of git://github.com/timhunt/moodle

9 years agoRevert "MDL-30643 - Fixed speed issues with stats generation."
Eloy Lafuente (stronk7) [Wed, 5 Sep 2012 17:04:01 +0000 (19:04 +0200)]
Revert "MDL-30643 - Fixed speed issues with stats generation."

This reverts commit 5d911452cd9ef60f8f79ed9bd39fc8302211a96c.

9 years agoRevert "MDL-30643 - Added additional temporary tables to deal with log growth in...
Eloy Lafuente (stronk7) [Wed, 5 Sep 2012 17:03:46 +0000 (19:03 +0200)]
Revert "MDL-30643 - Added additional temporary tables to deal with log growth in daily tables."

This reverts commit e710925a24bbbe0a4f0ddfa0b760380091890083.

9 years agoRevert "MDL-30643 - Moved table create/drop out of loop to fix performance issue."
Eloy Lafuente (stronk7) [Wed, 5 Sep 2012 17:03:30 +0000 (19:03 +0200)]
Revert "MDL-30643 - Moved table create/drop out of loop to fix performance issue."

This reverts commit 678f53c5f781d45424020530435382645325ab73.

9 years agoRevert "MDL-30643 - Now loading table definitions from XML files."
Eloy Lafuente (stronk7) [Wed, 5 Sep 2012 17:03:17 +0000 (19:03 +0200)]
Revert "MDL-30643 - Now loading table definitions from XML files."

This reverts commit d352e733b3729ee820de8859d67c859cda81ee34.

9 years agoRevert "MDL-30643 - Added statslib test file."
Eloy Lafuente (stronk7) [Wed, 5 Sep 2012 17:03:06 +0000 (19:03 +0200)]
Revert "MDL-30643 - Added statslib test file."

This reverts commit 8646f5a4363a4331c8673e2bc98a7372ed789182.

9 years agoRevert "MDL-30643 - Fixing minor log output error and test cases."
Eloy Lafuente (stronk7) [Wed, 5 Sep 2012 17:02:54 +0000 (19:02 +0200)]
Revert "MDL-30643 - Fixing minor log output error and test cases."

This reverts commit 2da32bd6a5a0071756c29a4684c73694f0971664.

9 years agoRevert "MDL-30643 - Updated test cases to handle timezones better."
Eloy Lafuente (stronk7) [Wed, 5 Sep 2012 17:02:38 +0000 (19:02 +0200)]
Revert "MDL-30643 - Updated test cases to handle timezones better."

This reverts commit f0f0fec29572e6670cb46f4325955201f871b519.

9 years agoRevert "RFC-30643 - Removed get_context_instance calls."
Eloy Lafuente (stronk7) [Wed, 5 Sep 2012 17:02:27 +0000 (19:02 +0200)]
Revert "RFC-30643 - Removed get_context_instance calls."

This reverts commit eb0ffd3214ad568ded291936c2cd6e67276350b6.

9 years agoRevert "MDL-30643 fixed whitespace"
Eloy Lafuente (stronk7) [Wed, 5 Sep 2012 17:02:07 +0000 (19:02 +0200)]
Revert "MDL-30643 fixed whitespace"

This reverts commit 5c27678d3aa51af7c6e5ce992e52e55a29195a22.

9 years agoMDL-29662 quiz overrides: use proper course value (was php notice).
Eloy Lafuente (stronk7) [Wed, 5 Sep 2012 16:01:24 +0000 (18:01 +0200)]
MDL-29662 quiz overrides: use proper course value (was php notice).

9 years agoMDL-35272 Fix typo in qformat_blackboard_six.php
David Mudrák [Wed, 5 Sep 2012 12:05:36 +0000 (14:05 +0200)]
MDL-35272 Fix typo in qformat_blackboard_six.php

Credit goes to German Valero for spotting and reporting this.

9 years agoMerge branch 'w36_MDL-35077_m24_stats' of git://github.com/skodak/moodle
Eloy Lafuente (stronk7) [Wed, 5 Sep 2012 11:12:59 +0000 (13:12 +0200)]
Merge branch 'w36_MDL-35077_m24_stats' of git://github.com/skodak/moodle

9 years agoMDL-35077 do not show link to system stats report if stats disabled
Petr Škoda [Wed, 5 Sep 2012 08:01:30 +0000 (10:01 +0200)]
MDL-35077 do not show link to system stats report if stats disabled

9 years agoMerge branch 'MDL-35089' of git://github.com/stronk7/moodle
Aparup Banerjee [Wed, 5 Sep 2012 07:02:17 +0000 (15:02 +0800)]
Merge branch 'MDL-35089' of git://github.com/stronk7/moodle

9 years agoMDL-35172 fix handling of more than 10 tinymce toolbars
Petr Škoda [Wed, 5 Sep 2012 06:23:36 +0000 (08:23 +0200)]
MDL-35172 fix handling of more than 10 tinymce toolbars

9 years agoMerge branch 'w36_MDL-35177_m24_editoradminicons' of git://github.com/skodak/moodle
Aparup Banerjee [Wed, 5 Sep 2012 03:45:56 +0000 (11:45 +0800)]
Merge branch 'w36_MDL-35177_m24_editoradminicons' of git://github.com/skodak/moodle

9 years agoMDL-26504 blog: fixed SQL to add explicit casting
Aparup Banerjee [Wed, 5 Sep 2012 02:16:35 +0000 (10:16 +0800)]
MDL-26504 blog: fixed SQL to add explicit casting

9 years agoMDL-35255 mod_assign plagiarism api shift update_status call to after header has...
Dan Marsden [Wed, 5 Sep 2012 00:44:18 +0000 (12:44 +1200)]
MDL-35255 mod_assign plagiarism api shift update_status call to after header has been printed.

9 years agoMerge branch 'MDL-34997-master' of git://github.com/FMCorz/moodle
Eloy Lafuente (stronk7) [Tue, 4 Sep 2012 22:52:17 +0000 (00:52 +0200)]
Merge branch 'MDL-34997-master' of git://github.com/FMCorz/moodle

9 years agoMDL-30643 fixed whitespace
Aparup Banerjee [Tue, 4 Sep 2012 17:51:39 +0000 (01:51 +0800)]
MDL-30643 fixed whitespace

9 years agoMerge branch 'MDL-30643_master-log-speed' of git://github.com/tbannister/moodle
Aparup Banerjee [Tue, 4 Sep 2012 17:16:51 +0000 (01:16 +0800)]
Merge branch 'MDL-30643_master-log-speed' of git://github.com/tbannister/moodle

9 years agoRFC-30643 - Removed get_context_instance calls.
Tyler Bannister [Tue, 4 Sep 2012 14:11:16 +0000 (10:11 -0400)]
RFC-30643 - Removed get_context_instance calls.
          - Added fifth table to speed up enrolment look ups.

9 years agoMDL-30643 - Updated test cases to handle timezones better.
Tyler Bannister [Tue, 4 Sep 2012 14:10:19 +0000 (10:10 -0400)]
MDL-30643 - Updated test cases to handle timezones better.

9 years agoMerge branch 'wip-mdl-34537' of git://github.com/rajeshtaneja/moodle
Aparup Banerjee [Tue, 4 Sep 2012 09:31:50 +0000 (17:31 +0800)]
Merge branch 'wip-mdl-34537' of git://github.com/rajeshtaneja/moodle

9 years agoMDL-34916 theme_formal_white: added support for relative path of logos
Kordan [Tue, 4 Sep 2012 07:52:13 +0000 (09:52 +0200)]
MDL-34916 theme_formal_white: added support for relative path of logos

9 years agoMerge branch 'MDL-26504_blog_unregister' of git://github.com/andyjdavis/moodle
Aparup Banerjee [Tue, 4 Sep 2012 05:43:11 +0000 (13:43 +0800)]
Merge branch 'MDL-26504_blog_unregister' of git://github.com/andyjdavis/moodle

Conflicts:
lib/db/upgrade.php
version.php

9 years agoMerge branch 'MDL-30022_message_duplicate' of git://github.com/andyjdavis/moodle
Sam Hemelryk [Tue, 4 Sep 2012 04:50:36 +0000 (16:50 +1200)]
Merge branch 'MDL-30022_message_duplicate' of git://github.com/andyjdavis/moodle

9 years agoMDL-31365 theme: mymobile updated to compatible declaration
Aparup Banerjee [Tue, 4 Sep 2012 04:10:30 +0000 (12:10 +0800)]
MDL-31365 theme: mymobile updated to compatible declaration

9 years agoMDL-34257 quiz 'secure' mode: PAGE initialisation order issues.
Tim Hunt [Thu, 12 Jul 2012 17:39:01 +0000 (18:39 +0100)]
MDL-34257 quiz 'secure' mode: PAGE initialisation order issues.