phpbb/phpBB
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
..
adm Merge branch 'develop-olympus' into develop 2010-10-17 21:47:04 +02:00
cache [ticket/9520] Removed per directory web.config files. 2010-05-03 19:31:40 +02:00
develop Merge branch 'develop-olympus' into develop 2010-08-21 23:35:43 +02:00
docs Merge branch 'develop-olympus' into develop 2010-10-19 14:04:22 +02:00
download [ticket/9627] Prefix function names with 'phpbb_'. 2010-10-23 18:06:46 +02:00
files [ticket/9520] Removed per directory web.config files. 2010-05-03 19:31:40 +02:00
images [ticket/9520] Removed per directory web.config files. 2010-05-03 19:31:40 +02:00
includes Merge branch 'develop-olympus' into develop 2010-11-03 11:58:48 +01:00
install Merge branch 'develop-olympus' into develop 2010-10-23 14:10:19 +02:00
language Merge branches 'ticket/bantu/9101', 'ticket/bantu/9595' and 'ticket/bantu/9853' into develop-olympus 2010-10-25 22:08:37 +02:00
store [ticket/9520] Removed per directory web.config files. 2010-05-03 19:31:40 +02:00
styles Merge branch 'develop-olympus' into develop 2010-10-25 22:08:51 +02:00
.htaccess [Feature] Ability to use HTTP authentication in ATOM feeds by passing the GET parameter auth=http 2010-01-19 19:08:51 +00:00
common.php Merge branch 'develop-olympus' into develop 2010-10-17 21:47:04 +02:00
cron.php Copy 3.0.x branch to trunk 2009-10-04 18:14:59 +00:00
faq.php Copy 3.0.x branch to trunk 2009-10-04 18:14:59 +00:00
feed.php [ticket/9727] Smiley Path replacement in feeds is too generic 2010-07-18 11:51:13 -05:00
index.php [ticket/7720] Fix alternative image-description for unread posts. 2010-07-14 20:55:07 +02:00
mcp.php [feature/request-class] Fix mcp.php mode parameter 2010-10-05 23:29:57 +02:00
memberlist.php [feature/request-class] Convert any direct access to $_* to use $request 2010-09-25 20:32:15 +02:00
posting.php Merge branch 'develop-olympus' into develop 2010-10-17 21:47:04 +02:00
report.php merge changes from 3.0.x branch 2009-12-16 15:48:23 +00:00
search.php Merge branch 'ticket/bantu/9613' into develop-olympus 2010-09-16 22:34:48 +02:00
style.php [feature/request-class] Add $request to style.php, minor change 2010-09-20 18:52:08 +02:00
ucp.php [feature/request-class] Convert any direct access to $_* to use $request 2010-09-25 20:32:15 +02:00
viewforum.php Merge branch 'ticket/nickvergessen/7720' into develop-olympus 2010-07-14 20:55:49 +02:00
viewonline.php Copy 3.0.x branch to trunk 2009-10-04 18:14:59 +00:00
viewtopic.php [feature/request-class] Replace direct use of GET/REQUEST with request_var. 2010-09-17 14:00:01 +02:00
web.config [ticket/9520] Additionally filter requests for {common,config}.php 2010-05-03 19:32:29 +02:00