moodle.git
10 years agoAutomatically generated installer lang files
AMOS bot [Tue, 26 Jul 2011 00:55:20 +0000 (00:55 +0000)]
Automatically generated installer lang files

10 years agoAutomatically generated installer lang files
AMOS bot [Sat, 23 Jul 2011 00:55:14 +0000 (00:55 +0000)]
Automatically generated installer lang files

10 years agoweekly release 2.2dev
Petr Skoda [Tue, 19 Jul 2011 13:25:11 +0000 (15:25 +0200)]
weekly release 2.2dev

10 years agoMerge branch 'install_master' of git://github.com/amosbot/moodle
Petr Skoda [Tue, 19 Jul 2011 13:15:32 +0000 (15:15 +0200)]
Merge branch 'install_master' of git://github.com/amosbot/moodle

10 years agoMDL-27696 initialise arrays
Petr Skoda [Tue, 19 Jul 2011 13:03:58 +0000 (15:03 +0200)]
MDL-27696 initialise arrays

Credit goes to David Mudrak.

10 years agoMDL-27696 do not use placeholders in GROUP BY because pg does no like that
Petr Skoda [Tue, 19 Jul 2011 08:53:20 +0000 (10:53 +0200)]
MDL-27696 do not use placeholders in GROUP BY because pg does no like that

10 years agoMDL-27889 use new recaptcha google urls in lang packs
Petr Skoda [Tue, 19 Jul 2011 08:18:31 +0000 (10:18 +0200)]
MDL-27889 use new recaptcha google urls in lang packs

10 years agoMDL-27523 fix phpdocs packages
Petr Skoda [Mon, 18 Jul 2011 14:03:15 +0000 (16:03 +0200)]
MDL-27523 fix phpdocs packages

10 years agoMerge branch 'master_MDL-27523' of git://github.com/danmarsden/moodle
Petr Skoda [Mon, 18 Jul 2011 13:58:59 +0000 (15:58 +0200)]
Merge branch 'master_MDL-27523' of git://github.com/danmarsden/moodle

10 years agoMerge branch 'wip-MDL-28040-master' of git://github.com/samhemelryk/moodle
Petr Skoda [Mon, 18 Jul 2011 13:33:42 +0000 (15:33 +0200)]
Merge branch 'wip-MDL-28040-master' of git://github.com/samhemelryk/moodle

10 years agoMerge branch 'wip-MDL-28184-master' of git://github.com/samhemelryk/moodle
Petr Skoda [Mon, 18 Jul 2011 13:28:16 +0000 (15:28 +0200)]
Merge branch 'wip-MDL-28184-master' of git://github.com/samhemelryk/moodle

10 years agoMerge branch 'wip-MDL-28205-master' of git://github.com/samhemelryk/moodle
Petr Skoda [Mon, 18 Jul 2011 13:25:02 +0000 (15:25 +0200)]
Merge branch 'wip-MDL-28205-master' of git://github.com/samhemelryk/moodle

10 years agoMerge branch 'wip-MDL-28137-master' of git://github.com/samhemelryk/moodle
Petr Skoda [Mon, 18 Jul 2011 13:22:29 +0000 (15:22 +0200)]
Merge branch 'wip-MDL-28137-master' of git://github.com/samhemelryk/moodle

10 years agoMerge branch 'wip-MDL-27771-master' of git://github.com/samhemelryk/moodle
Petr Skoda [Mon, 18 Jul 2011 13:19:35 +0000 (15:19 +0200)]
Merge branch 'wip-MDL-27771-master' of git://github.com/samhemelryk/moodle

10 years agoMerge branch 'wip-MDL-27696-master' of git://github.com/samhemelryk/moodle
Petr Skoda [Mon, 18 Jul 2011 13:17:05 +0000 (15:17 +0200)]
Merge branch 'wip-MDL-27696-master' of git://github.com/samhemelryk/moodle

10 years agoMerge branch 'wip-MDL-27305-master' of git://github.com/samhemelryk/moodle
Petr Skoda [Mon, 18 Jul 2011 13:13:44 +0000 (15:13 +0200)]
Merge branch 'wip-MDL-27305-master' of git://github.com/samhemelryk/moodle

10 years agoMerge branch 'wip-MDL-25870-master' of git://github.com/samhemelryk/moodle
Petr Skoda [Mon, 18 Jul 2011 12:57:02 +0000 (14:57 +0200)]
Merge branch 'wip-MDL-25870-master' of git://github.com/samhemelryk/moodle

10 years agoMerge branch 'wip-MDL-27756-master' of github.com:marinaglancy/moodle
Sam Hemelryk [Mon, 18 Jul 2011 12:15:55 +0000 (22:15 +1000)]
Merge branch 'wip-MDL-27756-master' of github.com:marinaglancy/moodle

10 years agoMerge branch 'MDL-27555' of git://github.com/rwijaya/moodle
Sam Hemelryk [Mon, 18 Jul 2011 11:50:50 +0000 (21:50 +1000)]
Merge branch 'MDL-27555' of git://github.com/rwijaya/moodle

10 years agoMerge branch 'w28_MDL-28345_m22_utf8' of git://github.com/skodak/moodle
Sam Hemelryk [Mon, 18 Jul 2011 11:16:43 +0000 (21:16 +1000)]
Merge branch 'w28_MDL-28345_m22_utf8' of git://github.com/skodak/moodle

10 years agoMerge branch 'wip-mdl-27837' of git://github.com/rajeshtaneja/moodle
Sam Hemelryk [Mon, 18 Jul 2011 11:03:22 +0000 (21:03 +1000)]
Merge branch 'wip-mdl-27837' of git://github.com/rajeshtaneja/moodle

10 years agoMerge branch 'w28_MDL-23344_m22_loginfocus2' of git://github.com/skodak/moodle
Sam Hemelryk [Mon, 18 Jul 2011 10:25:43 +0000 (20:25 +1000)]
Merge branch 'w28_MDL-23344_m22_loginfocus2' of git://github.com/skodak/moodle

10 years agoMerge branch 'w28_MDL-27804_m22_csvauth' of git://github.com/skodak/moodle
Sam Hemelryk [Mon, 18 Jul 2011 10:17:51 +0000 (20:17 +1000)]
Merge branch 'w28_MDL-27804_m22_csvauth' of git://github.com/skodak/moodle

10 years agoMerge branch 'w28_MDL-28253_m22_managerupgrade' of git://github.com/skodak/moodle
Sam Hemelryk [Mon, 18 Jul 2011 10:08:36 +0000 (20:08 +1000)]
Merge branch 'w28_MDL-28253_m22_managerupgrade' of git://github.com/skodak/moodle

10 years agoMerge branch 'w28_MDL-28313_m22_enroldb' of git://github.com/skodak/moodle
Sam Hemelryk [Mon, 18 Jul 2011 10:01:08 +0000 (20:01 +1000)]
Merge branch 'w28_MDL-28313_m22_enroldb' of git://github.com/skodak/moodle

10 years agoMerge branch 'w28_MDL-28344_m22_clickjacking' of git://github.com/skodak/moodle
Sam Hemelryk [Mon, 18 Jul 2011 09:47:59 +0000 (19:47 +1000)]
Merge branch 'w28_MDL-28344_m22_clickjacking' of git://github.com/skodak/moodle

10 years agoMerge branch 'w28_MDL-28348_m22_meta' of git://github.com/skodak/moodle
Sam Hemelryk [Mon, 18 Jul 2011 09:37:49 +0000 (19:37 +1000)]
Merge branch 'w28_MDL-28348_m22_meta' of git://github.com/skodak/moodle

10 years agoMerge branch 'w28_MDL-28350_m22_wsra' of git://github.com/skodak/moodle
Sam Hemelryk [Mon, 18 Jul 2011 09:27:57 +0000 (19:27 +1000)]
Merge branch 'w28_MDL-28350_m22_wsra' of git://github.com/skodak/moodle

10 years agoMerge branch 'wip-MDL-25125-master' of github.com:marinaglancy/moodle
Petr Skoda [Mon, 18 Jul 2011 07:18:31 +0000 (09:18 +0200)]
Merge branch 'wip-MDL-25125-master' of github.com:marinaglancy/moodle

10 years agoMerge branch 'w28_MDL-28363_m22_dimmed' of git://github.com/skodak/moodle
Sam Hemelryk [Mon, 18 Jul 2011 14:45:13 +0000 (00:45 +1000)]
Merge branch 'w28_MDL-28363_m22_dimmed' of git://github.com/skodak/moodle

10 years agoMerge branch 'MDL-28298-workshop-constant' of git://github.com/mudrd8mz/moodle
Sam Hemelryk [Mon, 18 Jul 2011 14:39:02 +0000 (00:39 +1000)]
Merge branch 'MDL-28298-workshop-constant' of git://github.com/mudrd8mz/moodle

10 years agoMerge branch 'MDL-28325-enrol-help' of git://github.com/mudrd8mz/moodle
Sam Hemelryk [Mon, 18 Jul 2011 14:34:37 +0000 (00:34 +1000)]
Merge branch 'MDL-28325-enrol-help' of git://github.com/mudrd8mz/moodle

10 years agoMerged branch 'master_MDL-26482' of git://github.com/danmarsden/moodle.git
Sam Hemelryk [Mon, 18 Jul 2011 14:25:13 +0000 (00:25 +1000)]
Merged branch 'master_MDL-26482' of git://github.com/danmarsden/moodle.git

10 years agoMDL-28348 fix spelling and some whitespace issues
Petr Skoda [Sun, 17 Jul 2011 18:39:20 +0000 (20:39 +0200)]
MDL-28348 fix spelling and some whitespace issues

10 years agoMDL-28348 fix fatal error caused by unenrolling of incorrect enrol instance
Petr Skoda [Sun, 17 Jul 2011 18:37:02 +0000 (20:37 +0200)]
MDL-28348 fix fatal error caused by unenrolling of incorrect enrol instance

10 years agoMDL-28348 prevent circular references in meta handler for enrolments
Petr Skoda [Sun, 17 Jul 2011 18:36:12 +0000 (20:36 +0200)]
MDL-28348 prevent circular references in meta handler for enrolments

10 years agoMDL-28348 fix meta sync when unassigning roles
Petr Skoda [Sun, 17 Jul 2011 18:35:15 +0000 (20:35 +0200)]
MDL-28348 fix meta sync when unassigning roles

10 years agoMDL-28363 make dimmed selectors more specific to prevent overriding from other themes
Petr Skoda [Sat, 16 Jul 2011 19:03:06 +0000 (21:03 +0200)]
MDL-28363 make dimmed selectors more specific to prevent overriding from other themes

10 years agoMDL-28345 make sure input parameters do not contain invalid utf-8 chars
Petr Skoda [Fri, 15 Jul 2011 13:00:49 +0000 (15:00 +0200)]
MDL-28345 make sure input parameters do not contain invalid utf-8 chars

10 years agoMDL-28350 prevent bogus role assignment via externallib
Petr Skoda [Fri, 15 Jul 2011 10:23:34 +0000 (12:23 +0200)]
MDL-28350 prevent bogus role assignment via externallib

10 years agoMDL-27804 allow changing of only auth in csv user uploads
Petr Skoda [Fri, 15 Jul 2011 09:07:33 +0000 (11:07 +0200)]
MDL-27804 allow changing of only auth in csv user uploads

10 years agoMDL-28325 Enrolment: added help to the duration, start date and end date setting
David Mudrak [Wed, 13 Jul 2011 14:47:05 +0000 (16:47 +0200)]
MDL-28325 Enrolment: added help to the duration, start date and end date setting

The patch also fixes one typo in enrol_manual detected while working on
this.

10 years agoMDL-27523 Fixing get_string issues
Ankit Kumar Agarwal [Thu, 14 Jul 2011 08:29:43 +0000 (13:59 +0530)]
MDL-27523 Fixing get_string issues

10 years agoMDL-28313 fix incorrect enrol database settings upgrade
Petr Skoda [Thu, 14 Jul 2011 20:28:40 +0000 (22:28 +0200)]
MDL-28313 fix incorrect enrol database settings upgrade

10 years agoMDL-28344 new option to prevent clickjacking via frame embedding
Petr Skoda [Thu, 14 Jul 2011 20:01:23 +0000 (22:01 +0200)]
MDL-28344 new option to prevent clickjacking via frame embedding

10 years agoMDL-28344 remove unused CFG->framename
Petr Skoda [Thu, 14 Jul 2011 20:00:41 +0000 (22:00 +0200)]
MDL-28344 remove unused CFG->framename

10 years agoMDL-28344 remove the unused $CFG->framename
Petr Skoda [Thu, 14 Jul 2011 19:40:50 +0000 (21:40 +0200)]
MDL-28344 remove the unused $CFG->framename

10 years agoMDL-23344 new option to autofocus username or password on the login form
Petr Skoda [Thu, 14 Jul 2011 13:58:01 +0000 (15:58 +0200)]
MDL-23344 new option to autofocus username or password on the login form

Nearly everybody else does this login page autofocus. Once we switch to HMTL 5 we should use the new autofocus input option. I believe the admin setting should be enabled by default but it would not be possible to get it through the reviews.

10 years agoMDL-28253 use unique name for new manager role
Petr Skoda [Thu, 14 Jul 2011 11:36:27 +0000 (13:36 +0200)]
MDL-28253 use unique name for new manager role

10 years agoMDL-27756 Improving move_course() performance
Marina Glancy [Thu, 14 Jul 2011 03:00:09 +0000 (11:00 +0800)]
MDL-27756 Improving move_course() performance

10 years agoMDL-27837 enrol - Fixed checkboxes for multiple self enrolment
Rajesh Taneja [Fri, 8 Jul 2011 05:59:12 +0000 (13:59 +0800)]
MDL-27837 enrol - Fixed checkboxes for multiple self enrolment

10 years agoMDL-25125 fix YUI bug with overriding styles
Marina Glancy [Wed, 13 Jul 2011 07:18:57 +0000 (15:18 +0800)]
MDL-25125 fix YUI bug with overriding styles

10 years agoAutomatically generated installer lang files
AMOS bot [Thu, 14 Jul 2011 00:55:15 +0000 (00:55 +0000)]
Automatically generated installer lang files

10 years agoMDL-26482 SCORM add option to disable TOC completely - thanks to Clark Burns for...
Dan Marsden [Wed, 13 Jul 2011 07:00:33 +0000 (19:00 +1200)]
MDL-26482 SCORM add option to disable TOC completely - thanks to Clark Burns for some help!

10 years agoMDL-28300 SCORM Fix check for SCORM 2004 thanks to Silvia Bastos for report/patch
Dan Marsden [Tue, 12 Jul 2011 21:35:38 +0000 (09:35 +1200)]
MDL-28300 SCORM Fix check for SCORM 2004 thanks to Silvia Bastos for report/patch

10 years agoMDL-27523 Small Fixes
Ankit Kumar Agarwal [Wed, 13 Jul 2011 16:19:01 +0000 (21:49 +0530)]
MDL-27523 Small Fixes

10 years agoMDL-27523 Minor Edits
Ankit Kumar Agarwal [Tue, 12 Jul 2011 15:55:59 +0000 (21:25 +0530)]
MDL-27523 Minor Edits

10 years agoMDL-27523 tidy up links to download files, shift logic for set_page to allow mode...
Dan Marsden [Mon, 11 Jul 2011 01:35:29 +0000 (13:35 +1200)]
MDL-27523 tidy up links to download files, shift logic for set_page to allow mode to be set correctly

10 years agoMDL-27523 SCORM move plugin links to tabs page and only show if more than one plugin...
Dan Marsden [Mon, 11 Jul 2011 00:29:42 +0000 (12:29 +1200)]
MDL-27523 SCORM move plugin links to tabs page and only show if more than one plugin is installed, move delete attempts code into plugin as it may not be supported in all plugins, general tidy up - good work Ankit!

10 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

10 years agoweekly release 2.2dev
Sam Hemelryk [Wed, 13 Jul 2011 12:21:48 +0000 (20:21 +0800)]
weekly release 2.2dev

10 years agoMerge branch 'install_master' of git://github.com/amosbot/moodle
Sam Hemelryk [Wed, 13 Jul 2011 12:06:16 +0000 (20:06 +0800)]
Merge branch 'install_master' of git://github.com/amosbot/moodle

10 years agoRevert "MDL-23344 fix login form focus"
Sam Hemelryk [Wed, 13 Jul 2011 12:02:58 +0000 (20:02 +0800)]
Revert "MDL-23344 fix login form focus"

This reverts commit 70b02b12d39fec290439ee38daabc26de4cf450f.

10 years agoMDL-28298 workshop: do not use a constant without explicit inclusion of the library
David Mudrak [Wed, 13 Jul 2011 08:28:28 +0000 (10:28 +0200)]
MDL-28298 workshop: do not use a constant without explicit inclusion of the library

Instead of including whole formslib just to get the constant defined, I
decided to hard-code the value and put the reference to the comment so
that eventual grep would spot it. Of course that is is not nice at all
but it's lesser of two evils imho.

10 years agoMDL-28184 navigation: Tidied up handling of coursenode when adding course essentials
Sam Hemelryk [Wed, 13 Jul 2011 05:39:29 +0000 (13:39 +0800)]
MDL-28184 navigation: Tidied up handling of coursenode when adding course essentials

10 years agoMDL-27771 filter-text: Fixed typo contninue
Sam Hemelryk [Wed, 13 Jul 2011 06:52:44 +0000 (14:52 +0800)]
MDL-27771 filter-text: Fixed typo contninue

10 years agoMDL-27305 forum: Added missing item to forum_get_view_actions
Chris Follin [Wed, 13 Jul 2011 06:22:18 +0000 (14:22 +0800)]
MDL-27305 forum: Added missing item to forum_get_view_actions

10 years agoMDL-25870 enrol-manual: Fixed pagination of AJAX search results for users when changi...
Sam Hemelryk [Wed, 13 Jul 2011 06:02:30 +0000 (14:02 +0800)]
MDL-25870 enrol-manual: Fixed pagination of AJAX search results for users when changing search

10 years agoMDL-28137 unit tests: Fixed up problem with block manager tests when running unit...
Sam Hemelryk [Wed, 13 Jul 2011 05:44:45 +0000 (13:44 +0800)]
MDL-28137 unit tests: Fixed up problem with block manager tests when running unit tests after turning editing on

10 years agoMDL-28205 RSS: Fixed up notice and set better pagelayout type on manage feeds page
Sam Hemelryk [Wed, 6 Jul 2011 02:35:32 +0000 (10:35 +0800)]
MDL-28205 RSS: Fixed up notice and set better pagelayout type on manage feeds page

10 years agoMDL-27696 datalib Fixed up misused params in get_logs_usercourse
Sam Hemelryk [Tue, 5 Jul 2011 02:45:28 +0000 (10:45 +0800)]
MDL-27696 datalib Fixed up misused params in get_logs_usercourse

10 years agoMDL-28040 navigation: Fixed up error with navigation when dealing with categories...
Sam Hemelryk [Wed, 13 Jul 2011 01:58:42 +0000 (09:58 +0800)]
MDL-28040 navigation: Fixed up error with navigation when dealing with categories that have a lower sort order than the parent.

10 years agoMerge branch 'MDL-28221-resource-conversion' of git://github.com/mudrd8mz/moodle
Eloy Lafuente (stronk7) [Tue, 12 Jul 2011 14:57:54 +0000 (16:57 +0200)]
Merge branch 'MDL-28221-resource-conversion' of git://github.com/mudrd8mz/moodle

10 years agoMerge branch 'master_MDL-28017' of git://github.com/danmarsden/moodle
Eloy Lafuente (stronk7) [Tue, 12 Jul 2011 14:28:36 +0000 (16:28 +0200)]
Merge branch 'master_MDL-28017' of git://github.com/danmarsden/moodle

Conflicts:
mod/scorm/version.php

10 years agoMDL-28210 messaging: all includes but config.php must use $CFG-based abosolute paths
Eloy Lafuente (stronk7) [Tue, 12 Jul 2011 10:17:34 +0000 (12:17 +0200)]
MDL-28210 messaging: all includes but config.php must use $CFG-based abosolute paths

10 years agoMerge branch 'MDL-28210_messaging_constants2' of git://github.com/andyjdavis/moodle
Eloy Lafuente (stronk7) [Tue, 12 Jul 2011 10:16:16 +0000 (12:16 +0200)]
Merge branch 'MDL-28210_messaging_constants2' of git://github.com/andyjdavis/moodle

10 years agoMDL-28210 messaging: Fixed requires problems in /message/discussion.php
Andrew Davis (andyjdavis) [Tue, 12 Jul 2011 02:46:59 +0000 (10:46 +0800)]
MDL-28210 messaging: Fixed requires problems in /message/discussion.php

10 years agoAutomatically generated installer lang files
AMOS bot [Tue, 12 Jul 2011 00:55:19 +0000 (00:55 +0000)]
Automatically generated installer lang files

10 years agoMDL-28017 - SCORM unset old config var
Dan Marsden [Mon, 11 Jul 2011 21:46:23 +0000 (09:46 +1200)]
MDL-28017 - SCORM unset old config var

10 years agoMDL-28221 Legacy resource URL pointing to the course itself are migrated as File...
David Mudrak [Mon, 11 Jul 2011 20:37:34 +0000 (22:37 +0200)]
MDL-28221 Legacy resource URL pointing to the course itself are migrated as File module

This patch replays the logic of resource_20_migrate() function. If a
file is referred via URL to the course files of the course being
backed up, then such a resource is converted to the File module
(mod/resource) rather than URL module.

10 years agoMDL-28221 resource: improved file not found handling
David Mudrak [Mon, 11 Jul 2011 10:12:38 +0000 (12:12 +0200)]
MDL-28221 resource: improved file not found handling

When the referenced file is not found, do not rely on the record in
resource_old as the resource can be actually restored from a 1.9 backup.

10 years agoMDL-28221 resource: fixed a typo in variable names
David Mudrak [Mon, 11 Jul 2011 10:04:18 +0000 (12:04 +0200)]
MDL-28221 resource: fixed a typo in variable names

10 years agoMerge branch 'w27_MDL-28270_m22_cohortfilter' of git://github.com/skodak/moodle
Eloy Lafuente (stronk7) [Mon, 11 Jul 2011 18:22:42 +0000 (20:22 +0200)]
Merge branch 'w27_MDL-28270_m22_cohortfilter' of git://github.com/skodak/moodle

10 years agoMerge branch 'master_MDL-26942' of git://github.com/danmarsden/moodle
Eloy Lafuente (stronk7) [Mon, 11 Jul 2011 17:47:14 +0000 (19:47 +0200)]
Merge branch 'master_MDL-26942' of git://github.com/danmarsden/moodle

10 years agoMerge branch 'MDL-27755' of git://github.com/rwijaya/moodle
Eloy Lafuente (stronk7) [Mon, 11 Jul 2011 17:41:00 +0000 (19:41 +0200)]
Merge branch 'MDL-27755' of git://github.com/rwijaya/moodle

10 years agoMerge branch 'MDL-27741' of git://github.com/rwijaya/moodle
Eloy Lafuente (stronk7) [Mon, 11 Jul 2011 17:35:41 +0000 (19:35 +0200)]
Merge branch 'MDL-27741' of git://github.com/rwijaya/moodle

10 years agoMerge branch 'w27_MDL-23344_m22_loginfocus' of git://github.com/skodak/moodle
Eloy Lafuente (stronk7) [Mon, 11 Jul 2011 15:01:58 +0000 (17:01 +0200)]
Merge branch 'w27_MDL-23344_m22_loginfocus' of git://github.com/skodak/moodle

10 years agoMerge branch 'MDL-23580' of git://git.luns.net.uk/moodle
Eloy Lafuente (stronk7) [Mon, 11 Jul 2011 14:46:35 +0000 (16:46 +0200)]
Merge branch 'MDL-23580' of git://git.luns.net.uk/moodle

10 years agoMerge branch 'MDL-26165' of git://github.com/timhunt/moodle
Eloy Lafuente (stronk7) [Mon, 11 Jul 2011 14:32:17 +0000 (16:32 +0200)]
Merge branch 'MDL-26165' of git://github.com/timhunt/moodle

10 years agoMerge branch 'MDL-27483' of git://github.com/timhunt/moodle
Eloy Lafuente (stronk7) [Mon, 11 Jul 2011 14:25:42 +0000 (16:25 +0200)]
Merge branch 'MDL-27483' of git://github.com/timhunt/moodle

10 years agoMerge branch 'MDL-27931' of git://github.com/rwijaya/moodle
Eloy Lafuente (stronk7) [Mon, 11 Jul 2011 13:56:22 +0000 (15:56 +0200)]
Merge branch 'MDL-27931' of git://github.com/rwijaya/moodle

10 years agoMDL-28109 scorm - new settings => version bump
Eloy Lafuente (stronk7) [Mon, 11 Jul 2011 13:54:11 +0000 (15:54 +0200)]
MDL-28109 scorm - new settings => version bump

10 years agoMerge branch 'master_MDL-28109' of git://github.com/danmarsden/moodle
Eloy Lafuente (stronk7) [Mon, 11 Jul 2011 13:42:21 +0000 (15:42 +0200)]
Merge branch 'master_MDL-28109' of git://github.com/danmarsden/moodle

10 years agoMerge branch 'w27_MDL-28158_m22_cookies' of git://github.com/skodak/moodle
Eloy Lafuente (stronk7) [Mon, 11 Jul 2011 13:33:03 +0000 (15:33 +0200)]
Merge branch 'w27_MDL-28158_m22_cookies' of git://github.com/skodak/moodle

10 years agoMerge branch 'MDL-28186' of git://git.luns.net.uk/moodle
Eloy Lafuente (stronk7) [Mon, 11 Jul 2011 13:20:56 +0000 (15:20 +0200)]
Merge branch 'MDL-28186' of git://git.luns.net.uk/moodle

10 years agoMerge branch 'w27_MDL-28279_m22_flash' of git://github.com/skodak/moodle
Eloy Lafuente (stronk7) [Mon, 11 Jul 2011 10:06:22 +0000 (12:06 +0200)]
Merge branch 'w27_MDL-28279_m22_flash' of git://github.com/skodak/moodle

10 years agoMerge branch 'w27_MDL-28280_m22_usesid' of git://github.com/skodak/moodle
Eloy Lafuente (stronk7) [Mon, 11 Jul 2011 10:01:34 +0000 (12:01 +0200)]
Merge branch 'w27_MDL-28280_m22_usesid' of git://github.com/skodak/moodle

10 years agoMDL-27741 forum subscribe link: Removed 'no' string in social course format to displa...
Rossiani Wijaya [Mon, 11 Jul 2011 09:07:55 +0000 (17:07 +0800)]
MDL-27741 forum subscribe link: Removed 'no' string in social course format to display a subscribe link if user is not enrolled

10 years agoMerge branch 'w27_MDL-25954_m22_cohortnav' of git://github.com/skodak/moodle
Sam Hemelryk [Mon, 11 Jul 2011 08:20:03 +0000 (16:20 +0800)]
Merge branch 'w27_MDL-25954_m22_cohortnav' of git://github.com/skodak/moodle

10 years agoMerge branch 'w27_MDL-26965_m22_cohortuploaduser' of git://github.com/skodak/moodle
Sam Hemelryk [Mon, 11 Jul 2011 08:11:50 +0000 (16:11 +0800)]
Merge branch 'w27_MDL-26965_m22_cohortuploaduser' of git://github.com/skodak/moodle