phpbb/phpBB/install
Nathan Guse 68ed2b6035 Merge branch 'develop' of github.com:phpbb/phpbb3 into ticket/11628
# By Bruno Ais (42) and others
# Via Joas Schilling (39) and others
* 'develop' of github.com:phpbb/phpbb3: (157 commits)
  [ticket/11803] Revert POLL_MAX_OPTIONS min value to 0
  [ticket/11799] Send anti abuse headers in "new password" emails.
  [ticket/11792] Add functional test for var lang_set_ext of core.user_setup
  [ticket/11804] Remove </li> from overall_header which was not open
  [ticket/11802] replace $browser with $user->browser
  [ticket/11801] removed some whitespace and added missing semi colon's in css
  [ticket/11792] Add performance remark to core.user_setup event PHPDoc
  [ticket/11792] Add variable 'lang_set_ext' to event core.user_setup
  [ticket/11789] Remove inline color in memberlist_view
  [ticket/11800] Fix scripts variable in subsilver simple_footer
  [ticket/11800] Fix JavaScript in simple_footer.html
  [ticket/11800] Remove forum_fn from memberlist_search.html
  [ticket/11796] Replace pagination with pagination.html
  [ticket/11794] Add missing array element commas to docs/coding-guidelines.html
  [ticket/11775] Fix doc blocks syntax
  [ticket/11775] Remove spaces at line ends
  [ticket/11789] Remove colors from HTML code
  [ticket/11784] Remove naming redundancy for event listeners
  [ticket/11775] Split test into multiple steps
  [ticket/11777] Fix new test for loop variables in extension template listeners
  ...

Conflicts:
	phpBB/install/index.php
	phpBB/install/install_update.php
2013-08-28 13:30:48 -05:00
..
convertors [develop-olympus] Bumping version numbers to final for 3.0.12 releases. 2013-07-12 21:10:05 +02:00
data [ticket/9916] Updating header license and removing Version $Id$ 2011-12-31 13:32:52 +00:00
schemas [ticket/11464] Add missing and remove unnecessary database entry 2013-07-31 10:46:14 +02:00
database_update.php [ticket/11574] Remove install/udpate/new/ fallback from database_update.php 2013-07-30 01:38:06 +02:00
index.php Merge branch 'develop' of github.com:phpbb/phpbb3 into ticket/11628 2013-08-28 13:30:48 -05:00
install_convert.php Merge remote-tracking branch 'phpbb/develop' into feature/softdelete-1-permission 2013-07-11 11:41:48 +02:00
install_install.php [ticket/11698] Moving all autoloadable files to phpbb/ 2013-07-14 01:32:34 -04:00
install_main.php [ticket/9916] Updating header license and removing Version $Id$ 2011-12-31 13:32:52 +00:00
install_update.php Merge branch 'develop' of github.com:phpbb/phpbb3 into ticket/11628 2013-08-28 13:30:48 -05:00
phpinfo.php [ticket/9556] Drop php closing tags, add trailing newline 2010-11-11 19:10:55 +01:00