phpbb/build
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
..
webpi [ticket/9904] Update WebPI Parameters.xml to work with WebMatrix. 2010-11-19 11:27:16 +01:00
build.xml Merge branch 'develop-olympus' into develop 2013-07-13 13:12:28 -04:00
build_changelog.php [ticket/9916] Changing header in non-distributed files 2012-01-02 16:20:30 +00:00
build_diff.php Merge branch 'develop-olympus' into develop 2012-01-02 17:36:21 +01:00
build_helper.php [ticket/9916] Changing header in non-distributed files 2012-01-02 16:20:30 +00:00
compare.sh Merge r10549 into 3.0.7: After generating all packages go through the full installs and make sure the files do not contain any errors [Bug #58255] 2010-02-27 22:08:43 +00:00
diff_class.php [ticket/9916] Changing header in non-distributed files 2012-01-02 16:20:30 +00:00
package.php [ticket/11574] Include vendor into update packages 2013-07-13 09:57:56 +02:00
phpdoc-phpbb.ini [task/phpdoc] Make phpdoctor output quiet instead of verbose. 2011-01-07 14:15:45 +01:00