Andreas Fischer f164906d77 Merge branch 'develop-olympus' into develop ...

* develop-olympus:
  [task/mssql-db-tests] Remove MS SQL helper values from SELECT LIMIT results.
  [task/mssql-db-tests] Split up database tests into SELECT and write operations
  [task/mssql-db-tests] PHPUnit output got stuck after unterminated ob_start.
  [task/mssql-db-tests] sql_query_limit must return all results when total = 0
  [task/mssql-db-tests] Add support for odbc & sqlsrv PDO test connections
  [task/mssql-db-tests] Refactored getConnection into multiple smaller parts.
  [task/mssql-db-tests] Allow test configuration with environment variables.
  [task/mssql-db-tests] No longer display an error when skipping db tests.
  [task/mssql-db-tests] Use a simple getter for test case helpers.

Conflicts:
	tests/template/template.php

2010-11-03 11:58:48 +01:00

..

acm

[ticket/9519] Replace remaining is_writable() calls with phpbb_is_writable().

2010-08-19 12:30:24 -04:00

acp

Merge branch 'ticket/rxu/9867' into develop

2010-10-30 12:43:08 +02:00

auth

Merge branch 'develop-olympus' into develop

2010-10-17 21:47:04 +02:00

captcha

Merge branch 'develop-olympus' into develop

2010-10-04 17:25:00 +02:00

db

Merge branch 'develop-olympus' into develop

2010-11-03 11:58:48 +01: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

…

mcp

[feature/request-class] Convert any direct access to $_* to use $request

2010-09-25 20:32:15 +02: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

request

[feature/request-class] Prevent recursive_set_var from applying htmlspecialchars twice

2010-09-19 15:31:00 +02:00

search

[ticket/9595] List min/max characters indexed by search for mysql_fulltext.

2010-10-21 20:31:00 +02:00

ucp

[ticket/9867] Adjust the implementation of error messages localization.

2010-10-26 01:38:09 +08:00

utf

Make a few functions truly static to fix the tests.

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

.htaccess

[ticket/9698] Add .htaccess to the includes subdirectory.

2010-10-15 16:47:21 +02: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

class_loader.php

[feature/auto-loading] Only check subdir if there is another name part.

2010-08-19 22:06:19 +02:00

constants.php

[ticket/7538] Limit user_login_attempts to prevent SQL errors.

2010-10-15 19:00:14 +02:00

functions_admin.php

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

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

functions_compress.php

[ticket/7296] Exporting styles to tar creates corrupted archives.

2010-08-22 11:16:19 -04: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/9519] Replace remaining is_writable() calls with phpbb_is_writable().

2010-08-13 16:40:56 +02:00

functions_display.php

[feature/request-class] Convert any direct access to $_* to use $request

2010-09-25 20:32:15 +02:00

functions_download.php

[ticket/9627] Prefix function names with 'phpbb_'.

2010-10-23 18:06:46 +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

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

2010-10-27 13:06:21 +02:00

functions_module.php

[feature/request-class] Convert any direct access to $_* to use $request

2010-09-25 20:32:15 +02:00

functions_posting.php

Merge branch 'develop-olympus' into develop

2010-09-16 22:42:32 +02:00

functions_privmsgs.php

Revert "[ticket/7716] Data too long for column 'message_subject'"

2010-08-21 21:25:34 +02:00

functions_profile_fields.php

[feature/request-class] Convert any direct access to $_* to use $request

2010-09-25 20:32:15 +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

Merge branch 'ticket/bantu/7252' into develop

2010-09-12 14:48:09 +02:00

functions_user.php

Merge branch 'develop-olympus' into develop

2010-08-28 23:34:18 +02:00

functions.php

Merge branch 'develop-olympus' into develop

2010-10-19 13:57:43 +02:00

index.htm

…

message_parser.php

[feature/request-class] Convert any direct access to $_* to use $request

2010-09-25 20:32:15 +02:00

session.php

[feature/request-class] Replace direct use of GET/REQUEST with request_var.

2010-09-17 14:00:01 +02:00

template.php

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

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