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
Petr Skoda [Fri, 18 Feb 2011 19:01:50 +0000 (20:01 +0100)]
emergency release
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
Eloy Lafuente (stronk7) [Fri, 18 Feb 2011 17:25:18 +0000 (18:25 +0100)]
Merge branch 'master' of git.moodle.org:/git/integration
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
Petr Skoda [Fri, 18 Feb 2011 17:20:44 +0000 (18:20 +0100)]
Merge branch 'PULL-314' of git://github.com/mudrd8mz/moodle
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).
Andrew Davis [Wed, 2 Feb 2011 07:02:48 +0000 (15:02 +0800)]
MDL-26010 External blog synchronization removes non-relevant post records
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
Petr Skoda [Thu, 17 Feb 2011 17:19:41 +0000 (18:19 +0100)]
MDL-26476 fix incorrect fetching of user groups in modinfo
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.
Petr Skoda [Thu, 17 Feb 2011 00:21:29 +0000 (01:21 +0100)]
weekly release
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
Petr Skoda [Wed, 16 Feb 2011 19:49:59 +0000 (20:49 +0100)]
MDL-26452 fix resource mod regression breaking upgrade on Windows
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
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.
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
Aparup Banerjee [Wed, 16 Feb 2011 03:46:20 +0000 (04:46 +0100)]
glossary MDL-22970 uid is reserved in ORACLE! changed to userid
Eloy Lafuente (stronk7) [Tue, 15 Feb 2011 22:28:00 +0000 (23:28 +0100)]
MDL-26405 restore - incorrectly thrown exception
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
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
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
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
Petr Skoda [Tue, 15 Feb 2011 14:33:29 +0000 (15:33 +0100)]
MDL-26211 improve detection of https from _SERVER
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.
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
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
Eloy Lafuente (stronk7) [Tue, 15 Feb 2011 09:53:23 +0000 (10:53 +0100)]
MDL-26414 gloosary - fix wrong init introduced by MDL-26371
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
jeromemoodle [Thu, 10 Feb 2011 03:44:32 +0000 (11:44 +0800)]
MDL-26179 implement the new 5 registration use cases
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.
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
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).
andyjdavis [Thu, 10 Feb 2011 05:25:38 +0000 (13:25 +0800)]
message MDL-26119 fixed up the logged URL
andyjdavis [Wed, 12 Jan 2011 09:15:43 +0000 (17:15 +0800)]
message MDL-25616 adding recent conversations and recent notifications screens
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
Eloy Lafuente (stronk7) [Tue, 15 Feb 2011 00:16:33 +0000 (01:16 +0100)]
Merge branch 'MDL-26236' 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
Eloy Lafuente (stronk7) [Mon, 14 Feb 2011 23:58:01 +0000 (00:58 +0100)]
Merge branch 'MDL-26369' of git://github.com/timhunt/moodle
Aparup Banerjee [Mon, 14 Feb 2011 23:33:13 +0000 (00:33 +0100)]
MDL-22970 glossary - perf. improvements in recent activity
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
Petr Skoda [Mon, 14 Feb 2011 21:15:30 +0000 (22:15 +0100)]
Merge branch 'MDL-26337' of git://github.com/timhunt/moodle
Petr Skoda [Mon, 14 Feb 2011 21:10:37 +0000 (22:10 +0100)]
Merge branch 'MDL-26109' of git://github.com/nebgor/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
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
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.
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
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
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
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
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
Petr Skoda [Mon, 14 Feb 2011 20:02:49 +0000 (21:02 +0100)]
Merge branch 'MDL-26229_restore_attempts_wip' of git://github.com/stronk7/moodle
Petr Skoda [Mon, 14 Feb 2011 19:57:13 +0000 (20:57 +0100)]
Merge branch 'MDL-24898_strip_and_trunc_subjects_wip' of git://github.com/stronk7/moodle
Petr Skoda [Mon, 14 Feb 2011 19:39:31 +0000 (20:39 +0100)]
Merge branch 'MDL-25553_lesson_jumpto_wip' of git://github.com/stronk7/moodle
Petr Skoda [Mon, 14 Feb 2011 19:37:28 +0000 (20:37 +0100)]
Merge branch 'MDL-25612_rss_block' of git://github.com/stronk7/moodle
Petr Skoda [Mon, 14 Feb 2011 19:34:58 +0000 (20:34 +0100)]
Merge branch 'MDL-26399_oracle_restore_wip' of git://github.com/stronk7/moodle
Eloy Lafuente (stronk7) [Mon, 14 Feb 2011 19:15:37 +0000 (20:15 +0100)]
Merge branch 'w07_MDL-25626_20_completionerror' of git://github.com/skodak/moodle
Petr Skoda [Mon, 14 Feb 2011 19:10:50 +0000 (20:10 +0100)]
MDL-25778 add defaultcity option
This is based on patch by Jonathan Harker.
Eloy Lafuente (stronk7) [Mon, 14 Feb 2011 18:57:38 +0000 (19:57 +0100)]
Merge branch 'MDL-26338' of git://github.com/timhunt/moodle
Eloy Lafuente (stronk7) [Mon, 14 Feb 2011 18:42:57 +0000 (19:42 +0100)]
MDL-26399 restore - fix oracle/mssql problems
Petr Skoda [Mon, 14 Feb 2011 18:41:05 +0000 (19:41 +0100)]
MDL-25626 fix previous incorrect fix incorrect cm id in completion report
Eloy Lafuente (stronk7) [Mon, 14 Feb 2011 17:29:46 +0000 (18:29 +0100)]
Merge branch 'MDL-26356' of git://github.com/ppichet/moodle
Eloy Lafuente (stronk7) [Mon, 14 Feb 2011 17:26:33 +0000 (18:26 +0100)]
Merge branch 'MDL-26332' of git://github.com/timhunt/moodle
Eloy Lafuente (stronk7) [Mon, 14 Feb 2011 17:23:56 +0000 (18:23 +0100)]
Merge branch 'mdl-26299' of git://github.com/mackensen/moodle
Eloy Lafuente (stronk7) [Mon, 14 Feb 2011 16:54:42 +0000 (17:54 +0100)]
Partially merge w07_MDL-25575_20_contexttrouble. See PULL-299
Petr Skoda [Mon, 14 Feb 2011 15:39:08 +0000 (16:39 +0100)]
MDL_24125 admin tree fast category lookup
Eloy Lafuente (stronk7) [Mon, 14 Feb 2011 16:38:22 +0000 (17:38 +0100)]
Merge branch 'w07_MDL-26142_20_immediatelly' of git://github.com/skodak/moodle
Eloy Lafuente (stronk7) [Mon, 14 Feb 2011 16:10:29 +0000 (17:10 +0100)]
Merge branch 'w07_MDL-23939_20_completeuser' of git://github.com/skodak/moodle
Eloy Lafuente (stronk7) [Mon, 14 Feb 2011 14:58:26 +0000 (15:58 +0100)]
Merge branch 'w07_MDL-26389_20_profile' of git://github.com/skodak/moodle
Petr Skoda [Mon, 14 Feb 2011 14:42:26 +0000 (15:42 +0100)]
MDL-26389 improve profile and search engine privacy
Eloy Lafuente (stronk7) [Mon, 14 Feb 2011 14:06:28 +0000 (15:06 +0100)]
Merge branch 'w07_MDL-26131_20_collapsible' of git://github.com/skodak/moodle
Eloy Lafuente (stronk7) [Mon, 14 Feb 2011 13:38:02 +0000 (14:38 +0100)]
Merge branch 'w07_MDL-26223_20_calblock' of git://github.com/skodak/moodle
Eloy Lafuente (stronk7) [Mon, 14 Feb 2011 13:23:05 +0000 (14:23 +0100)]
Merge branch 'w07_MDL-25974_20_switchhidden' of git://github.com/skodak/moodle
Eloy Lafuente (stronk7) [Mon, 14 Feb 2011 11:41:16 +0000 (12:41 +0100)]
Merge branch 'w07_MDL-25998_20_enrolrole' of git://github.com/skodak/moodle
Eloy Lafuente (stronk7) [Mon, 14 Feb 2011 11:35:18 +0000 (12:35 +0100)]
Merge branch 'w07_MDL-26314_20_initcall' of git://github.com/skodak/moodle
Eloy Lafuente (stronk7) [Mon, 14 Feb 2011 11:31:50 +0000 (12:31 +0100)]
Merge branch 'w07_MDL-26383_20_blogupg' of git://github.com/skodak/moodle
David Mudrak [Fri, 11 Feb 2011 14:41:35 +0000 (15:41 +0100)]
MDL-26312 Workshop: data integrity check to detect eventual course_modules corruption
Because of a bug in Workshop upgrade code, multiple workshop course_modules can
potentially point to a single workshop instance. The chance is pretty low as in most cases,
the upgrade failed. But under certain circumstances, workshop could be upgraded with
this data integrity issue. We want to detect it now and let the admin know.
Petr Skoda [Mon, 14 Feb 2011 08:52:28 +0000 (09:52 +0100)]
Merge branch 'AMOS-install-strings' of git://github.com/mudrd8mz/moodle
Petr Skoda [Mon, 14 Feb 2011 08:50:07 +0000 (09:50 +0100)]
MDL-25215 fix file.JPG.jpg extension problems
Petr Skoda [Mon, 14 Feb 2011 08:43:06 +0000 (09:43 +0100)]
Merge branch 'm20_MDL-25215_filepicker_saveas' of git://github.com/dongsheng/moodle
AMOS bot [Mon, 14 Feb 2011 08:36:04 +0000 (09:36 +0100)]
Automatic installer lang files (
20110214)
Petr Skoda [Mon, 14 Feb 2011 08:20:53 +0000 (09:20 +0100)]
Merge branch 'MDL-26353-database-import-help' of git://github.com/mudrd8mz/moodle
Petr Skoda [Mon, 14 Feb 2011 07:57:58 +0000 (08:57 +0100)]
Merge branch 'MDL-25991_actionnav' of github.com:skodak/moodle
Dan Marsden [Mon, 14 Feb 2011 01:48:09 +0000 (14:48 +1300)]
MDL-26212 - fix scorm player size on resize of browser window - bump scorm version as JS is changed. Kudos to Piers for patch
Eloy Lafuente (stronk7) [Mon, 14 Feb 2011 01:10:11 +0000 (02:10 +0100)]
Merge branch 'w07_MDL-26153_20_yuicombo' of git://github.com/skodak/moodle
Eloy Lafuente (stronk7) [Mon, 14 Feb 2011 01:08:06 +0000 (02:08 +0100)]
Merge branch 'w07_MDL-26294_20_byteserving' of git://github.com/skodak/moodle
Eloy Lafuente (stronk7) [Mon, 14 Feb 2011 01:00:19 +0000 (02:00 +0100)]
Merge branch 'w07_MDL-26307_20_dbport' of git://github.com/skodak/moodle
Eloy Lafuente (stronk7) [Mon, 14 Feb 2011 00:53:45 +0000 (01:53 +0100)]
Merge branch 'w07_MDL-25626_20_completionerror' of git://github.com/skodak/moodle
Eloy Lafuente (stronk7) [Mon, 14 Feb 2011 00:50:55 +0000 (01:50 +0100)]
Merge branch 'w07_MDL-26355_20_installsize' of git://github.com/skodak/moodle
Eloy Lafuente (stronk7) [Mon, 14 Feb 2011 00:48:03 +0000 (01:48 +0100)]
Merge branch 'MDL-26274_rating_delete' of git://github.com/andyjdavis/moodle
Eloy Lafuente (stronk7) [Mon, 14 Feb 2011 00:44:08 +0000 (01:44 +0100)]
Merge branch 'w07_MDL-26376_20_shib' of git://github.com/skodak/moodle
Eloy Lafuente (stronk7) [Mon, 14 Feb 2011 00:41:19 +0000 (01:41 +0100)]
Merge branch 'w07_MDL-26380_20_mediafilterperf' of git://github.com/skodak/moodle
Eloy Lafuente (stronk7) [Mon, 14 Feb 2011 00:25:44 +0000 (01:25 +0100)]
Merge branch 'w07_MDL-26351_20_instquotes' of git://github.com/skodak/moodle
Eloy Lafuente (stronk7) [Mon, 14 Feb 2011 00:09:07 +0000 (01:09 +0100)]
Merge branch 'w07_MDL-26030_20_mediafilter' of git://github.com/skodak/moodle
Eloy Lafuente (stronk7) [Sun, 13 Feb 2011 23:56:02 +0000 (00:56 +0100)]
Merge branch 'w07_MDL-26379_20_minify' of git://github.com/skodak/moodle
Eloy Lafuente (stronk7) [Sun, 13 Feb 2011 23:52:09 +0000 (00:52 +0100)]
Merge branch 'w07_MDL-26352_20_metacourse' of git://github.com/skodak/moodle
Eloy Lafuente (stronk7) [Sun, 13 Feb 2011 23:38:21 +0000 (00:38 +0100)]
Merge branch 'w07_MDL-26271_20_forumsearch' of git://github.com/skodak/moodle
Eloy Lafuente (stronk7) [Sun, 13 Feb 2011 23:19:08 +0000 (00:19 +0100)]
Merge branch 'w07_MDL-26322_20_wantsurl' of git://github.com/skodak/moodle
Eloy Lafuente (stronk7) [Sun, 13 Feb 2011 22:03:55 +0000 (23:03 +0100)]
MDL-24898 external blogs - strip html and truncate subject
Petr Skoda [Sun, 13 Feb 2011 17:59:53 +0000 (18:59 +0100)]
MDL-25575 fix broken block support in get_courseid_from_context()
