Eloy Lafuente (stronk7)
78106a24ad
Merge branch 'em_MDL-25944_20_forummail' of git://github.com/skodak/moodle
2011-02-18 18:42:45 +01:00
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
Eloy Lafuente (stronk7)
3b3e2cecf3
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.
2011-02-17 17:25:44 +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
Aparup Banerjee
37695a6ff6
glossary MDL-22970 uid is reserved in ORACLE! changed to userid
2011-02-16 04:46:20 +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)
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
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
andyjdavis
3a00a167c6
message MDL-26119 fixed up the logged URL
2011-02-15 14:24:13 +08: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
Petr Skoda
5d41c24d9f
Merge branch 'MDL-26312-workshop-upgrade' of git://github.com/mudrd8mz/moodle
2011-02-14 21:45:57 +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
Petr Skoda
9ceaf7b5a0
Merge branch 'm20_MDL-26212_resizefix' of git://github.com/danmarsden/moodle
2011-02-14 21:37:37 +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
995b6ff605
Merge branch 'MDL-26229_restore_attempts_wip' of git://github.com/stronk7/moodle
2011-02-14 21:02:49 +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
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)
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
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
cbe4cbc268
Merge branch 'MDL-26353-database-import-help' of git://github.com/mudrd8mz/moodle
2011-02-14 09:20:53 +01:00
Dan Marsden
71550f6fa1
MDL-26212 - fix scorm player size on resize of browser window - bump scorm version as JS is changed. Kudos to Piers for patch
2011-02-14 14:50:43 +13:00
Eloy Lafuente (stronk7)
e07c51c481
MDL-26371 sql - avoid distinct + text in lesson essay & report
2011-02-12 17:34:03 +01:00
Eloy Lafuente (stronk7)
b37d06c2ed
MDL-26371 sql - avoid distinct + text in glossary search
2011-02-12 17:05:32 +01:00
Petr Skoda
b1d5d0155b
MDL-26271 fix borked sql parameters in forum_search_posts and add missing modinfo field
...
This is the perfect example why there must not be duplicate parameter names in SQL queries.
2011-02-12 10:11:27 +01:00
Eloy Lafuente (stronk7)
bd9e662953
MDL-25553 lesson restore - add missing jumpto remapping. Credit goes to Mike Churchward
2011-02-12 04:02:10 +01:00
Eloy Lafuente (stronk7)
7cff4927be
MDL-26229 backup & restore - fix quiz & lesson conflicts
2011-02-12 03:03:26 +01:00
David Mudrak
dd8ab1fb4a
MDL-26353 Database activity module: display help icon with the new help strings
...
This commit makes the new strings added by Helen used at the Import
entries page. Note that the syntax of the strings had to be fixed as
there must not be leading whitespace before the asterisk in Markdown format.
Also as requested by Helen, the wording or export/import links is
improved now.
As a bonus for free, the patch fixes incorrect API usage of get_record()
and friends.
2011-02-12 00:02:20 +01:00
Helen Foster
76179aac08
MDL-26353 Database activity module new help string
2011-02-11 23:09:02 +01:00
Tim Hunt
2e5ce83f11
MDL-26369 fix notice caused by the fix for MDL-26098.
2011-02-11 14:15:43 +00:00
David Mudrak
d0fb170520
MDL-26312 Workshop: fixed upgrade of module instances from 1.9 to 2.0
...
The patch changes workshop_upgrade_module_instances() so that it
processes old workshop records ordered by their id and it keeps the
instances id by using import_record() instead of insert_record().
Thanks to this, there is no mapping of workshop ids needed so the
function workshop_upgrade_workshop_id_mappings() is dropped and all
callers use plain workshop record.
2011-02-11 07:43:04 +01:00
Tim Hunt
dc3826eed7
MDL-26338 fix mixed types in quiz reports SQL. This was breaking Oracle
2011-02-09 20:48:21 +00:00
Eloy Lafuente (stronk7)
cd03ecce8e
Merge branch 'MDL-24870_rss_error' of git://github.com/andyjdavis/moodle
2011-02-08 10:21:55 +01:00
Petr Skoda
f2f45270ee
Merge branch 'MDL-26267' of git://github.com/samhemelryk/moodle
2011-02-07 23:07:16 +01:00
Eloy Lafuente (stronk7)
20ba9a2e47
Merge branch 'MDL-17357-duplicate-strings' of git://github.com/mudrd8mz/moodle
2011-02-07 15:53:15 +01:00
David Mudrak
d5b7f35d65
MDL-17357 Removed duplicate string definitions
2011-02-07 15:08:07 +01:00
Sam Hemelryk
0032523aed
Merge branch 'PULL-226-workshop' of git://github.com/mudrd8mz/moodle
2011-02-07 17:58:12 +08:00
David Mudrak
32ea207a48
MDL-26298 Workshop: fixed trivial typos in phpDoc blocks
2011-02-07 10:49:34 +01:00
David Mudrak
d239b952a5
MDL-26296 Workshop: trivial change in manual allocator CSS
...
When only two rows of the allocations table are displayed with the new
allocation highlighted, it is better not highlight the odd row.
2011-02-07 10:49:30 +01:00
Sam Hemelryk
9cb70adc33
Merge branch 'w06_MDL-26238_20_group' of git://github.com/skodak/moodle
2011-02-07 16:20:02 +08:00
Sam Hemelryk
dedda4abc3
Merge branch 'MDL-26272' of git://github.com/stronk7/moodle
2011-02-07 16:03:27 +08:00
Sam Hemelryk
89652edd6c
Merge branch 'MDL-26242' of git://github.com/timhunt/moodle
2011-02-07 15:13:53 +08:00
Sam Hemelryk
1ca95a13f3
Merge branch 'MDL-25874' of git://git.luns.net.uk/moodle
2011-02-07 14:01:00 +08:00
Sam Hemelryk
2addb4ba1b
mod-workshop MDL-26267 workshop_extend_navigation argument 4 is now always going to be a cm_info object
2011-02-07 13:20:09 +08:00
Charles Fulton
9250bf8172
MDL-26238 remove deprecated second parameter from groups_get_group() calls
2011-02-06 18:15:36 +01:00
Eloy Lafuente (stronk7)
195a0848ec
MDL-26272 ratings - fix uses breaking after last modinfo changes
2011-02-04 17:30:51 +01:00
David Mudrak
51abc39695
MDL-26188 Workshop: get rid of a method that is not used anyway
...
The protected method get_allocations_recordset() is a relict from
earlier development phases of Workshop module. Removing it as it
confuses recent Eloy's recordset usage detection tool.
2011-02-04 14:33:48 +01:00
