Petr Skoda
18ff4d427e
MDL-25944 fix broken images in forum emails and fix invalid $group variable name
2011-02-18 11:00:43 +01:00
Petr Skoda
99faefb29b
weekly release
2011-02-17 01:21:29 +01:00
Eloy Lafuente (stronk7)
2e629eb861
Merge branch 'w07_MDL-26452_20_resmess' of git://github.com/skodak/moodle
2011-02-16 21:51:12 +01:00
Petr Skoda
f3a7f485c4
MDL-26452 fix resource mod regression breaking upgrade on Windows
2011-02-16 21:41:04 +01:00
Petr Skoda
3bc644ce70
Merge branch 'MDL-26405_take_two' of git://github.com/stronk7/moodle
2011-02-16 20:24:54 +01:00
Eloy Lafuente (stronk7)
0149e6c713
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.
2011-02-16 19:13:56 +01:00
Petr Skoda
c9e12de4e3
Merge branch 'MDL-26405_qtype_exception_wip' of git://github.com/stronk7/moodle
2011-02-16 09:59:14 +01:00
Aparup Banerjee
37695a6ff6
glossary MDL-22970 uid is reserved in ORACLE! changed to userid
2011-02-16 04:46:20 +01:00
Eloy Lafuente (stronk7)
0ff7159edb
MDL-26405 restore - incorrectly thrown exception
2011-02-15 23:28:00 +01:00
Eloy Lafuente (stronk7)
534f22d141
Merge branch 'w07_MDL-26381_20_changepw' of git://github.com/skodak/moodle
2011-02-15 22:03:00 +01:00
Petr Skoda
7ea77a571f
MDL-26381 prevent security warning when changing password and loginhttps is enabled
2011-02-15 21:54:29 +01:00
Eloy Lafuente (stronk7)
c04c06dc8e
Merge branch 'MDL-25616_recent_messages' of git://github.com/andyjdavis/moodle
...
Conflicts fixed:
message/index.php
message/lib.php
2011-02-15 19:26:21 +01:00
Eloy Lafuente (stronk7)
07e21f6054
Merge branch 'w07_MDL-26211_20_https' of git://github.com/skodak/moodle
2011-02-15 16:45:22 +01:00
Petr Skoda
2a9c0d0578
MDL-26211 improve detection of https from _SERVER
2011-02-15 15:33:29 +01:00
Petr Skoda
d83bad412a
MDL-26119 fixing regression caused by previous merge in PULL-294
...
We can not use empty() on function directly, the PHP docs were incorrect.
2011-02-15 15:06:24 +01:00
Eloy Lafuente (stronk7)
da622b497b
Merge branch 'w07_MDL-25778_20_defaultcity' of git://github.com/skodak/moodle
2011-02-15 12:40:43 +01:00
Eloy Lafuente (stronk7)
9aaa767c80
Merge branch 'w07_MDL-26351_20_instquotes' of git://github.com/skodak/moodle
2011-02-15 12:32:39 +01:00
Eloy Lafuente (stronk7)
418b3b6e98
MDL-26414 gloosary - fix wrong init introduced by MDL-26371
2011-02-15 10:53:23 +01:00
Petr Skoda
64529cb6d2
Merge branch 'MDL-26119_message_logging' of git://github.com/andyjdavis/moodle
2011-02-15 10:39:54 +01:00
jeromemoodle
c73f196391
MDL-26179 implement the new 5 registration use cases
2011-02-15 10:24:32 +01:00
Petr Skoda
438e22cc50
MDL-26351 fix property and docs typo
...
Credit goes to David Mudrak.
2011-02-15 09:46:35 +01:00
Aparup Banerjee
fb473042ae
glossary MDL-22970 changed fieldname so that MSSQL does not complain about same fieldnames
...
something should be done about this in the driver
2011-02-15 09:33:25 +01:00
Petr Skoda
9449d0c5e8
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).
2011-02-15 09:13:33 +01:00
andyjdavis
3a00a167c6
message MDL-26119 fixed up the logged URL
2011-02-15 14:24:13 +08:00
andyjdavis
bcab42daf2
message MDL-25616 adding recent conversations and recent notifications screens
2011-02-15 11:17:38 +08:00
Eloy Lafuente (stronk7)
aabd2f0064
Merge branch 'w07_MDL-24125_20_admintreecache' of git://github.com/skodak/moodle
2011-02-15 01:38:12 +01:00
Eloy Lafuente (stronk7)
b180a11998
Merge branch 'MDL-26236' of git://github.com/timhunt/moodle
2011-02-15 01:16:33 +01:00
Eloy Lafuente (stronk7)
bcbb590227
Merge branch 'MDL-26365' of git://github.com/timhunt/moodle
2011-02-15 01:03:23 +01:00
Eloy Lafuente (stronk7)
46388c9cf9
Merge branch 'MDL-26369' of git://github.com/timhunt/moodle
2011-02-15 00:58:01 +01:00
Aparup Banerjee
fe1776b9f2
MDL-22970 glossary - perf. improvements in recent activity
2011-02-15 00:33:13 +01:00
Eloy Lafuente (stronk7)
2623f6bef2
Merge branch 'w07_MDL-25778_20_defaultcity' of git://github.com/skodak/moodle
2011-02-14 23:24:52 +01:00
Petr Skoda
2453531f03
Merge branch 'MDL-26337' of git://github.com/timhunt/moodle
2011-02-14 22:15:30 +01:00
Petr Skoda
3fa0670a98
Merge branch 'MDL-26109' of git://github.com/nebgor/moodle
2011-02-14 22:10:37 +01:00
Petr Skoda
5d41c24d9f
Merge branch 'MDL-26312-workshop-upgrade' of git://github.com/mudrd8mz/moodle
2011-02-14 21:45:57 +01:00
Petr Skoda
7a8fe6fa41
Merge branch 'MDL-25863_automated_backups_wip' of git://github.com/stronk7/moodle
2011-02-14 21:42:50 +01:00
David Mudrak
0c3c0de198
MDL-26312 Workshop: unset temporary arrays in upgrade code
...
Spotted by Petr Skoda during the code review.
2011-02-14 21:38:50 +01:00
Eloy Lafuente (stronk7)
8afbe44f7d
MDL-25863 backup - fix removal of old automated backup, both in filearea and filesystem
2011-02-14 21:38:45 +01:00
Petr Skoda
9ceaf7b5a0
Merge branch 'm20_MDL-26212_resizefix' of git://github.com/danmarsden/moodle
2011-02-14 21:37:37 +01:00
Eloy Lafuente (stronk7)
02cf691951
MDL-25863 backup - take rid of dupe code for filename calculations
2011-02-14 21:36:27 +01:00
Petr Skoda
cbbc272542
Merge branch 'MDL-26371_distinct_text' of git://github.com/stronk7/moodle
2011-02-14 21:19:35 +01:00
Petr Skoda
251e5a8b62
Merge branch 'MDL-22146_backup_course_format_wip' of git://github.com/stronk7/moodle
2011-02-14 21:08:19 +01:00
Petr Skoda
995b6ff605
Merge branch 'MDL-26229_restore_attempts_wip' of git://github.com/stronk7/moodle
2011-02-14 21:02:49 +01:00
Petr Skoda
e027bfcfaa
Merge branch 'MDL-24898_strip_and_trunc_subjects_wip' of git://github.com/stronk7/moodle
2011-02-14 20:57:13 +01:00
Petr Skoda
a60a943696
Merge branch 'MDL-25553_lesson_jumpto_wip' of git://github.com/stronk7/moodle
2011-02-14 20:39:31 +01:00
Petr Skoda
47a13ff99a
Merge branch 'MDL-25612_rss_block' of git://github.com/stronk7/moodle
2011-02-14 20:37:28 +01:00
Petr Skoda
d2592c9b54
Merge branch 'MDL-26399_oracle_restore_wip' of git://github.com/stronk7/moodle
2011-02-14 20:34:58 +01:00
Eloy Lafuente (stronk7)
15ffec3698
Merge branch 'w07_MDL-25626_20_completionerror' of git://github.com/skodak/moodle
2011-02-14 20:15:37 +01:00
Petr Skoda
fa7f750c60
MDL-25778 add defaultcity option
...
This is based on patch by Jonathan Harker.
2011-02-14 20:10:50 +01:00
Eloy Lafuente (stronk7)
89bf60cdbc
Merge branch 'MDL-26338' of git://github.com/timhunt/moodle
2011-02-14 19:57:38 +01:00
Eloy Lafuente (stronk7)
d84fe4c8a6
MDL-26399 restore - fix oracle/mssql problems
2011-02-14 19:42:57 +01:00