phpbb/phpBB
Andreas Fischer b7b8fefdd0 Merge branch 'develop-olympus' into develop
* develop-olympus:
  [ticket/10205] Reduce nesting in mysql drivers.
  [ticket/10205] Rewrite _sql_error implementations to have a single return.
  [ticket/10205] Cosmetic changes.
  [ticket/10205] Add some columns to the empty fixture file for mssqlnative.
  [ticket/10205] Delete stray return.
  [ticket/10205] Test failed connection attempts.
  [ticket/10205] Check for function existence in mssql connect method.
  [ticket/10205] Convert mssqlnative driver to the same logic.
  [ticket/10205] Fix a parse error in oracle driver.
  [ticket/10205] Fix remaining db drivers.
  [ticket/10205] Avoid calling mysqli functions when mysqli is missing.
  [ticket/10205] Account for potentially missing extensions in dbal.

Conflicts:
	tests/fixtures/empty.xml
2012-12-08 03:08:21 +01:00
..
adm [ticket/11209] Clone disable moving images to allow multiple per page 2012-11-16 11:41:39 +01:00
assets/javascript Merge PR #890 branch 'nickvergessen/ticket/10982' into develop 2012-10-16 21:47:13 -04:00
cache [ticket/9520] Removed per directory web.config files. 2010-05-03 19:31:40 +02:00
config [ticket/11256] Remove unused controller.provider service 2012-12-07 23:18:38 +01:00
develop Merge branch 'develop-olympus' into develop 2012-11-29 23:17:58 +01:00
docs [ticket/10091] Bump minimum supported postgresql version to 8.3. 2012-12-04 02:52:18 -05:00
download [feature/controller] Rename kernel pass class properly 2012-11-16 16:45:29 -05: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 2012-12-08 03:08:21 +01:00
install [ticket/10679] Update module basename, we added the xcp_ prefix in 3.1 2012-12-07 12:50:21 +01:00
language [ticket/10679] Add new permission for changing profile field information 2012-12-06 15:10:29 +01:00
store [ticket/9520] Removed per directory web.config files. 2010-05-03 19:31:40 +02:00
styles Merge PR #1053 branch 'develop-olympus' into develop 2012-12-05 12:21:25 -05:00
.htaccess [feature/controller] Remove url rewriting until we use pathinfo in controllers 2012-11-18 13:32:54 -05:00
app.php [feature/controller] Check for proper status codes from controllers 2012-11-19 12:37:20 -05:00
common.php [feature/controller] Use query string, not path info, for controller access 2012-11-17 17:48:20 -05:00
composer.json [ticket/11238] Set goutte version to 0.1.0. 2012-12-02 23:44:49 -05:00
composer.lock [ticket/11238] Set goutte version to 0.1.0. 2012-12-02 23:44:49 -05:00
cron.php [ticket/11189] Replace DEBUG_EXTRA with DEBUG 2012-11-10 10:45:02 -06:00
faq.php [ticket/9916] Updating header license and removing Version $Id$ 2011-12-31 13:32:52 +00:00
feed.php [ticket/11077] Remove code from old global announcements system 2012-11-11 13:04:14 +01:00
index.php [feature/controller] Implement a front controller 2012-11-16 16:25:09 -05:00
mcp.php [feature/php-events] Readd comment from d06adb06e9 2012-08-11 11:49:48 +02:00
memberlist.php [ticket/11023] Fix additional whitespaces that were added by PHPBB3-10968 2012-10-17 23:34:37 +02:00
posting.php Merge pull request #962 from imkingdavid/feature/add_events 2012-09-01 12:44:23 -07:00
report.php [ticket/10845] Removed one empty line that wasn't supposed to be there 2012-06-14 19:23:46 +01:00
search.php [ticket/11023] Fix additional whitespaces that were added by PHPBB3-10968 2012-10-17 23:34:37 +02:00
ucp.php [ticket/10679] Use module_auth to limit access to the module 2012-12-06 16:33:12 +01:00
viewforum.php [ticket/8796] Mark read links updated to include time() in url 2012-09-03 18:51:29 -05:00
viewonline.php [ticket/11014] Fix old pagination assignment 2012-10-17 23:34:37 +02:00
viewtopic.php Merge remote-tracking branch 'Fyorl/feature/attach-dl' into develop 2012-08-26 18:56:09 +02:00
web.config [feature/controller] Remove URL rewriting by default 2012-11-16 17:06:02 -05:00