Eloy Lafuente (stronk7)
395181f9bb
Merge branch 'master' of git.moodle.org:/git/integration
2011-02-18 18:25:18 +01:00
Eloy Lafuente (stronk7)
f5c452a3b3
Merge branch 'em_MDL-26476_20_grp' of git://github.com/skodak/moodle
2011-02-18 18:25:04 +01:00
Petr Skoda
ed3eb9ea74
Merge branch 'PULL-314' of git://github.com/mudrd8mz/moodle
2011-02-18 18:20:44 +01:00
David Mudrak
ed79b89b85
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).
2011-02-18 17:33:37 +01:00
Tim Hunt
05d2a8b7f1
MDL-26416 avoid subtracting two unsigned ints, which breaks MySQL since 5.5.5.
2011-02-18 16:27:49 +00:00
Andrew Davis
42291c6161
MDL-26010 External blog synchronization removes non-relevant post records
2011-02-18 17:19:41 +01:00
Tim Hunt
19a9f1124d
MDL-26416 avoid subtracting two unsigned ints, which breaks MySQL since 5.5.5.
2011-02-18 14:10:06 +00:00
Tim Hunt
bbc2d0ba31
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.
2011-02-18 14:10:04 +00:00
Daren Chandisingh
cb6b733232
Change 'Simbian' to 'Symbian'
2011-02-18 12:28:26 +00:00
David Mudrak
ffdf7f8a24
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.
2011-02-18 11:43:24 +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
Joseph Rezeau
c76cd2ede1
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.
2011-02-18 10:43:25 +01:00
andyjdavis
7bbe971548
general MDL-26440 removed references to uid in SQL queries as its a reserved word in Oracle
2011-02-18 15:51:50 +08:00
Petr Skoda
12923c92b1
MDL-26476 fix incorrect fetching of user groups in modinfo
2011-02-17 18:19:41 +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
andyjdavis
731f8516bc
message MDL-26435 removed commented out code
2011-02-17 11:03:18 +08: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
Tim Hunt
e24ee794b2
MDL-20636 Convert the overview report.
2011-02-16 17:33:51 +00:00
Tim Hunt
2a3bdbf98e
MDL-20636 Fix some minor bugs.
2011-02-16 14:06:12 +00: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
Tim Hunt
0f33deafaa
MDL-20636 Fix question/enigne/datalib.php unit tests.
2011-02-15 18:19:55 +00:00
Tim Hunt
04853f273a
MDL-20636 Convert quiz statistics report.
2011-02-15 17:22:31 +00: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
