1
0
mirror of https://github.com/phpbb/phpbb.git synced 2025-02-25 04:23:38 +01:00

5 Commits

Author SHA1 Message Date
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
Igor Wiedler
1dea0286a4 [ticket/11574] Use alternate DI config file for updater
PHPBB3-11574
2013-07-13 09:57:57 +02:00
Igor Wiedler
1a5d685f45 [feature/bootstrap-dic] Bootstrap container from config.php
PHPBB3-11651
2013-07-11 18:04:40 -04:00
Igor Wiedler
0fd3bb170b [ticket/11015] Fixup some things from the big merge
PHPBB3-11015
2012-11-12 11:16:39 +01:00
Igor Wiedler
1bf7f0bde7 [ticket/11152] Basic tests for the container functions
PHPBB3-11152
2012-11-11 17:56:09 +01:00