Commit graph

46809 commits

Author SHA1 Message Date
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
Petr Skoda
2e98a7475a MDL-25626 fix previous incorrect fix incorrect cm id in completion report 2011-02-14 19:41:05 +01:00
Eloy Lafuente (stronk7)
1ae279b448 Merge branch 'MDL-26356' of git://github.com/ppichet/moodle 2011-02-14 18:29:46 +01:00
Eloy Lafuente (stronk7)
68e05ea6e6 Merge branch 'MDL-26332' of git://github.com/timhunt/moodle 2011-02-14 18:26:33 +01:00
Eloy Lafuente (stronk7)
69c53045ba Merge branch 'mdl-26299' of git://github.com/mackensen/moodle 2011-02-14 18:23:56 +01:00
Eloy Lafuente (stronk7)
396dca7cb9 Partially merge w07_MDL-25575_20_contexttrouble. See PULL-299 2011-02-14 17:58:21 +01:00
Petr Skoda
cde44edc7a MDL_24125 admin tree fast category lookup 2011-02-14 17:47:43 +01:00
Eloy Lafuente (stronk7)
7d87147203 Merge branch 'w07_MDL-26142_20_immediatelly' of git://github.com/skodak/moodle 2011-02-14 17:38:22 +01:00
Eloy Lafuente (stronk7)
0dd8cb88e9 Merge branch 'w07_MDL-23939_20_completeuser' of git://github.com/skodak/moodle 2011-02-14 17:10:29 +01:00
Eloy Lafuente (stronk7)
76b7e2d1d6 Merge branch 'w07_MDL-26389_20_profile' of git://github.com/skodak/moodle 2011-02-14 15:58:26 +01:00
Petr Skoda
81b58cc227 MDL-26389 improve profile and search engine privacy 2011-02-14 15:42:26 +01:00
Eloy Lafuente (stronk7)
4acc624d62 Merge branch 'w07_MDL-26131_20_collapsible' of git://github.com/skodak/moodle 2011-02-14 15:06:28 +01:00
Eloy Lafuente (stronk7)
f0e28c7e67 Merge branch 'w07_MDL-26223_20_calblock' of git://github.com/skodak/moodle 2011-02-14 14:38:02 +01:00
Eloy Lafuente (stronk7)
a49d8aa25a Merge branch 'w07_MDL-25974_20_switchhidden' of git://github.com/skodak/moodle 2011-02-14 14:23:05 +01:00
Eloy Lafuente (stronk7)
0db846acda Merge branch 'w07_MDL-25998_20_enrolrole' of git://github.com/skodak/moodle 2011-02-14 12:41:16 +01:00
Eloy Lafuente (stronk7)
d2a201c83b Merge branch 'w07_MDL-26314_20_initcall' of git://github.com/skodak/moodle 2011-02-14 12:35:18 +01:00
Eloy Lafuente (stronk7)
222a500b31 Merge branch 'w07_MDL-26383_20_blogupg' of git://github.com/skodak/moodle 2011-02-14 12:31:50 +01:00
David Mudrak
f593111b67 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.
2011-02-14 10:11:42 +01:00
Petr Skoda
a8759c65e4 Merge branch 'AMOS-install-strings' of git://github.com/mudrd8mz/moodle 2011-02-14 09:52:28 +01:00
Petr Skoda
db30cfca84 MDL-25215 fix file.JPG.jpg extension problems 2011-02-14 09:50:07 +01:00
Petr Skoda
419814db02 Merge branch 'm20_MDL-25215_filepicker_saveas' of git://github.com/dongsheng/moodle 2011-02-14 09:43:06 +01:00
AMOS bot
0ef1f80e3b Automatic installer lang files (20110214) 2011-02-14 09:36:04 +01:00