phpbb/phpBB/install
Igor Wiedler f6865dc33a Merge remote-tracking branch 'upstream/develop' into ticket/11574
* upstream/develop: (575 commits)
  [ticket/11702] Fix forum_posts left over for link-click counts in viewforum.php
  [ticket/11696] Move file to new directory
  [ticket/11696] Rename constructor to __construct()
  [ticket/11696] Remove manual loading of db_tools in extension controller test
  [ticket/11696] Rename db_tools.php so it can be autoloaded
  [ticket/11698] Moving all autoloadable files to phpbb/
  [ticket/11694] Do not locate assets with root path
  [ticket/11692] Don't update search_type in dev migration if already appended
  [ticket/11675] Fix template loop
  [ticket/11690] Old module class names may get autoloaded by class_exists
  [ticket/9649] Display information on index for moderators on unapproved posts
  [ticket/10999] Fix assets_version in ACP
  [prep-release-3.0.12] More changelog items for the 3.0.12 release.
  [ticket/11687] Add assets_version to phpbb_config
  [ticket/11686] Not checking for phpBB Debug errors on functional tests
  [ticket/11670] Consistency with logo: Replace "phpBB(tm)" with "phpBB(R)".
  [ticket/11674] Do not include vendor folder if there are no dependencies.
  [ticket/11685] Remove logout confirmation page
  [ticket/11684] Remove useless confirmation page after login and admin login
  [ticket/9657] Define user before injecting
  ...

Conflicts:
	phpBB/includes/functions_container.php
	phpBB/install/database_update.php
	phpBB/install/index.php
2013-07-14 11:34:58 -04:00
..
convertors [ticket/11201] Revert WLM dropping because it is still used in China. 2013-02-04 01:31:43 +01:00
data [ticket/9916] Updating header license and removing Version $Id$ 2011-12-31 13:32:52 +00:00
schemas [ticket/11687] Add assets_version to phpbb_config 2013-07-13 13:10:21 -04:00
database_update.php Merge remote-tracking branch 'upstream/develop' into ticket/11574 2013-07-14 11:34:58 -04:00
index.php Merge remote-tracking branch 'upstream/develop' into ticket/11574 2013-07-14 11:34:58 -04: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 [ticket/11574] Fix various path issues in the updater 2013-07-14 01:06:10 -04:00
phpinfo.php [ticket/9556] Drop php closing tags, add trailing newline 2010-11-11 19:10:55 +01:00