moodle.git
9 years agoMerge branch 'MDL-29058' of git://github.com/timhunt/moodle
Aparup Banerjee [Wed, 9 Nov 2011 03:29:45 +0000 (11:29 +0800)]
Merge branch 'MDL-29058' of git://github.com/timhunt/moodle

9 years agoMDL-29812 partcipiant report - breaks when filtering by user
Dan Poltawski [Tue, 1 Nov 2011 17:02:23 +0000 (17:02 +0000)]
MDL-29812 partcipiant report - breaks when filtering by user

9 years agoMerge branch 'wip-MDL-24200-master' of git://github.com/phalacee/moodle
Aparup Banerjee [Wed, 9 Nov 2011 03:05:32 +0000 (11:05 +0800)]
Merge branch 'wip-MDL-24200-master' of git://github.com/phalacee/moodle

9 years agoMerge branch 'master_MDL-29159' of git://github.com/danmarsden/moodle
Eloy Lafuente (stronk7) [Wed, 9 Nov 2011 01:20:26 +0000 (02:20 +0100)]
Merge branch 'master_MDL-29159' of git://github.com/danmarsden/moodle

9 years agoMerge branch 'master_MDL-30146' of git://github.com/danmarsden/moodle
Eloy Lafuente (stronk7) [Wed, 9 Nov 2011 01:13:38 +0000 (02:13 +0100)]
Merge branch 'master_MDL-30146' of git://github.com/danmarsden/moodle

9 years agoMerge branch 'master_MDL-27036' of git://github.com/danmarsden/moodle
Eloy Lafuente (stronk7) [Wed, 9 Nov 2011 01:03:25 +0000 (02:03 +0100)]
Merge branch 'master_MDL-27036' of git://github.com/danmarsden/moodle

9 years agoMerge branch 'master_MDL-30041' of git://github.com/danmarsden/moodle
Eloy Lafuente (stronk7) [Wed, 9 Nov 2011 00:34:08 +0000 (01:34 +0100)]
Merge branch 'master_MDL-30041' of git://github.com/danmarsden/moodle

9 years agoMDL-28277 SCORM some whitespace and MOODLE_INTERNAL fixes
Eloy Lafuente (stronk7) [Wed, 9 Nov 2011 00:30:51 +0000 (01:30 +0100)]
MDL-28277 SCORM some whitespace and MOODLE_INTERNAL fixes

9 years agoMerge branch 'MDL-28277-master' of git://github.com/ankitagarwal/moodle
Eloy Lafuente (stronk7) [Wed, 9 Nov 2011 00:20:06 +0000 (01:20 +0100)]
Merge branch 'MDL-28277-master' of git://github.com/ankitagarwal/moodle

9 years agoMDL-29803 report/logs - don't retrieve all users uncessarily
Dan Poltawski [Tue, 1 Nov 2011 16:30:24 +0000 (16:30 +0000)]
MDL-29803 report/logs - don't retrieve all users uncessarily

Also remove uncessary retrieval of idnumber

Helps display the main logs page on large sites without running out of
memory

9 years agoMerge branch 'MDL-29739' of git://github.com/timhunt/moodle
Aparup Banerjee [Tue, 8 Nov 2011 12:34:41 +0000 (20:34 +0800)]
Merge branch 'MDL-29739' of git://github.com/timhunt/moodle

9 years agoMerge branch 'MDL-29970' of git://github.com/timhunt/moodle
Aparup Banerjee [Tue, 8 Nov 2011 08:48:59 +0000 (16:48 +0800)]
Merge branch 'MDL-29970' of git://github.com/timhunt/moodle

9 years agoMerge branch 'wip-mdl-27521-master' of git://github.com/phalacee/moodle
Aparup Banerjee [Tue, 8 Nov 2011 07:18:22 +0000 (15:18 +0800)]
Merge branch 'wip-mdl-27521-master' of git://github.com/phalacee/moodle

9 years agoMerge branch 'wip-mdl-27790-modified' of git://github.com/rajeshtaneja/moodle
Aparup Banerjee [Tue, 8 Nov 2011 06:50:16 +0000 (14:50 +0800)]
Merge branch 'wip-mdl-27790-modified' of git://github.com/rajeshtaneja/moodle

9 years agoMerge branch 'MDL-30135' of git://github.com/timhunt/moodle
Aparup Banerjee [Tue, 8 Nov 2011 03:43:49 +0000 (11:43 +0800)]
Merge branch 'MDL-30135' of git://github.com/timhunt/moodle

9 years agoMerge branch 'MDL-30137' of git://github.com/timhunt/moodle
Aparup Banerjee [Tue, 8 Nov 2011 03:37:59 +0000 (11:37 +0800)]
Merge branch 'MDL-30137' of git://github.com/timhunt/moodle

9 years agoMDL-27790 Backup: Added warning message to let user know that temporary course will...
Rajesh Taneja [Thu, 29 Sep 2011 07:18:19 +0000 (15:18 +0800)]
MDL-27790 Backup: Added warning message to let user know that temporary course will be created for restoration process

9 years agoMDL-27790 Backup: temperory course will be deleted in case of exception and cancellat...
Rajesh Taneja [Thu, 22 Sep 2011 06:42:17 +0000 (14:42 +0800)]
MDL-27790 Backup: temperory course will be deleted in case of exception and cancellation of restore process

9 years agoMDL-30154 Repositories : fixed whitespace.
Aparup Banerjee [Tue, 8 Nov 2011 03:29:31 +0000 (11:29 +0800)]
MDL-30154 Repositories : fixed whitespace.

9 years agoMerge branch 'MDL-30154_master_wip' of git://github.com/grabs/moodle
Aparup Banerjee [Tue, 8 Nov 2011 03:15:01 +0000 (11:15 +0800)]
Merge branch 'MDL-30154_master_wip' of git://github.com/grabs/moodle

9 years agoMerge branch 'MDL-25823' of git://github.com/rwijaya/moodle
Sam Hemelryk [Tue, 8 Nov 2011 00:10:00 +0000 (13:10 +1300)]
Merge branch 'MDL-25823' of git://github.com/rwijaya/moodle

9 years agoMerge branch 'wip-MDL-30059-master' of git://github.com/phalacee/moodle
Sam Hemelryk [Tue, 8 Nov 2011 00:00:00 +0000 (13:00 +1300)]
Merge branch 'wip-MDL-30059-master' of git://github.com/phalacee/moodle

9 years agoMerge branch 'MDL-30044-master' of git://github.com/ankitagarwal/moodle
Sam Hemelryk [Mon, 7 Nov 2011 22:58:10 +0000 (11:58 +1300)]
Merge branch 'MDL-30044-master' of git://github.com/ankitagarwal/moodle

9 years agoMerge branch 'MDL-30175' of git://github.com/stronk7/moodle
Sam Hemelryk [Mon, 7 Nov 2011 21:57:54 +0000 (10:57 +1300)]
Merge branch 'MDL-30175' of git://github.com/stronk7/moodle

9 years agoMDL-30175 cm_info - add support to external url icon images
Eloy Lafuente (stronk7) [Mon, 7 Nov 2011 16:42:56 +0000 (17:42 +0100)]
MDL-30175 cm_info - add support to external url icon images

9 years agoMDL-30135 question formats: trans_format/get_format should be public.
Tim Hunt [Mon, 7 Nov 2011 11:31:27 +0000 (11:31 +0000)]
MDL-30135 question formats: trans_format/get_format should be public.

They need to be used by third-party qtype developers.

9 years agoMDL24200 - Admin Users - Changing the submit button to just a button to prevent it...
Jason Fowler [Fri, 7 Oct 2011 08:20:26 +0000 (16:20 +0800)]
MDL24200 - Admin Users - Changing the submit button to just a button to prevent it from taking focus when entering text. (Patch provided by Hubert Chathi)

9 years agoMDL-30059: Assignment Submission Notification Should Use Teacher's Timezone Rather...
Mark Nielsen [Fri, 4 Nov 2011 19:22:14 +0000 (12:22 -0700)]
MDL-30059: Assignment Submission Notification Should Use Teacher's Timezone Rather Than Server Time

9 years agoSCORM MDL-27036 increase sessid, improve lang strings
Dan Marsden [Mon, 7 Nov 2011 01:34:13 +0000 (14:34 +1300)]
SCORM MDL-27036 increase sessid, improve lang strings

9 years agoMDL-28292 block_html: white space fix
Sam Hemelryk [Sun, 6 Nov 2011 23:33:18 +0000 (12:33 +1300)]
MDL-28292 block_html: white space fix

9 years agoMerge branch 'wip-MDL-28292-master' of git://github.com/phalacee/moodle
Sam Hemelryk [Sun, 6 Nov 2011 23:24:26 +0000 (12:24 +1300)]
Merge branch 'wip-MDL-28292-master' of git://github.com/phalacee/moodle

9 years agoMDL-29864 minify: Added a link to upstream issue being patched
Sam Hemelryk [Sun, 6 Nov 2011 23:19:57 +0000 (12:19 +1300)]
MDL-29864 minify: Added a link to upstream issue being patched

9 years agoMerge branch 'MDL-29864-master-2' of git://git.luns.net.uk/moodle
Sam Hemelryk [Sun, 6 Nov 2011 22:58:44 +0000 (11:58 +1300)]
Merge branch 'MDL-29864-master-2' of git://git.luns.net.uk/moodle

9 years agoMerge branch 'MDL-29955' of git://github.com/rwijaya/moodle
Sam Hemelryk [Sun, 6 Nov 2011 22:41:31 +0000 (11:41 +1300)]
Merge branch 'MDL-29955' of git://github.com/rwijaya/moodle

9 years agoMDL-30154 - WebDAV-Repository fails on some WebDAV-Server
Andreas Grabs [Sun, 6 Nov 2011 21:09:11 +0000 (22:09 +0100)]
MDL-30154 - WebDAV-Repository fails on some WebDAV-Server

9 years agoSCORM MDL-30146 AICC - add ability to link direct to a simple AICC url
Dan Marsden [Sat, 5 Nov 2011 08:51:24 +0000 (21:51 +1300)]
SCORM MDL-30146 AICC - add ability to link direct to a simple AICC url

9 years agoSCORM MDL-27036 enable AICC HACP
Dan Marsden [Sat, 5 Nov 2011 02:21:19 +0000 (15:21 +1300)]
SCORM MDL-27036 enable AICC HACP

9 years agoMDL-30137 question engine: Ugglify the SQL to appease MS SQL server.
Tim Hunt [Fri, 4 Nov 2011 15:02:29 +0000 (15:02 +0000)]
MDL-30137 question engine: Ugglify the SQL to appease MS SQL server.

9 years agoMDL-28277 SCORM optimising function get_scorm_question_count
Ankit Kumar Agarwal [Wed, 2 Nov 2011 08:19:18 +0000 (13:49 +0530)]
MDL-28277 SCORM optimising function get_scorm_question_count

9 years agoSCORM MDL-29159 - override getContentHtml function in treeview so that it doesn't...
Dan Marsden [Thu, 3 Nov 2011 11:24:59 +0000 (00:24 +1300)]
SCORM MDL-29159 - override getContentHtml function in treeview so that it doesn't escape text incorrectly

9 years agoMDL-29058 question export: include files from hints & combined feedback.
Tim Hunt [Mon, 31 Oct 2011 18:17:11 +0000 (18:17 +0000)]
MDL-29058 question export: include files from hints & combined feedback.

9 years agoMDL-29739 question import used a bad default for text formats.
Tim Hunt [Mon, 31 Oct 2011 18:03:02 +0000 (18:03 +0000)]
MDL-29739 question import used a bad default for text formats.

The new logic is that the questiontext defaults to HTML if the format is
not specified, then all other fields default to the same format of the
question text.

However, good practice is that the XML file should specify the format
for each bit of text content.

This code is not 100% backwards-compatible, since some methods have new
arguments, however for question types that have not been updated, it
will just generate a PHP Warning, which is, I think, and OK way to let
qtype developers know that they need to update their question types.

9 years agoMDL-29970 question preview: Fill correct only if qtype supports it
Charles Fulton [Thu, 27 Oct 2011 20:25:45 +0000 (13:25 -0700)]
MDL-29970 question preview: Fill correct only if qtype supports it

9 years agoMDL-28292 - Blocks - Patch supplied by Chris Follin to fix blocks with empty titles...
Jason Fowler [Thu, 3 Nov 2011 08:18:39 +0000 (16:18 +0800)]
MDL-28292 - Blocks - Patch supplied by Chris Follin to fix blocks with empty titles that disappear when docked

9 years agoMDL-25823 lesson mod: fixed true and false question feedback.
Rossiani Wijaya [Thu, 3 Nov 2011 04:47:53 +0000 (12:47 +0800)]
MDL-25823 lesson mod: fixed true and false question feedback.

9 years agoMDL-30044 SCORM documenting function scorm_report_list
Ankit Kumar Agarwal [Wed, 2 Nov 2011 06:15:23 +0000 (11:45 +0530)]
MDL-30044 SCORM documenting function scorm_report_list

9 years agoMDL-28277 SCORM Polishing codes
Ankit Kumar Agarwal [Wed, 2 Nov 2011 03:47:57 +0000 (09:17 +0530)]
MDL-28277 SCORM Polishing codes

9 years agoMDL-28277 SCORM remove whitespace from patch
Dan Marsden [Tue, 1 Nov 2011 20:30:10 +0000 (09:30 +1300)]
MDL-28277 SCORM remove whitespace from patch

9 years agoMDL-28277 MDL-30009 fix for started on/last accessed on dates for users with no attempts.
Dan Marsden [Sun, 30 Oct 2011 22:10:09 +0000 (11:10 +1300)]
MDL-28277 MDL-30009 fix for started on/last accessed on dates for users with no attempts.

9 years agoMDL-28277 small bug fixes
Ankit Kumar Agarwal [Wed, 10 Aug 2011 09:58:36 +0000 (15:28 +0530)]
MDL-28277 small bug fixes
modified:   mod/scorm/report/interactions/report.php
modified:   mod/scorm/report/interactions/responsessettings_form.php
modified:   mod/scorm/report/reportlib.php

9 years agoMDL-28277 Adding course context to format_Strings
Ankit Kumar Agarwal [Thu, 4 Aug 2011 17:26:25 +0000 (22:56 +0530)]
MDL-28277 Adding course context to format_Strings

9 years agoMDL-28277 removed IN from sql statments
Ankit Kumar Agarwal [Wed, 3 Aug 2011 15:24:27 +0000 (20:54 +0530)]
MDL-28277 removed IN from sql statments

9 years agoMDL-28277 formating codes
Ankit Kumar Agarwal [Tue, 26 Jul 2011 10:35:47 +0000 (16:05 +0530)]
MDL-28277 formating codes

9 years agoMDL-28277 Small fixes
Ankit Kumar Agarwal [Tue, 26 Jul 2011 10:32:30 +0000 (16:02 +0530)]
MDL-28277 Small fixes

9 years agoMDL-28277 Added function to find question count
Ankit Kumar Agarwal [Mon, 25 Jul 2011 15:17:04 +0000 (20:47 +0530)]
MDL-28277 Added function to find question count

9 years agoMDL-28277 Basic Skeleton update
Ankit Kumar Agarwal [Sun, 24 Jul 2011 16:50:27 +0000 (22:20 +0530)]
MDL-28277 Basic Skeleton update
modified:   mod/scorm/report/interactions/report.php

9 years agoMDL-28277 First Version push of the interactions plugin
Ankit Kumar Agarwal [Thu, 14 Jul 2011 08:18:22 +0000 (13:48 +0530)]
MDL-28277 First Version push of the interactions plugin
new file:   mod/scorm/report/interactions/lang/en/scormreport_interactions.php
new file:   mod/scorm/report/interactions/report.php
new file:   mod/scorm/report/interactions/responsessettings_form.php
new file:   mod/scorm/report/interactions/version.php

9 years agoMDL27522 First version Push
Ankit Kumar Agarwal [Mon, 16 May 2011 03:03:58 +0000 (08:33 +0530)]
MDL27522 First version Push

modified:   mod/scorm/report.php
new file:   mod/scorm/reportuser.php

MDL-27522 SCORM Reports-remove users report to seperate files for better re-use

modified:   mod/scorm/reportuser.php

MDL-27522 SCORM Reports validated reportuser.php

modified:   mod/scorm/report.php
modified:   mod/scorm/reportuser.php

MDL-27522 SCORM REPORT - updating reportuser.php to use MUST_EXIST parameter

modified:   mod/scorm/lang/en/scorm.php
modified:   mod/scorm/reportuser.php

MDL-27522 SCORM Reports- Cleaning of codes
modified:   mod/scorm/report.php
modified:   mod/scorm/reportuser.php

MDL-27522 SCORM Reports- update formating

modified:   mod/scorm/report.php
modified:   mod/scorm/reportuser.php

MDL-27522 SCORM Reports removed unwanted codes from reportuser.php

modified:   mod/scorm/reportuser.php

MDL-27522 Scorm Reports - optimising codes

modified:   mod/scorm/report.php
modified:   mod/scorm/reportuser.php

MDL-27522 Scorm Reports-Formating report.php
modified:   mod/scorm/report.php

MDL-27522 Scorm Reporting - removing unsed variables

modified:   mod/scorm/lang/en/scorm.php
modified:   mod/scorm/report.php
modified:   mod/scorm/reportuser.php

MDL-27522 SCORM Reporting - Renaming reportuser.php to userreport.php
new file:   mod/scorm/userreport.php

MDL-27522 SCORM Reporting - deleting old reportuser.php

deleted:    mod/scorm/reportuser.php

MDL-27522 Scorm Reporting - updated version number

MDL-27522 Scorm Reporting - Discarding version changes

MDL-27523 Scorm Reporting - Basic reporting plugin
new file:   mod/scorm/report/basic/lang/en/scorm_basic.php
new file:   mod/scorm/report/basic/report.php
new file:   mod/scorm/report/default.php
new file:   mod/scorm/report/reportlib.php

MDL-27523 Scorm Reporting - Database Table structure pushed
new file:   mod/scorm/db/subplugins.php

MDL-27523 Scorm Reporting - Plugin container codes
modified:   mod/scorm/report.php
modified:   mod/scorm/tabs.php

MDL-27523 Scorm Reporting - Capability update
modified:   mod/scorm/report/reportlib.php

MDL-27523 Scorm Reporting - commenting files
modified:   mod/scorm/report/basic/db/install.php
modified:   mod/scorm/report/basic/lang/en/scorm_basic.php
modified:   mod/scorm/report/basic/version.php

MDL-27523 Scorm Reporting - Formating codes
modified:   mod/scorm/report/basic/db/install.php
modified:   mod/scorm/report/basic/report.php
modified:   mod/scorm/report/basic/version.php
modified:   mod/scorm/report/default.php
modified:   mod/scorm/report/reportlib.php

MDL-27523 Scorm Reporting - fixing small bugs
modified:   mod/scorm/report/basic/report.php

MDL-27523 Scorm Reporting - added databse upgrade code to scorm/db/upgrade.php

MDL-27523 Scorm Reporting - small optimisations

MDL-27523 SCorm Reporting - Removing Mod.php

MDL-27523 Scorm Reporting - Minor Fixes

new file:   mod/scorm/db/subplugins.php
modified:   mod/scorm/lang/en/scorm.php
modified:   mod/scorm/report.php
new file:   mod/scorm/report/basic/db/install.php
new file:   mod/scorm/report/basic/lang/en/scorm_basic.php
new file:   mod/scorm/report/basic/report.php
new file:   mod/scorm/report/basic/version.php
new file:   mod/scorm/report/default.php
new file:   mod/scorm/report/reportlib.php
modified:   mod/scorm/tabs.php
modified:   mod/scorm/userreport.php

modified:   mod/scorm/db/install.xml
new file:   mod/scorm/db/subplugins.php
modified:   mod/scorm/db/upgrade.php
modified:   mod/scorm/lang/en/scorm.php
modified:   mod/scorm/report.php
new file:   mod/scorm/report/basic/db/install.php
new file:   mod/scorm/report/basic/lang/en/scorm_basic.php
new file:   mod/scorm/report/basic/report.php
new file:   mod/scorm/report/basic/version.php
new file:   mod/scorm/report/default.php
new file:   mod/scorm/report/reportlib.php
modified:   mod/scorm/tabs.php
modified:   mod/scorm/userreport.php
modified:   mod/scorm/version.php

MDL-27523 Scorm Reporting - Removing Database Refereneces

MDL-27523 Scorm Reporting - Updating structure to remove DB usage
modified:   mod/scorm/db/upgrade.php
modified:   mod/scorm/report.php
modified:   mod/scorm/report/basic/report.php
modified:   mod/scorm/report/default.php
modified:   mod/scorm/report/reportlib.php

MDL-27523 Scorm Reporting - Minor fixes

MDL-27523 Scorm Reporting - Formating codes

MDL-27523 Scorm Reporting - Foramting Codes
modified:   mod/scorm/report/basic/lang/en/scorm_basic.php
modified:   mod/scorm/report/basic/report.php
modified:   mod/scorm/report/default.php
modified:   mod/scorm/report/reportlib.php

new file:   mod/scorm/db/subplugins.php
modified:   mod/scorm/lang/en/scorm.php
modified:   mod/scorm/report.php
new file:   mod/scorm/report/basic/lang/en/scorm_basic.php
new file:   mod/scorm/report/basic/report.php
new file:   mod/scorm/report/basic/version.php
new file:   mod/scorm/report/default.php
new file:   mod/scorm/report/reportlib.php
modified:   mod/scorm/tabs.php
modified:   mod/scorm/userreport.php
modified:   mod/scorm/version.php

9 years agoweekly release 2.2dev
Eloy Lafuente (stronk7) [Wed, 2 Nov 2011 18:52:31 +0000 (19:52 +0100)]
weekly release 2.2dev

9 years agoMerge branch 'install_master' of git://github.com/amosbot/moodle
Eloy Lafuente (stronk7) [Wed, 2 Nov 2011 18:48:26 +0000 (19:48 +0100)]
Merge branch 'install_master' of git://github.com/amosbot/moodle

9 years agoMDL-29213 - add clarification note + todo once MDL-30039 arrives
Eloy Lafuente (stronk7) [Wed, 2 Nov 2011 18:07:52 +0000 (19:07 +0100)]
MDL-29213 - add clarification note + todo once MDL-30039 arrives

9 years agoSCORM MDL-30041 fix case of string
Dan Marsden [Tue, 1 Nov 2011 20:42:29 +0000 (09:42 +1300)]
SCORM MDL-30041 fix case of string

9 years agoMerge branch 'MDL-29879' of git://github.com/timhunt/moodle
Eloy Lafuente (stronk7) [Tue, 1 Nov 2011 19:12:45 +0000 (20:12 +0100)]
Merge branch 'MDL-29879' of git://github.com/timhunt/moodle

9 years agoMDL-29283 import TCPDF to 5.9.133 - clean whitespace
Eloy Lafuente (stronk7) [Tue, 1 Nov 2011 19:09:10 +0000 (20:09 +0100)]
MDL-29283 import TCPDF to 5.9.133 - clean whitespace

9 years agoMDL-29213 - fix for bug with flash player and IE 9
Dan Marsden [Mon, 31 Oct 2011 01:52:07 +0000 (14:52 +1300)]
MDL-29213 - fix for bug with flash player and IE 9

(cherry-picked and amended with 1-line whitespace)

9 years agoMDL-29283 import TCPDF to 5.9.133 - fix permissions
Eloy Lafuente (stronk7) [Tue, 1 Nov 2011 16:27:26 +0000 (17:27 +0100)]
MDL-29283 import TCPDF to 5.9.133 - fix permissions

9 years agoMerge branch 'w43_MDL-29283_m22_tcpdf' of git://github.com/skodak/moodle
Eloy Lafuente (stronk7) [Tue, 1 Nov 2011 16:23:20 +0000 (17:23 +0100)]
Merge branch 'w43_MDL-29283_m22_tcpdf' of git://github.com/skodak/moodle

9 years agoMerge branch 'w43_MDL-29982_m22_canaccess' of git://github.com/skodak/moodle
Eloy Lafuente (stronk7) [Tue, 1 Nov 2011 11:26:31 +0000 (12:26 +0100)]
Merge branch 'w43_MDL-29982_m22_canaccess' of git://github.com/skodak/moodle

9 years agoMDL-29879 qbehaviour missing. Fix bad lang string.
Tim Hunt [Tue, 1 Nov 2011 10:37:48 +0000 (10:37 +0000)]
MDL-29879 qbehaviour missing. Fix bad lang string.

9 years agoMerge branch 'w43_MDL-30005_m22_uri' of git://github.com/skodak/moodle
Aparup Banerjee [Tue, 1 Nov 2011 07:18:44 +0000 (15:18 +0800)]
Merge branch 'w43_MDL-30005_m22_uri' of git://github.com/skodak/moodle

9 years agoMDL-30005 regression fix for non http/ftp urls
Petr Skoda [Tue, 1 Nov 2011 06:56:33 +0000 (07:56 +0100)]
MDL-30005 regression fix for non http/ftp urls

9 years agoMerge branch 'MDL-29983' of git://github.com/timhunt/moodle
Aparup Banerjee [Tue, 1 Nov 2011 05:23:03 +0000 (13:23 +0800)]
Merge branch 'MDL-29983' of git://github.com/timhunt/moodle

9 years agoMDL-28720 calendar: Quick fix of a regression in set.php
Sam Hemelryk [Tue, 1 Nov 2011 04:50:01 +0000 (17:50 +1300)]
MDL-28720 calendar: Quick fix of a regression in set.php

9 years agoMerge branch 'w43_MDL-29964_m22_fixenrolevents' of git://github.com/skodak/moodle
Sam Hemelryk [Tue, 1 Nov 2011 04:36:50 +0000 (17:36 +1300)]
Merge branch 'w43_MDL-29964_m22_fixenrolevents' of git://github.com/skodak/moodle

9 years agoMerge branch 'w43_MDL-29990_m22_navcontinue' of git://github.com/skodak/moodle
Aparup Banerjee [Tue, 1 Nov 2011 04:15:40 +0000 (12:15 +0800)]
Merge branch 'w43_MDL-29990_m22_navcontinue' of git://github.com/skodak/moodle

9 years agoMerge branch 'MDL-29787' of git://github.com/lazydaisy/moodle
Aparup Banerjee [Tue, 1 Nov 2011 04:00:57 +0000 (12:00 +0800)]
Merge branch 'MDL-29787' of git://github.com/lazydaisy/moodle

9 years agoMerge branch 'w43_MDL-29980_m22_flowcss' of git://github.com/skodak/moodle
Sam Hemelryk [Tue, 1 Nov 2011 03:52:02 +0000 (16:52 +1300)]
Merge branch 'w43_MDL-29980_m22_flowcss' of git://github.com/skodak/moodle

9 years agoMerge branch 'MDL-29164' of git://github.com/timhunt/moodle
Sam Hemelryk [Tue, 1 Nov 2011 03:47:16 +0000 (16:47 +1300)]
Merge branch 'MDL-29164' of git://github.com/timhunt/moodle

9 years agoMDL-27521 Updates the can_finalize and can_unfinalize methods to deal with passing...
Gerwood Stewart [Mon, 16 May 2011 01:57:33 +0000 (11:57 +1000)]
MDL-27521 Updates the can_finalize and can_unfinalize methods to deal with passing a submission object that isn't one (in this case is a Boolean value). This will result in both methods now returning false. Kick on effect is that it corrects the bug described in MDL-27521 by removing the button if it isn't possible to finalize the submission.

9 years agoMerge branch 'MDL-29197' of git://github.com/lazydaisy/moodle
Sam Hemelryk [Tue, 1 Nov 2011 03:11:58 +0000 (16:11 +1300)]
Merge branch 'MDL-29197' of git://github.com/lazydaisy/moodle

9 years agoMerge branch 'MDL-25760' of git://github.com/lazydaisy/moodle
Sam Hemelryk [Tue, 1 Nov 2011 02:56:55 +0000 (15:56 +1300)]
Merge branch 'MDL-25760' of git://github.com/lazydaisy/moodle

9 years agoAutomatically generated installer lang files
AMOS bot [Tue, 1 Nov 2011 00:55:16 +0000 (00:55 +0000)]
Automatically generated installer lang files

9 years agoMerge branch 'w43_MDL-29925_m22_calendar' of git://github.com/skodak/moodle
Sam Hemelryk [Mon, 31 Oct 2011 20:38:24 +0000 (09:38 +1300)]
Merge branch 'w43_MDL-29925_m22_calendar' of git://github.com/skodak/moodle

9 years agoMDL-29164 question import, missing lang string.
Tim Hunt [Mon, 31 Oct 2011 15:35:07 +0000 (15:35 +0000)]
MDL-29164 question import, missing lang string.

AMOS BEGIN
 MOV [noquestionsinfile,mod_quiz],[noquestionsinfile,question]
AMOS END

9 years agoMerge branch 'w43_MDL-29922_m22_smarty' of git://github.com/skodak/moodle
Aparup Banerjee [Mon, 31 Oct 2011 09:19:14 +0000 (17:19 +0800)]
Merge branch 'w43_MDL-29922_m22_smarty' of git://github.com/skodak/moodle

9 years agoMerge branch 'w43_MDL-29921_m22_qti2' of git://github.com/skodak/moodle
Aparup Banerjee [Mon, 31 Oct 2011 09:08:32 +0000 (17:08 +0800)]
Merge branch 'w43_MDL-29921_m22_qti2' of git://github.com/skodak/moodle

9 years agoMerge branch 'w43_MDL-29972_m22_langreset' of git://github.com/skodak/moodle
Aparup Banerjee [Mon, 31 Oct 2011 08:10:00 +0000 (16:10 +0800)]
Merge branch 'w43_MDL-29972_m22_langreset' of git://github.com/skodak/moodle

9 years agoMerge branch 'w43_MDL-29966_m22_grouploading' of git://github.com/skodak/moodle
Aparup Banerjee [Mon, 31 Oct 2011 08:05:12 +0000 (16:05 +0800)]
Merge branch 'w43_MDL-29966_m22_grouploading' of git://github.com/skodak/moodle

9 years agoMDL-29955: filestorage/file_types: add support for .f4v, .m4v and .webm
Rossiani Wijaya [Mon, 31 Oct 2011 07:26:25 +0000 (15:26 +0800)]
MDL-29955: filestorage/file_types: add support for .f4v, .m4v and .webm

9 years agoMerge branch 'w43_MDL-29984_m22_enroltoday' of git://github.com/skodak/moodle
Aparup Banerjee [Mon, 31 Oct 2011 07:25:55 +0000 (15:25 +0800)]
Merge branch 'w43_MDL-29984_m22_enroltoday' of git://github.com/skodak/moodle

9 years agoMDL-30005 URL : fixed typos
Aparup Banerjee [Mon, 31 Oct 2011 07:12:45 +0000 (15:12 +0800)]
MDL-30005 URL : fixed typos

9 years agoMerge branch 'w43_MDL-30005_m22_uri' of git://github.com/skodak/moodle
Aparup Banerjee [Mon, 31 Oct 2011 06:13:46 +0000 (14:13 +0800)]
Merge branch 'w43_MDL-30005_m22_uri' of git://github.com/skodak/moodle

9 years agoMerge branch 'w43_MDL-29883_m22_mp3player' of git://github.com/skodak/moodle
Sam Hemelryk [Mon, 31 Oct 2011 05:02:03 +0000 (18:02 +1300)]
Merge branch 'w43_MDL-29883_m22_mp3player' of git://github.com/skodak/moodle

9 years agoMerge branch 'w43_MDL-29824_m22_enrolmax' of git://github.com/skodak/moodle
Sam Hemelryk [Mon, 31 Oct 2011 04:59:11 +0000 (17:59 +1300)]
Merge branch 'w43_MDL-29824_m22_enrolmax' of git://github.com/skodak/moodle

9 years agoMerge branch 'w43_MDL-28720_m22_calendarreturn' of git://github.com/skodak/moodle
Sam Hemelryk [Mon, 31 Oct 2011 04:28:57 +0000 (17:28 +1300)]
Merge branch 'w43_MDL-28720_m22_calendarreturn' of git://github.com/skodak/moodle

9 years agoMerge branch 'MDL-27919' of git://github.com/jamiepratt/moodle
Sam Hemelryk [Mon, 31 Oct 2011 04:18:13 +0000 (17:18 +1300)]
Merge branch 'MDL-27919' of git://github.com/jamiepratt/moodle

9 years agoMerge branch 'MDL-29810' of git://github.com/bostelm/moodle
Sam Hemelryk [Mon, 31 Oct 2011 04:11:08 +0000 (17:11 +1300)]
Merge branch 'MDL-29810' of git://github.com/bostelm/moodle

9 years agoMerge branch 'MDL-29994' of git://github.com/stronk7/moodle
Sam Hemelryk [Mon, 31 Oct 2011 03:53:24 +0000 (16:53 +1300)]
Merge branch 'MDL-29994' of git://github.com/stronk7/moodle

9 years agoMerge branch 'w43_MDL-29923_m22_removesearch' of git://github.com/skodak/moodle
Aparup Banerjee [Mon, 31 Oct 2011 02:23:59 +0000 (10:23 +0800)]
Merge branch 'w43_MDL-29923_m22_removesearch' of git://github.com/skodak/moodle

9 years agoMerge branch 'MDL-29993' of git://github.com/stronk7/moodle
Sam Hemelryk [Mon, 31 Oct 2011 02:19:31 +0000 (15:19 +1300)]
Merge branch 'MDL-29993' of git://github.com/stronk7/moodle