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

9 years agoMerge branch 'MDL-31365_master' of https://github.com/birdy1976/moodle
Aparup Banerjee [Tue, 4 Sep 2012 03:38:11 +0000 (11:38 +0800)]
Merge branch 'MDL-31365_master' of https://github.com/birdy1976/moodle

9 years agoMDL-35092: Add proxy support to enrol/paypal IPN
Tim Lock [Tue, 28 Aug 2012 04:27:35 +0000 (13:57 +0930)]
MDL-35092: Add proxy support to enrol/paypal IPN

9 years agoMerge branch 'wip-mdl-34606' of git://github.com/rajeshtaneja/moodle
Eloy Lafuente (stronk7) [Tue, 4 Sep 2012 00:08:54 +0000 (02:08 +0200)]
Merge branch 'wip-mdl-34606' of git://github.com/rajeshtaneja/moodle

9 years agoMerge branch 'MDL-34633-master' of git://github.com/FMCorz/moodle
Eloy Lafuente (stronk7) [Mon, 3 Sep 2012 23:52:08 +0000 (01:52 +0200)]
Merge branch 'MDL-34633-master' of git://github.com/FMCorz/moodle

9 years agoMDL-31295 assign: fix comments in upgrade code.
Eloy Lafuente (stronk7) [Mon, 3 Sep 2012 23:27:49 +0000 (01:27 +0200)]
MDL-31295 assign: fix comments in upgrade code.

9 years agoMerge branch 'MDL-31295-POST23' of git://github.com/netspotau/moodle-mod_assign
Eloy Lafuente (stronk7) [Mon, 3 Sep 2012 23:20:55 +0000 (01:20 +0200)]
Merge branch 'MDL-31295-POST23' of git://github.com/netspotau/moodle-mod_assign

9 years agoMerge branch 'MDL-29662' of git://github.com/timhunt/moodle
Eloy Lafuente (stronk7) [Mon, 3 Sep 2012 23:14:06 +0000 (01:14 +0200)]
Merge branch 'MDL-29662' of git://github.com/timhunt/moodle

9 years agoMerge branch 'MDL-27818' of git://github.com/timhunt/moodle
Eloy Lafuente (stronk7) [Mon, 3 Sep 2012 23:06:48 +0000 (01:06 +0200)]
Merge branch 'MDL-27818' of git://github.com/timhunt/moodle

9 years agoMerge branch 'w36_MDL-35189_m24_typo3' of git://github.com/skodak/moodle
Eloy Lafuente (stronk7) [Mon, 3 Sep 2012 22:38:30 +0000 (00:38 +0200)]
Merge branch 'w36_MDL-35189_m24_typo3' of git://github.com/skodak/moodle

9 years agoMerge branch 'w36_MDL-35185_m24_flowplayer' of git://github.com/skodak/moodle
Eloy Lafuente (stronk7) [Mon, 3 Sep 2012 22:35:48 +0000 (00:35 +0200)]
Merge branch 'w36_MDL-35185_m24_flowplayer' of git://github.com/skodak/moodle

9 years agoMerge branch 'MDL-33306' of git://github.com/timhunt/moodle
Eloy Lafuente (stronk7) [Mon, 3 Sep 2012 22:30:35 +0000 (00:30 +0200)]
Merge branch 'MDL-33306' of git://github.com/timhunt/moodle

9 years agoMerge branch 'MDL-33812-master' of git://github.com/FMCorz/moodle
Eloy Lafuente (stronk7) [Mon, 3 Sep 2012 22:19:53 +0000 (00:19 +0200)]
Merge branch 'MDL-33812-master' of git://github.com/FMCorz/moodle

9 years agoMerge branch 'MDL-34725-strict-standards' of git://github.com/mudrd8mz/moodle
Eloy Lafuente (stronk7) [Mon, 3 Sep 2012 22:05:52 +0000 (00:05 +0200)]
Merge branch 'MDL-34725-strict-standards' of git://github.com/mudrd8mz/moodle

9 years agoMerge branch 'w36_MDL-34097_m24_environment' of git://github.com/skodak/moodle
Eloy Lafuente (stronk7) [Mon, 3 Sep 2012 22:00:20 +0000 (00:00 +0200)]
Merge branch 'w36_MDL-34097_m24_environment' of git://github.com/skodak/moodle

9 years agoMerge branch 'w36_MDL-35188_m24_tcpdf' of git://github.com/skodak/moodle
Eloy Lafuente (stronk7) [Mon, 3 Sep 2012 21:42:14 +0000 (23:42 +0200)]
Merge branch 'w36_MDL-35188_m24_tcpdf' of git://github.com/skodak/moodle

9 years agoMerge branch 'w36_MDL-35186_m24_phpmailer' of git://github.com/skodak/moodle
Eloy Lafuente (stronk7) [Mon, 3 Sep 2012 21:31:13 +0000 (23:31 +0200)]
Merge branch 'w36_MDL-35186_m24_phpmailer' of git://github.com/skodak/moodle

9 years agoMerge branch 'w36_MDL-35184_m24_adodb' of git://github.com/skodak/moodle
Eloy Lafuente (stronk7) [Mon, 3 Sep 2012 18:16:20 +0000 (20:16 +0200)]
Merge branch 'w36_MDL-35184_m24_adodb' of git://github.com/skodak/moodle

9 years agoMerge branch 'MDL-28346-master' of git://github.com/FMCorz/moodle
Eloy Lafuente (stronk7) [Mon, 3 Sep 2012 17:30:21 +0000 (19:30 +0200)]
Merge branch 'MDL-28346-master' of git://github.com/FMCorz/moodle

9 years agoMDL-35184 import adodb 5.17
Petr Škoda [Mon, 3 Sep 2012 16:49:53 +0000 (18:49 +0200)]
MDL-35184 import adodb 5.17

9 years agoMerge branch 'w36_MDL-35077_m24_stats' of git://github.com/skodak/moodle
Eloy Lafuente (stronk7) [Mon, 3 Sep 2012 15:53:34 +0000 (17:53 +0200)]
Merge branch 'w36_MDL-35077_m24_stats' of git://github.com/skodak/moodle

9 years agoMerge branch 'MDL-35133' of git://github.com/timhunt/moodle
Eloy Lafuente (stronk7) [Mon, 3 Sep 2012 15:47:33 +0000 (17:47 +0200)]
Merge branch 'MDL-35133' of git://github.com/timhunt/moodle

9 years agoMerge branch 'w36_MDL-35168_m24_yuipath' of git://github.com/skodak/moodle
Eloy Lafuente (stronk7) [Mon, 3 Sep 2012 15:07:39 +0000 (17:07 +0200)]
Merge branch 'w36_MDL-35168_m24_yuipath' of git://github.com/skodak/moodle

9 years agoMerge branch 'w36_MDL-35145_m24_guestdelete' of git://github.com/skodak/moodle
Eloy Lafuente (stronk7) [Mon, 3 Sep 2012 14:17:51 +0000 (16:17 +0200)]
Merge branch 'w36_MDL-35145_m24_guestdelete' of git://github.com/skodak/moodle

9 years agoMerge branch 'MDL-31973-master-7' of git://git.luns.net.uk/moodle
Eloy Lafuente (stronk7) [Mon, 3 Sep 2012 13:49:50 +0000 (15:49 +0200)]
Merge branch 'MDL-31973-master-7' of git://git.luns.net.uk/moodle

9 years agoMerge branch 'MDL-35151_master' of git://github.com/lazydaisy/moodle
Aparup Banerjee [Mon, 3 Sep 2012 11:21:29 +0000 (19:21 +0800)]
Merge branch 'MDL-35151_master' of git://github.com/lazydaisy/moodle

9 years agoMerge branch 'MDL-35180_master' of git://github.com/lazydaisy/moodle
Aparup Banerjee [Mon, 3 Sep 2012 09:37:29 +0000 (17:37 +0800)]
Merge branch 'MDL-35180_master' of git://github.com/lazydaisy/moodle

9 years agoMerge branch 'w36_MDL-35080_m24_weirdtables' of git://github.com/skodak/moodle
Aparup Banerjee [Mon, 3 Sep 2012 09:09:23 +0000 (17:09 +0800)]
Merge branch 'w36_MDL-35080_m24_weirdtables' of git://github.com/skodak/moodle

9 years agoMDL-34633 Repository: Flickr supports small images
Frederic Massart [Tue, 28 Aug 2012 09:01:41 +0000 (17:01 +0800)]
MDL-34633 Repository: Flickr supports small images

9 years agoMDL-35101 Repository: Public Flickr fails when the picture has no license
Frederic Massart [Tue, 28 Aug 2012 09:14:45 +0000 (17:14 +0800)]
MDL-35101 Repository: Public Flickr fails when the picture has no license

9 years agoMDL-34997 - Allow shortened url youtu.be and y2u.be for Youtube filter
Jean-Philippe Gaudreau [Wed, 22 Aug 2012 13:05:11 +0000 (09:05 -0400)]
MDL-34997 - Allow shortened url youtu.be and y2u.be for Youtube filter

9 years agoMDL-28346 Backup: Backup does not fail when a file is missing
Frederic Massart [Mon, 9 Jul 2012 02:49:25 +0000 (10:49 +0800)]
MDL-28346 Backup: Backup does not fail when a file is missing

9 years agoMDL-28346 Backup: Restore does not fail when a file is missing
Frederic Massart [Mon, 9 Jul 2012 02:49:25 +0000 (10:49 +0800)]
MDL-28346 Backup: Restore does not fail when a file is missing

9 years agoMDL-28346 Backup: Added new status 'warning' for backup result
Frederic Massart [Mon, 30 Jul 2012 06:10:46 +0000 (14:10 +0800)]
MDL-28346 Backup: Added new status 'warning' for backup result

9 years agoMDL-33812 Backup: Added some upgrade information about the changes
Frederic Massart [Wed, 29 Aug 2012 08:00:19 +0000 (16:00 +0800)]
MDL-33812 Backup: Added some upgrade information about the changes

9 years agoMDL-33812 Backup: Revert MDL-33521
Frederic Massart [Tue, 21 Aug 2012 05:50:55 +0000 (13:50 +0800)]
MDL-33812 Backup: Revert MDL-33521

9 years agoMDL-33812 Backup: Respect of backup_auto_keep
Frederic Massart [Tue, 14 Aug 2012 08:52:39 +0000 (16:52 +0800)]
MDL-33812 Backup: Respect of backup_auto_keep

9 years ago MDL-31365 Fix for safebrowser and securewindow
Martin Vögeli [Mon, 3 Sep 2012 05:25:30 +0000 (07:25 +0200)]
 MDL-31365 Fix for safebrowser and securewindow

9 years agoMDL-31295: Allow granting individual extension dates to students for mod_assign
Damyon Wiese [Fri, 8 Jun 2012 06:10:16 +0000 (14:10 +0800)]
MDL-31295: Allow granting individual extension dates to students for mod_assign

9 years agoMerge branch 'MDL-35109-available-updates' of git://github.com/mudrd8mz/moodle
Sam Hemelryk [Mon, 3 Sep 2012 00:28:30 +0000 (12:28 +1200)]
Merge branch 'MDL-35109-available-updates' of git://github.com/mudrd8mz/moodle

9 years agoMerge branch 'MDL-31496_master' of git://github.com/dmonllao/moodle
Sam Hemelryk [Mon, 3 Sep 2012 00:20:38 +0000 (12:20 +1200)]
Merge branch 'MDL-31496_master' of git://github.com/dmonllao/moodle

9 years agoMerge branch 'MDL-35029_master' of git://github.com/dmonllao/moodle
Sam Hemelryk [Mon, 3 Sep 2012 00:16:03 +0000 (12:16 +1200)]
Merge branch 'MDL-35029_master' of git://github.com/dmonllao/moodle

9 years agoMerge branch 'MDL-34991' of git://github.com/nebgor/moodle
Sam Hemelryk [Sun, 2 Sep 2012 23:45:00 +0000 (11:45 +1200)]
Merge branch 'MDL-34991' of git://github.com/nebgor/moodle

9 years agoMDL-26822 user: Minor improvements post integration
Sam Hemelryk [Sun, 2 Sep 2012 23:41:07 +0000 (11:41 +1200)]
MDL-26822 user: Minor improvements post integration

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

9 years agoMerge branch 'wip-MDL-34318-master' of git://github.com/abgreeve/moodle
Sam Hemelryk [Sun, 2 Sep 2012 22:12:50 +0000 (10:12 +1200)]
Merge branch 'wip-MDL-34318-master' of git://github.com/abgreeve/moodle

9 years agoMerge branch 'MDL-30020c' of git://github.com/srynot4sale/moodle
Sam Hemelryk [Sun, 2 Sep 2012 22:01:50 +0000 (10:01 +1200)]
Merge branch 'MDL-30020c' of git://github.com/srynot4sale/moodle

9 years agoMDL-35189 import typo3 4.7.4
Petr Škoda [Sun, 2 Sep 2012 14:10:57 +0000 (16:10 +0200)]
MDL-35189 import typo3 4.7.4

9 years agoMDL-35188 import tcpdf 5.9.181
Petr Škoda [Sun, 2 Sep 2012 13:58:25 +0000 (15:58 +0200)]
MDL-35188 import tcpdf 5.9.181

9 years agoMDL-35180 theme_afterburner: fixes IE9 compatibility view bug
Mary Evans [Sun, 2 Sep 2012 13:58:23 +0000 (14:58 +0100)]
MDL-35180 theme_afterburner: fixes IE9 compatibility view bug

9 years agoMDL-35186 import phpmailer 5.2.1
Petr Škoda [Sun, 2 Sep 2012 13:36:25 +0000 (15:36 +0200)]
MDL-35186 import phpmailer 5.2.1

9 years agoMDL-35185 import Flowplayer 3.2.14
Petr Škoda [Sun, 2 Sep 2012 13:11:57 +0000 (15:11 +0200)]
MDL-35185 import Flowplayer 3.2.14

9 years agoMDL-34097 keep current requirements for Moodle 2.4
Petr Škoda [Sun, 2 Sep 2012 09:52:58 +0000 (11:52 +0200)]
MDL-34097 keep current requirements for Moodle 2.4

9 years agoMDL-35151 theme_anomaly: removed CSS selectors (.forumpost .content p) from style...
Mary Evans [Sat, 1 Sep 2012 22:04:08 +0000 (23:04 +0100)]
MDL-35151 theme_anomaly: removed CSS selectors (.forumpost .content p) from style/general.php thus allowing YUI CSS to style paragraphs as normal.

9 years agoMDL-35080 skip views and weird tables in mysql structure upgrades
Petr Škoda [Sat, 1 Sep 2012 13:37:41 +0000 (15:37 +0200)]
MDL-35080 skip views and weird tables in mysql structure upgrades

9 years agoMDL-35145 add basic unit tests for delete_user()
Petr Škoda [Sat, 1 Sep 2012 12:13:40 +0000 (14:13 +0200)]
MDL-35145 add basic unit tests for delete_user()

9 years agoMDL-35145 add extra delete_user() parameter validation
Petr Škoda [Sat, 1 Sep 2012 11:27:30 +0000 (13:27 +0200)]
MDL-35145 add extra delete_user() parameter validation

We do not want to delete local admins and guest account, we need to validate the supplied parameter is valid $user record and refetch it from database.

9 years agoMDL-35168 fix yui combo path disclosure
Petr Škoda [Sat, 1 Sep 2012 10:35:31 +0000 (12:35 +0200)]
MDL-35168 fix yui combo path disclosure

9 years agoMDL-35177 add tinymce plugin icons
Petr Škoda [Sat, 1 Sep 2012 09:36:13 +0000 (11:36 +0200)]
MDL-35177 add tinymce plugin icons

9 years agoMDL-30643 - Fixing minor log output error and test cases.
Tyler Bannister [Tue, 7 Aug 2012 18:41:09 +0000 (14:41 -0400)]
MDL-30643 - Fixing minor log output error and test cases.

9 years agoMDL-30643 - Added statslib test file.
Tyler Bannister [Fri, 3 Aug 2012 19:53:27 +0000 (15:53 -0400)]
MDL-30643 - Added statslib test file.
          - Tests daily stats and daily stats related functions.

9 years agoMDL-30643 - Now loading table definitions from XML files.
Tyler Bannister [Fri, 3 Aug 2012 19:51:49 +0000 (15:51 -0400)]
MDL-30643 - Now loading table definitions from XML files.

9 years agoMDL-30643 - Moved table create/drop out of loop to fix performance issue.
Tyler Bannister [Thu, 14 Jun 2012 12:18:01 +0000 (08:18 -0400)]
MDL-30643 - Moved table create/drop out of loop to fix performance issue.
          - Added additional output to weekly and monthly stat generation

9 years agoMDL-30643 - Added additional temporary tables to deal with log growth in daily tables.
Tyler Bannister [Fri, 18 May 2012 14:07:48 +0000 (10:07 -0400)]
MDL-30643 - Added additional temporary tables to deal with log growth in daily tables.

9 years agoMDL-30643 - Fixed speed issues with stats generation.
Tyler Bannister [Fri, 11 May 2012 19:02:56 +0000 (15:02 -0400)]
MDL-30643 - Fixed speed issues with stats generation.

9 years agoMDL-35077 fix stats report navigation links
Petr Škoda [Tue, 28 Aug 2012 06:08:30 +0000 (08:08 +0200)]
MDL-35077 fix stats report navigation links

9 years agoweekly release 2.4dev
Eloy Lafuente (stronk7) [Fri, 31 Aug 2012 09:36:43 +0000 (11:36 +0200)]
weekly release 2.4dev

9 years agoMerge branch 'install_master' of git://git.moodle.cz/moodle-install
Eloy Lafuente (stronk7) [Fri, 31 Aug 2012 09:26:49 +0000 (11:26 +0200)]
Merge branch 'install_master' of git://git.moodle.cz/moodle-install

9 years agoMDL-35147 lesson qformat import: Dirty hack to support array questiontext structures.
Eloy Lafuente (stronk7) [Thu, 30 Aug 2012 20:58:52 +0000 (22:58 +0200)]
MDL-35147 lesson qformat import: Dirty hack to support array questiontext structures.

9 years agoMDL-27818 question bank: multilang category names don't work.
Tim Hunt [Wed, 29 Aug 2012 21:43:28 +0000 (22:43 +0100)]
MDL-27818 question bank: multilang category names don't work.

9 years agoMDL-35133 accesslib: context_module::get_context_name should format_string
Tim Hunt [Wed, 29 Aug 2012 21:25:28 +0000 (22:25 +0100)]
MDL-35133 accesslib: context_module::get_context_name should format_string

Otherwise activites with multilang names are displayed badly.

9 years agoMerge branch 'MDL-35147' of git://github.com/timhunt/moodle
Eloy Lafuente (stronk7) [Thu, 30 Aug 2012 16:43:02 +0000 (18:43 +0200)]
Merge branch 'MDL-35147' of git://github.com/timhunt/moodle

9 years agoMerge branch 'MDL-31244' of git://github.com/timhunt/moodle
Eloy Lafuente (stronk7) [Thu, 30 Aug 2012 16:27:03 +0000 (18:27 +0200)]
Merge branch 'MDL-31244' of git://github.com/timhunt/moodle

9 years agoMDL-35147 lesson: fix regression from MDL-25492.
Tim Hunt [Thu, 30 Aug 2012 12:09:10 +0000 (13:09 +0100)]
MDL-35147 lesson: fix regression from MDL-25492.

I really wish someone would fix lesson to use the question bank.

9 years agoMerge branch 'wip-MDL-32108-master' of git://github.com/abgreeve/moodle
Aparup Banerjee [Thu, 30 Aug 2012 03:37:47 +0000 (11:37 +0800)]
Merge branch 'wip-MDL-32108-master' of git://github.com/abgreeve/moodle

9 years agoMerge branch 'MDL-35010' of git://github.com/stronk7/moodle
Aparup Banerjee [Thu, 30 Aug 2012 02:38:15 +0000 (10:38 +0800)]
Merge branch 'MDL-35010' of git://github.com/stronk7/moodle

9 years agoMDL-29662 quiz overrides: update dates during course reset.
Tim Hunt [Wed, 29 Aug 2012 17:41:37 +0000 (18:41 +0100)]
MDL-29662 quiz overrides: update dates during course reset.

Also, fix duplicate SQL clause in similar code in lib,
and fix error when saving overrides.

9 years agoMDL-33306 qtype multichoice: fix display of right answer.
Tim Hunt [Wed, 29 Aug 2012 16:42:53 +0000 (17:42 +0100)]
MDL-33306 qtype multichoice: fix display of right answer.

Also, fix  higlighing of last edited question in the qeustion bank, when
it co-incides with a grey row.

9 years agoMDL-34725 Make the signatures of process_legacy_element() method consistent
David Mudrák [Wed, 29 Aug 2012 13:33:22 +0000 (15:33 +0200)]
MDL-34725 Make the signatures of process_legacy_element() method consistent

The patch fixes the missing parameter type declaration in all subclasses
of the moodle1_workshopform_handler class.

9 years agoMerge branch 'wip-mdl-30121' of git://github.com/rajeshtaneja/moodle
Eloy Lafuente (stronk7) [Wed, 29 Aug 2012 10:14:46 +0000 (12:14 +0200)]
Merge branch 'wip-mdl-30121' of git://github.com/rajeshtaneja/moodle

9 years agoMerge branch 'wip-MDL-34290-master' of git://github.com/marinaglancy/moodle
Eloy Lafuente (stronk7) [Wed, 29 Aug 2012 10:11:00 +0000 (12:11 +0200)]
Merge branch 'wip-MDL-34290-master' of git://github.com/marinaglancy/moodle

9 years agoMerge branch 'wip-mdl-31623' of git://github.com/rajeshtaneja/moodle
Aparup Banerjee [Wed, 29 Aug 2012 08:57:03 +0000 (16:57 +0800)]
Merge branch 'wip-mdl-31623' of git://github.com/rajeshtaneja/moodle

9 years agoMDL-31973 Remove inadvertantly committed function call from testing
Andrew Robert Nicols [Wed, 29 Aug 2012 08:19:18 +0000 (09:19 +0100)]
MDL-31973 Remove inadvertantly committed function call from testing

9 years agoMDL-35119 tool_assignmentupgrade Changing onsubmit form for onclick button
David Monllao [Wed, 29 Aug 2012 07:01:40 +0000 (15:01 +0800)]
MDL-35119 tool_assignmentupgrade Changing onsubmit form for onclick button

9 years agoMDL-34990 fix JS error when moodlenolink button not present in toolbar
Petr Škoda [Wed, 29 Aug 2012 07:57:32 +0000 (09:57 +0200)]
MDL-34990 fix JS error when moodlenolink button not present in toolbar

Thanks Rossiani Wijaya for discovering this issue!

9 years agoMerge branch 'MDL-31959' of git://github.com/rwijaya/moodle
Aparup Banerjee [Wed, 29 Aug 2012 07:33:31 +0000 (15:33 +0800)]
Merge branch 'MDL-31959' of git://github.com/rwijaya/moodle

9 years agoMDL-34310 Removed unused options from gradingform_guide
Marina Glancy [Wed, 29 Aug 2012 05:50:16 +0000 (13:50 +0800)]
MDL-34310 Removed unused options from gradingform_guide

9 years agoMerge branch 'w35_MDL-35064_m24_delenrol' of git://github.com/skodak/moodle
Aparup Banerjee [Wed, 29 Aug 2012 05:46:04 +0000 (13:46 +0800)]
Merge branch 'w35_MDL-35064_m24_delenrol' of git://github.com/skodak/moodle

Conflicts:
enrol/manual/locallib.php