moodle.git
10 years agoMerge branch 'MDL-25760' of git://github.com/ptrkmkl/moodle
Petr Skoda [Mon, 28 Feb 2011 09:03:57 +0000 (10:03 +0100)]
Merge branch 'MDL-25760' of git://github.com/ptrkmkl/moodle

10 years agoMerge branch 'MDL-26451_alfresco_repo' of git://github.com/dongsheng/moodle
Petr Skoda [Mon, 28 Feb 2011 09:01:03 +0000 (10:01 +0100)]
Merge branch 'MDL-26451_alfresco_repo' of git://github.com/dongsheng/moodle

10 years agoMerge branch 'MDL-26228_grade_full_view' of git://github.com/andyjdavis/moodle
Petr Skoda [Mon, 28 Feb 2011 08:59:13 +0000 (09:59 +0100)]
Merge branch 'MDL-26228_grade_full_view' of git://github.com/andyjdavis/moodle

10 years agoMerge branch 'MDL-26442_qtype_match' of git://github.com/stronk7/moodle
Petr Skoda [Mon, 28 Feb 2011 08:56:36 +0000 (09:56 +0100)]
Merge branch 'MDL-26442_qtype_match' of git://github.com/stronk7/moodle

10 years agoMerge branch 'm20_MDL-26545_userpicfix' of git://github.com/danmarsden/moodle
Petr Skoda [Mon, 28 Feb 2011 08:48:38 +0000 (09:48 +0100)]
Merge branch 'm20_MDL-26545_userpicfix' of git://github.com/danmarsden/moodle

10 years agoMDL-13481 Strings fullname and shortname are now deprecated
David Mudrak [Tue, 22 Feb 2011 09:12:10 +0000 (10:12 +0100)]
MDL-13481 Strings fullname and shortname are now deprecated

This is a final cleanup commit of fullname and shortname issue. All
places where these strings were detected yet have been replaced with
proper fullnamecourse or fullnameuser or some other context specific
string.

AMOS BEGIN
 CPY [fullname,core],[outcomefullname,core_grades]
 CPY [shortname,core],[outcomeshortname,core_grades]
 CPY [name,core],[rolefullname,core_role]
 CPY [shortname,core],[roleshortname,core_role]
AMOS END

10 years agoSCORM MDL-26545 - fix user object passed to user_picture renderer
Dan Marsden [Sun, 27 Feb 2011 23:33:29 +0000 (12:33 +1300)]
SCORM MDL-26545 - fix user object passed to user_picture renderer

10 years agogradebook MDL-26228 moved scroll bar css from standard theme into base
Andrew [Sun, 27 Feb 2011 13:49:00 +0000 (21:49 +0800)]
gradebook MDL-26228 moved scroll bar css from standard theme into base

10 years agoREPOSITORY MDL-23951 alfresco repository plugin supports returning external links
Dongsheng Cai [Thu, 24 Feb 2011 02:56:30 +0000 (10:56 +0800)]
REPOSITORY MDL-23951 alfresco repository plugin supports returning external links

10 years agoMDL-26442 restore - missing new in qtype match exception
Eloy Lafuente (stronk7) [Mon, 21 Feb 2011 01:01:03 +0000 (02:01 +0100)]
MDL-26442 restore - missing new in qtype match exception

10 years agoweekly release
Eloy Lafuente (stronk7) [Wed, 23 Feb 2011 19:03:30 +0000 (20:03 +0100)]
weekly release

10 years agoMerge branch 'MDL-26546-workshop-restore' of git://github.com/mudrd8mz/moodle
Eloy Lafuente (stronk7) [Tue, 22 Feb 2011 22:00:46 +0000 (23:00 +0100)]
Merge branch 'MDL-26546-workshop-restore' of git://github.com/mudrd8mz/moodle

10 years agoMDL-26546 Workshop: fixed embedded images in Number of errors grading form
David Mudrak [Tue, 22 Feb 2011 21:19:16 +0000 (22:19 +0100)]
MDL-26546 Workshop: fixed embedded images in Number of errors grading form

Because of this typo, embedded images were not loaded when the
assessment form was re-edited. Thanks Helen Foster for spotting this.

10 years agoMerge branch 'MDL-25816_jabber_preference' of git://github.com/andyjdavis/moodle
Eloy Lafuente (stronk7) [Tue, 22 Feb 2011 15:51:49 +0000 (16:51 +0100)]
Merge branch 'MDL-25816_jabber_preference' of git://github.com/andyjdavis/moodle

10 years agoMerge branch 'MDL-26537-flickr-callback-url' of git://github.com/mudrd8mz/moodle
Eloy Lafuente (stronk7) [Tue, 22 Feb 2011 15:23:08 +0000 (16:23 +0100)]
Merge branch 'MDL-26537-flickr-callback-url' of git://github.com/mudrd8mz/moodle

10 years agoMerge branch 'MDL-26513_restrict_modules' of git://github.com/stronk7/moodle
Eloy Lafuente (stronk7) [Tue, 22 Feb 2011 15:12:43 +0000 (16:12 +0100)]
Merge branch 'MDL-26513_restrict_modules' of git://github.com/stronk7/moodle

10 years agoMerge branch 'MDL-26532' of git://github.com/nebgor/moodle
Eloy Lafuente (stronk7) [Tue, 22 Feb 2011 14:40:30 +0000 (15:40 +0100)]
Merge branch 'MDL-26532' of git://github.com/nebgor/moodle

10 years agoMerge branch 'AMOS-install-strings' of git://github.com/mudrd8mz/moodle
Eloy Lafuente (stronk7) [Tue, 22 Feb 2011 14:37:24 +0000 (15:37 +0100)]
Merge branch 'AMOS-install-strings' of git://github.com/mudrd8mz/moodle

10 years agoMerge branch 'MDL-21250-capitalized-strings' of git://github.com/mudrd8mz/moodle
Eloy Lafuente (stronk7) [Tue, 22 Feb 2011 14:35:50 +0000 (15:35 +0100)]
Merge branch 'MDL-21250-capitalized-strings' of git://github.com/mudrd8mz/moodle

10 years agoMDL-21250 Get rid of capitalized words in titles
Helen Foster [Tue, 22 Feb 2011 13:15:58 +0000 (14:15 +0100)]
MDL-21250 Get rid of capitalized words in titles

10 years agoMerge branch 'MDL-25122' of git://github.com/timhunt/moodle
Eloy Lafuente (stronk7) [Tue, 22 Feb 2011 11:41:28 +0000 (12:41 +0100)]
Merge branch 'MDL-25122' of git://github.com/timhunt/moodle

10 years agoMerge branch 'MDL-26546-workshop-restore' of git://github.com/mudrd8mz/moodle
Eloy Lafuente (stronk7) [Tue, 22 Feb 2011 11:24:48 +0000 (12:24 +0100)]
Merge branch 'MDL-26546-workshop-restore' of git://github.com/mudrd8mz/moodle

10 years agoMerge branch 'MDL-26416' of git://github.com/timhunt/moodle
Eloy Lafuente (stronk7) [Tue, 22 Feb 2011 11:18:52 +0000 (12:18 +0100)]
Merge branch 'MDL-26416' of git://github.com/timhunt/moodle

10 years agoMerge branch 'fix-symbian' of git://github.com/darenc/moodle
Eloy Lafuente (stronk7) [Tue, 22 Feb 2011 10:45:57 +0000 (11:45 +0100)]
Merge branch 'fix-symbian' of git://github.com/darenc/moodle

10 years agoMerge branch 'MDL-26524' of git://github.com/grabs/moodle
Eloy Lafuente (stronk7) [Tue, 22 Feb 2011 10:35:29 +0000 (11:35 +0100)]
Merge branch 'MDL-26524' of git://github.com/grabs/moodle

10 years agoMerge branch 'MDL-26060' of git://github.com/grabs/moodle
Eloy Lafuente (stronk7) [Tue, 22 Feb 2011 10:30:33 +0000 (11:30 +0100)]
Merge branch 'MDL-26060' of git://github.com/grabs/moodle

10 years agoMerge branch 'MDL-26435_rem_commented_out_code' of git://github.com/andyjdavis/moodle
Eloy Lafuente (stronk7) [Tue, 22 Feb 2011 10:26:56 +0000 (11:26 +0100)]
Merge branch 'MDL-26435_rem_commented_out_code' of git://github.com/andyjdavis/moodle

10 years agoMerge branch 'lesson-rendering' of git://github.com/mudrd8mz/moodle
Eloy Lafuente (stronk7) [Tue, 22 Feb 2011 10:25:03 +0000 (11:25 +0100)]
Merge branch 'lesson-rendering' of git://github.com/mudrd8mz/moodle

10 years agoMerge branch 'wip-MDL-26507' of git://github.com/sammarshallou/moodle
Eloy Lafuente (stronk7) [Tue, 22 Feb 2011 10:17:16 +0000 (11:17 +0100)]
Merge branch 'wip-MDL-26507' of git://github.com/sammarshallou/moodle

10 years agoMerge branch 'MDL-26461_change_rating_scale' of git://github.com/andyjdavis/moodle
Eloy Lafuente (stronk7) [Tue, 22 Feb 2011 10:06:23 +0000 (11:06 +0100)]
Merge branch 'MDL-26461_change_rating_scale' of git://github.com/andyjdavis/moodle

10 years agoMerge branch 'MDL-26440_uid' of git://github.com/andyjdavis/moodle
Eloy Lafuente (stronk7) [Tue, 22 Feb 2011 09:27:38 +0000 (10:27 +0100)]
Merge branch 'MDL-26440_uid' of git://github.com/andyjdavis/moodle

10 years agomessage MDL-25816 added safety checks in form processing
Andrew Davis (andyjdavis) [Tue, 22 Feb 2011 08:05:01 +0000 (16:05 +0800)]
message MDL-25816 added safety checks in form processing

10 years agoMDL-26546 Workshop: fixed incorrect mapping name in the restore of assessment forms
David Mudrak [Mon, 21 Feb 2011 23:54:13 +0000 (00:54 +0100)]
MDL-26546 Workshop: fixed incorrect mapping name in the restore of assessment forms

There was a regression of 8fa86f and ac0f8f where I changed the mapping
names but did not use the new names in add_related_files() call.

All credit goes to Eloy Lafuente for spotting the problem and giving me
a hint on how to fix it.

10 years agoAutomatic installer lang files (20110222)
AMOS bot [Mon, 21 Feb 2011 23:27:05 +0000 (00:27 +0100)]
Automatic installer lang files (20110222)

10 years agoMDL-26537 Portfolio: Flickr setup instruction contains correct callback URL
David Mudrak [Mon, 21 Feb 2011 15:00:12 +0000 (16:00 +0100)]
MDL-26537 Portfolio: Flickr setup instruction contains correct callback URL

There was a bug due to the code copied from portfolio_boxnet plugin.

10 years agoMDL-26513 restore - observe target site restrictmodulesfor setting
Eloy Lafuente (stronk7) [Sat, 19 Feb 2011 21:27:37 +0000 (22:27 +0100)]
MDL-26513 restore - observe target site restrictmodulesfor setting

10 years agoMDL-26507: improper use of assignment operater causes grade checks to fail
Charles Fulton [Sun, 20 Feb 2011 21:55:58 +0000 (13:55 -0800)]
MDL-26507: improper use of assignment operater causes grade checks to fail

10 years agoMoodle 2.0.2 release v2.0.2
Martin Dougiamas [Mon, 21 Feb 2011 12:05:57 +0000 (13:05 +0100)]
Moodle 2.0.2 release

10 years agoassignment MDL-26532 fixed regression in assignment_cron() while processing messaging.
Aparup Banerjee [Mon, 21 Feb 2011 07:43:30 +0000 (15:43 +0800)]
assignment MDL-26532 fixed regression in assignment_cron() while processing messaging.

10 years agorating MDL-26461 fixed an off by 1 bug that made the safeguard against too high ratin...
Andrew Davis (andyjdavis) [Mon, 21 Feb 2011 02:48:38 +0000 (10:48 +0800)]
rating MDL-26461 fixed an off by 1 bug that made the safeguard against too high ratings not work

10 years agoMDL-26524 - Group Filtering Errors
Andreas Grabs [Sun, 20 Feb 2011 17:18:44 +0000 (18:18 +0100)]
MDL-26524 - Group Filtering Errors

10 years agoMDL-26060 - Sorting by date on user list for responses list throws an error
Andreas Grabs [Sun, 20 Feb 2011 16:45:10 +0000 (17:45 +0100)]
MDL-26060 - Sorting by date on user list for responses list throws an error

10 years agoemergency release
Petr Skoda [Fri, 18 Feb 2011 19:01:50 +0000 (20:01 +0100)]
emergency release

10 years agoMDL-25122 Quiz review page does not check and enforce separate groups mode.
Tim Hunt [Fri, 18 Feb 2011 17:37:23 +0000 (17:37 +0000)]
MDL-25122 Quiz review page does not check and enforce separate groups mode.

10 years agoMerge branch 'em_MDL-25944_20_forummail' of git://github.com/skodak/moodle
Eloy Lafuente (stronk7) [Fri, 18 Feb 2011 17:42:45 +0000 (18:42 +0100)]
Merge branch 'em_MDL-25944_20_forummail' of git://github.com/skodak/moodle

10 years agoMerge branch 'master' of git.moodle.org:/git/integration
Eloy Lafuente (stronk7) [Fri, 18 Feb 2011 17:25:18 +0000 (18:25 +0100)]
Merge branch 'master' of git.moodle.org:/git/integration

10 years agoMerge branch 'em_MDL-26476_20_grp' of git://github.com/skodak/moodle
Eloy Lafuente (stronk7) [Fri, 18 Feb 2011 17:25:04 +0000 (18:25 +0100)]
Merge branch 'em_MDL-26476_20_grp' of git://github.com/skodak/moodle

10 years agoMerge branch 'PULL-314' of git://github.com/mudrd8mz/moodle
Petr Skoda [Fri, 18 Feb 2011 17:20:44 +0000 (18:20 +0100)]
Merge branch 'PULL-314' of git://github.com/mudrd8mz/moodle

10 years agoMDL-26010 Reformatting SQL of the previous Andrew's fix
David Mudrak [Fri, 18 Feb 2011 16:33:37 +0000 (17:33 +0100)]
MDL-26010 Reformatting SQL of the previous Andrew's fix

I have reformatted the SQL according to the style used in Moodle code to
improve readability of the query. Added sql_compare_text() to the right
side of the comparison, even though the current callers provide integers
here (just in case).

10 years agoMDL-26010 External blog synchronization removes non-relevant post records
Andrew Davis [Wed, 2 Feb 2011 07:02:48 +0000 (15:02 +0800)]
MDL-26010 External blog synchronization removes non-relevant post records

10 years agoMDL-26416 avoid subtracting two unsigned ints, which breaks MySQL since 5.5.5.
Tim Hunt [Fri, 18 Feb 2011 14:06:11 +0000 (14:06 +0000)]
MDL-26416 avoid subtracting two unsigned ints, which breaks MySQL since 5.5.5.

10 years agoMDL-26416 quiz overview report, clean up the code before making the real bug fix.
Tim Hunt [Fri, 18 Feb 2011 12:31:38 +0000 (12:31 +0000)]
MDL-26416 quiz overview report, clean up the code before making the real bug fix.

Cleaning up the code like this will make the real bug-fix easier to understand.

10 years agoChange 'Simbian' to 'Symbian'
Daren Chandisingh [Fri, 18 Feb 2011 12:28:26 +0000 (12:28 +0000)]
Change 'Simbian' to 'Symbian'

10 years agoMDL-25899 Lesson: fixed page content rendering
David Mudrak [Fri, 18 Feb 2011 10:43:24 +0000 (11:43 +0100)]
MDL-25899 Lesson: fixed page content rendering

Form element 'header' used to be used for rendering the page contents.
This led to layout problems in non-gecko browsers. This patch fixes the
issue by using raw 'html' element to render the page contents.

10 years agoMDL-25944 fix broken images in forum emails and fix invalid $group variable name
Petr Skoda [Fri, 18 Feb 2011 10:00:43 +0000 (11:00 +0100)]
MDL-25944 fix broken images in forum emails and fix invalid $group variable name

10 years agoMDL-26113 Lesson: temporary fix of page content alignment
Joseph Rezeau [Fri, 18 Feb 2011 09:43:25 +0000 (10:43 +0100)]
MDL-26113 Lesson: temporary fix of page content alignment

That rendering method should not use cell style attribute at all.
Instead, the alignment should be controlled by CSS. However, this will
require more massive changes in the Lesson code to be done by the module
maintainer. As a temporary fix, left alignment is set as it usually
matches the layout that students see.

10 years agogeneral MDL-26440 removed references to uid in SQL queries as its a reserved word...
andyjdavis [Wed, 16 Feb 2011 04:11:41 +0000 (12:11 +0800)]
general MDL-26440 removed references to uid in SQL queries as its a reserved word in Oracle

10 years agoMDL-26476 fix incorrect fetching of user groups in modinfo
Petr Skoda [Thu, 17 Feb 2011 17:19:41 +0000 (18:19 +0100)]
MDL-26476 fix incorrect fetching of user groups in modinfo

10 years agoMDL-26361 scorm - fix upgrade on change to not null
Eloy Lafuente (stronk7) [Thu, 17 Feb 2011 16:25:44 +0000 (17:25 +0100)]
MDL-26361 scorm - fix upgrade on change to not null

Every time one column is changed from null to not null
we must ensure that there aren't nulls at all or the
DDL statement will fail, as was reported here. The
simplest way, just apply for the default when the column is null.

10 years agomessage MDL-26435 removed commented out code
andyjdavis [Wed, 16 Feb 2011 06:38:33 +0000 (14:38 +0800)]
message MDL-26435 removed commented out code

10 years agoweekly release
Petr Skoda [Thu, 17 Feb 2011 00:21:29 +0000 (01:21 +0100)]
weekly release

10 years agoMerge branch 'w07_MDL-26452_20_resmess' of git://github.com/skodak/moodle
Eloy Lafuente (stronk7) [Wed, 16 Feb 2011 20:51:12 +0000 (21:51 +0100)]
Merge branch 'w07_MDL-26452_20_resmess' of git://github.com/skodak/moodle

10 years agoMDL-26452 fix resource mod regression breaking upgrade on Windows
Petr Skoda [Wed, 16 Feb 2011 19:49:59 +0000 (20:49 +0100)]
MDL-26452 fix resource mod regression breaking upgrade on Windows

10 years agoMerge branch 'MDL-26405_take_two' of git://github.com/stronk7/moodle
Petr Skoda [Wed, 16 Feb 2011 19:24:54 +0000 (20:24 +0100)]
Merge branch 'MDL-26405_take_two' of git://github.com/stronk7/moodle

10 years agoMDL-26405 restore - dispatch able to skip branches
Eloy Lafuente (stronk7) [Wed, 16 Feb 2011 18:13:56 +0000 (19:13 +0100)]
MDL-26405 restore - dispatch able to skip branches

after this change any restore_structure_step processor
method is able to instruct the dispatcher about to skip
any path below it. Until now, we were doing the checks on
each child processor method, but that was inneficient and
prone to errors (easy to miss the check in a child so some
orphaned piezes of restore may be causing mess here and there).
Once implemented, it's simlpy a matter of the parent deciding if
all its children must be processed or no. Easier for developers
and also small speed improvement because avoids unnecesary
dispatching/processing to happen.

Surely only will be used in parts of core, like in question_categories,
saving 50-60 sub processors (sub-paths) to be dispatched.

10 years agoMerge branch 'MDL-26405_qtype_exception_wip' of git://github.com/stronk7/moodle
Petr Skoda [Wed, 16 Feb 2011 08:59:14 +0000 (09:59 +0100)]
Merge branch 'MDL-26405_qtype_exception_wip' of git://github.com/stronk7/moodle

10 years agoglossary MDL-22970 uid is reserved in ORACLE! changed to userid
Aparup Banerjee [Wed, 16 Feb 2011 03:46:20 +0000 (04:46 +0100)]
glossary MDL-22970 uid is reserved in ORACLE! changed to userid

10 years agoMDL-26405 restore - incorrectly thrown exception
Eloy Lafuente (stronk7) [Tue, 15 Feb 2011 22:28:00 +0000 (23:28 +0100)]
MDL-26405 restore - incorrectly thrown exception

10 years agoMerge branch 'w07_MDL-26381_20_changepw' of git://github.com/skodak/moodle
Eloy Lafuente (stronk7) [Tue, 15 Feb 2011 21:03:00 +0000 (22:03 +0100)]
Merge branch 'w07_MDL-26381_20_changepw' of git://github.com/skodak/moodle

10 years agoMDL-26381 prevent security warning when changing password and loginhttps is enabled
Petr Skoda [Sun, 13 Feb 2011 09:39:26 +0000 (10:39 +0100)]
MDL-26381 prevent security warning when changing password and loginhttps is enabled

10 years agoMerge branch 'MDL-25616_recent_messages' of git://github.com/andyjdavis/moodle
Eloy Lafuente (stronk7) [Tue, 15 Feb 2011 18:26:21 +0000 (19:26 +0100)]
Merge branch 'MDL-25616_recent_messages' of git://github.com/andyjdavis/moodle

Conflicts fixed:
message/index.php
message/lib.php

10 years agoMerge branch 'w07_MDL-26211_20_https' of git://github.com/skodak/moodle
Eloy Lafuente (stronk7) [Tue, 15 Feb 2011 15:45:22 +0000 (16:45 +0100)]
Merge branch 'w07_MDL-26211_20_https' of git://github.com/skodak/moodle

10 years agoMDL-26211 improve detection of https from _SERVER
Petr Skoda [Tue, 15 Feb 2011 14:33:29 +0000 (15:33 +0100)]
MDL-26211 improve detection of https from _SERVER

10 years agoMDL-26119 fixing regression caused by previous merge in PULL-294
Petr Skoda [Tue, 15 Feb 2011 14:06:24 +0000 (15:06 +0100)]
MDL-26119 fixing regression caused by previous merge in PULL-294

We can not use empty() on function directly, the PHP docs were incorrect.

10 years agoMerge branch 'w07_MDL-25778_20_defaultcity' of git://github.com/skodak/moodle
Eloy Lafuente (stronk7) [Tue, 15 Feb 2011 11:40:43 +0000 (12:40 +0100)]
Merge branch 'w07_MDL-25778_20_defaultcity' of git://github.com/skodak/moodle

10 years agoMerge branch 'w07_MDL-26351_20_instquotes' of git://github.com/skodak/moodle
Eloy Lafuente (stronk7) [Tue, 15 Feb 2011 11:32:39 +0000 (12:32 +0100)]
Merge branch 'w07_MDL-26351_20_instquotes' of git://github.com/skodak/moodle

10 years agoMDL-26414 gloosary - fix wrong init introduced by MDL-26371
Eloy Lafuente (stronk7) [Tue, 15 Feb 2011 09:53:23 +0000 (10:53 +0100)]
MDL-26414 gloosary - fix wrong init introduced by MDL-26371

10 years agoMerge branch 'MDL-26119_message_logging' of git://github.com/andyjdavis/moodle
Petr Skoda [Tue, 15 Feb 2011 09:39:54 +0000 (10:39 +0100)]
Merge branch 'MDL-26119_message_logging' of git://github.com/andyjdavis/moodle

10 years agoMDL-26179 implement the new 5 registration use cases
jeromemoodle [Thu, 10 Feb 2011 03:44:32 +0000 (11:44 +0800)]
MDL-26179 implement the new 5 registration use cases

10 years agoMDL-26351 fix property and docs typo
Petr Skoda [Tue, 15 Feb 2011 08:44:24 +0000 (09:44 +0100)]
MDL-26351 fix property and docs typo

Credit goes to David Mudrak.

10 years agoglossary MDL-22970 changed fieldname so that MSSQL does not complain about same field...
Aparup Banerjee [Tue, 15 Feb 2011 08:19:00 +0000 (16:19 +0800)]
glossary MDL-22970 changed fieldname so that MSSQL does not complain about same fieldnames

something should be done about this in the driver

10 years agoMDL-25778 fix default country and city on user upload form and revert change in auth...
Petr Skoda [Tue, 15 Feb 2011 07:59:53 +0000 (08:59 +0100)]
MDL-25778 fix default country and city on user upload form and revert change in auth plugins

Auth plugins should have separate defaults from site defaults).

10 years agomessage MDL-26119 fixed up the logged URL
andyjdavis [Thu, 10 Feb 2011 05:25:38 +0000 (13:25 +0800)]
message MDL-26119 fixed up the logged URL

10 years agomessage MDL-25616 adding recent conversations and recent notifications screens
andyjdavis [Wed, 12 Jan 2011 09:15:43 +0000 (17:15 +0800)]
message MDL-25616 adding recent conversations and recent notifications screens

10 years agoMerge branch 'w07_MDL-24125_20_admintreecache' of git://github.com/skodak/moodle
Eloy Lafuente (stronk7) [Tue, 15 Feb 2011 00:38:12 +0000 (01:38 +0100)]
Merge branch 'w07_MDL-24125_20_admintreecache' of git://github.com/skodak/moodle

10 years agoMerge branch 'MDL-26236' of git://github.com/timhunt/moodle
Eloy Lafuente (stronk7) [Tue, 15 Feb 2011 00:16:33 +0000 (01:16 +0100)]
Merge branch 'MDL-26236' of git://github.com/timhunt/moodle

10 years agoMerge branch 'MDL-26365' of git://github.com/timhunt/moodle
Eloy Lafuente (stronk7) [Tue, 15 Feb 2011 00:03:23 +0000 (01:03 +0100)]
Merge branch 'MDL-26365' of git://github.com/timhunt/moodle

10 years agoMerge branch 'MDL-26369' of git://github.com/timhunt/moodle
Eloy Lafuente (stronk7) [Mon, 14 Feb 2011 23:58:01 +0000 (00:58 +0100)]
Merge branch 'MDL-26369' of git://github.com/timhunt/moodle

10 years agoMDL-22970 glossary - perf. improvements in recent activity
Aparup Banerjee [Mon, 14 Feb 2011 23:33:13 +0000 (00:33 +0100)]
MDL-22970 glossary - perf. improvements in recent activity

10 years agoMerge branch 'w07_MDL-25778_20_defaultcity' of git://github.com/skodak/moodle
Eloy Lafuente (stronk7) [Mon, 14 Feb 2011 22:24:52 +0000 (23:24 +0100)]
Merge branch 'w07_MDL-25778_20_defaultcity' of git://github.com/skodak/moodle

10 years agoMerge branch 'MDL-26337' of git://github.com/timhunt/moodle
Petr Skoda [Mon, 14 Feb 2011 21:15:30 +0000 (22:15 +0100)]
Merge branch 'MDL-26337' of git://github.com/timhunt/moodle

10 years agoMerge branch 'MDL-26109' of git://github.com/nebgor/moodle
Petr Skoda [Mon, 14 Feb 2011 21:10:37 +0000 (22:10 +0100)]
Merge branch 'MDL-26109' of git://github.com/nebgor/moodle

10 years agoMerge branch 'MDL-26312-workshop-upgrade' of git://github.com/mudrd8mz/moodle
Petr Skoda [Mon, 14 Feb 2011 20:45:57 +0000 (21:45 +0100)]
Merge branch 'MDL-26312-workshop-upgrade' of git://github.com/mudrd8mz/moodle

10 years agoMerge branch 'MDL-25863_automated_backups_wip' of git://github.com/stronk7/moodle
Petr Skoda [Mon, 14 Feb 2011 20:42:50 +0000 (21:42 +0100)]
Merge branch 'MDL-25863_automated_backups_wip' of git://github.com/stronk7/moodle

10 years agoMDL-26312 Workshop: unset temporary arrays in upgrade code
David Mudrak [Mon, 14 Feb 2011 20:38:50 +0000 (21:38 +0100)]
MDL-26312 Workshop: unset temporary arrays in upgrade code

Spotted by Petr Skoda during the code review.

10 years agoMDL-25863 backup - fix removal of old automated backup, both in filearea and filesystem
Eloy Lafuente (stronk7) [Sun, 13 Feb 2011 17:35:41 +0000 (18:35 +0100)]
MDL-25863 backup - fix removal of old automated backup, both in filearea and filesystem

10 years agoMerge branch 'm20_MDL-26212_resizefix' of git://github.com/danmarsden/moodle
Petr Skoda [Mon, 14 Feb 2011 20:37:37 +0000 (21:37 +0100)]
Merge branch 'm20_MDL-26212_resizefix' of git://github.com/danmarsden/moodle

10 years agoMDL-25863 backup - take rid of dupe code for filename calculations
Eloy Lafuente (stronk7) [Sun, 13 Feb 2011 16:38:03 +0000 (17:38 +0100)]
MDL-25863 backup - take rid of dupe code for filename calculations

10 years agoMerge branch 'MDL-26371_distinct_text' of git://github.com/stronk7/moodle
Petr Skoda [Mon, 14 Feb 2011 20:19:35 +0000 (21:19 +0100)]
Merge branch 'MDL-26371_distinct_text' of git://github.com/stronk7/moodle

10 years agoMerge branch 'MDL-22146_backup_course_format_wip' of git://github.com/stronk7/moodle
Petr Skoda [Mon, 14 Feb 2011 20:08:19 +0000 (21:08 +0100)]
Merge branch 'MDL-22146_backup_course_format_wip' of git://github.com/stronk7/moodle