Josh Woody 68744484c8 Merge branch 'ticket/bantu/9167' into develop-olympus ...

* ticket/bantu/9167:
  [ticket/9167] Detect and remove any dead left over shadow topics on update.
  [ticket/9167] Remove shadow topics from remaining forums when deleting a forum

Conflicts:
	phpBB/install/database_update.php

2010-08-19 10:09:32 -05: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/9167' into develop-olympus

2010-08-19 10:09:32 -05:00

auth

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

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

captcha

[ticket/9612] Introduce new function gen_rand_string_friendly().

2010-05-17 09:44:48 +02:00

db

Merge branch 'ticket/kellanved/9521' into develop-olympus

2010-07-31 02:08:40 +02:00

diff

improve code to detect and solve conflicts for code removed from one version to another.

2009-09-20 16:20:20 +00:00

hooks

- fixed database updater

2007-10-04 12:03:05 +00:00

mcp

[ticket/9679] phpBB offers to notify poster even if notification is disabled

2010-07-29 10:01:35 -05:00

questionnaire

[Feature] Ability to use HTTP authentication in ATOM feeds by passing the GET parameter auth=http

2010-01-19 19:08:51 +00:00

search

Merge branch 'ticket/cs278/9760' into develop-olympus

2010-08-10 16:04:49 +02:00

ucp

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

2010-08-19 09:11:36 -05:00

utf

- replaced the drop down menu log filter thing with log searching

2009-08-21 21:47:19 +00:00

auth.php

Fix Bug #48875 - we compare the bitlength, therefore we indeed do not need to re-cache if we think acl options got changed (which we did)

2009-07-30 14:35:29 +00:00

bbcode.php

Merge r10515 into 3.0.7 branch

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

cache.php

[ticket/9747] Improve word censor.

2010-07-25 16:57:00 +08:00

constants.php

[ticket/9179] Remove unnecessary newline.

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

functions_admin.php

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

2010-08-19 10:09:32 -05:00

functions_compress.php

[bug/12531] proposed solution for bug #12531

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

functions_content.php

Deprecate $allow_reply parameter to truncate_string() (Bug #56675)

2010-01-25 18:02:37 +00:00

functions_convert.php

[ticket/9659] Signature options in set_user_options

2010-07-06 14:43:50 +02:00

functions_display.php

[ticket/7720] Fix alternative image-description for unread posts.

2010-07-14 20:55:07 +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

Fix Jabber SASL PLAIN authentication failures. (Bug #52995)

2009-10-29 15:04:19 +00:00

functions_messenger.php

[ticket/9559] Do not override queue package size in the case of an overflow

2010-07-22 10:44:31 -05:00

functions_module.php

[Change] Alllow applications to set custom module inclusion path (idea by HoL)

2008-11-23 12:42:34 +00:00

functions_posting.php

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

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

functions_privmsgs.php

[ticket/9757] Fix empty template variable {HISTORY_TITLE}

2010-07-29 13:19:19 -05:00

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

Revert INC/DEC feature. It is not consistent with the other template variables - bad idea. ;) We will get to it though... but not now.

2009-08-30 11:15:24 +00:00

functions_transfer.php

Also fix bug #46295 in ftp_fsock class.

2009-07-22 03:02:45 +00:00

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

Merge branch 'ticket/kellanved/9504' into develop-olympus

2010-07-15 23:15:41 +02:00

functions.php

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

2010-08-19 09:11:36 -05: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

[ticket/9712] Future dates can be formatted as 'less than one minute ago'

2010-07-07 23:04:46 +01:00

template.php

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

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