Andreas Fischer 7d6545bd09 Merge branch 'develop-olympus' into develop ...

* develop-olympus:
  [ticket/9653] Valid XHTML with code BBCode in subsilver2 viewtopic signatures
  [ticket/9656] Remove @ from phpinfo() to get correct error_reporting value.
  [ticket/9665] Allow preview of signature when it is the string "0".
  [ticket/9112] Make sure current user can see most active forum/topic.
  [ticket/9655] Pass E_USER_WARNING, so it doesn't look like a successful action.
  [ticket/9643] Only split $port from $sqlserver, if it's not an IPv6 address.

Conflicts:
	phpBB/styles/subsilver2/template/ucp_profile_signature.html
	phpBB/styles/subsilver2/template/viewtopic_body.html

2010-06-20 22:50:10 +02:00

..

acm

[feature/memcache-multi-server] Changing format for multiple memcache hosts. Fixing code style issues in changes.

2010-03-18 17:01:50 +01:00

acp

Merge branch 'ticket/bantu/9655' into develop-olympus

2010-06-20 22:46:23 +02:00

auth

[ticket/8792] Add LDAP_SEARCH_FAILED string for when ldap_search() fails.

2010-05-16 23:05:13 +02:00

captcha

Merge r10484 and r10485 into 3.0.7 branch.

2010-02-08 16:54:39 +00:00

db

Merge branch 'ticket/bantu/9643' into develop-olympus

2010-06-20 22:45:28 +02:00

diff

…

hooks

…

mcp

…

questionnaire

…

search

…

ucp

[ticket/9135] Fix report-icon for moderators in PM folders.

2010-05-26 01:38:19 +02:00

utf

Make a few functions truly static to fix the tests.

2010-03-06 04:41:49 +01:00

auth.php

…

bbcode.php

Merge r10515 into 3.0.7 branch

2010-02-23 16:12:51 +00:00

cache.php

Support for Microsoft's Native SQL Server Driver for PHP - Patch by Chris Pucci at Microsoft [Bug #57055]

2010-02-11 00:02:51 +00:00

constants.php

[ticket/9179] Remove unnecessary newline.

2010-05-30 15:20:15 +02:00

functions_admin.php

[ticket/9510] Unable to copy permissions from and to forums you cannot see

2010-05-16 18:19:28 +02:00

functions_compress.php

[bug/12531] proposed solution for bug #12531

2010-03-06 17:57:27 +01:00

functions_content.php

…

functions_convert.php

Merge r10497 and r10499 into 3.0.7 - #57755

2010-02-18 01:40:51 +00:00

functions_display.php

Merge branch 'ticket/bantu/9112' into develop-olympus

2010-06-20 22:45:16 +02:00

functions_install.php

Support for Microsoft's Native SQL Server Driver for PHP - Patch by Chris Pucci at Microsoft [Bug #57055]

2010-02-11 00:02:51 +00:00

functions_jabber.php

…

functions_messenger.php

Do not store email templates in database. [Bug #54505]

2010-01-26 16:52:46 +00:00

functions_module.php

…

functions_posting.php

[ticket/9147] "Change topic type"-option "Normal" always selected.

2010-05-28 14:25:56 +02:00

functions_privmsgs.php

…

functions_profile_fields.php

[ticket/9582] Unable to edit CPFs from UCP under MSSQL native driver.

2010-05-03 19:40:26 +02:00

functions_template.php

…

functions_transfer.php

…

functions_upload.php

[feature/remote_upload-filesize] Also check HTTP content-length before actually starting the file transfer.

2010-05-14 01:19:34 +02:00

functions_user.php

[ticket/9633] Newly Registered Group Colour not used in "Our Newest Member"

2010-06-01 00:19:43 -05:00

functions.php

Merge branch 'ticket/rxu/9606' into develop-olympus

2010-06-17 19:10:59 +02:00

index.htm

…

message_parser.php

[ticket/9170] Unable to get image size in img bbcode when URL has multiple parameters.

2010-05-02 23:43:32 +02:00

session.php

Merge branch 'develop-olympus' into develop

2010-04-04 15:04:56 +02:00

template.php

Do not store email templates in database. [Bug #54505]

2010-01-26 16:52:46 +00:00