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
..
adm	[ticket/11675] Fix template loop	2013-07-13 16:25:08 -05:00
assets/javascript	Merge remote-tracking branch 'remotes/cyberalien/feature/editor-code-tabs' into develop	2013-06-06 14:07:27 -05:00
cache
config	[ticket/11696] Rename db_tools.php so it can be autoloaded	2013-07-14 10:10:05 -04:00
develop	Merge remote-tracking branch 'phpbb/develop' into feature/softdelete-1-permission	2013-07-11 11:41:48 +02:00
docs	Merge branch 'develop-olympus' into develop	2013-07-13 19:30:57 +02:00
download	[ticket/10820] fix if condition to check for IE	2013-06-14 00:29:06 +05:30
files
images
includes	Merge remote-tracking branch 'upstream/develop' into ticket/11574	2013-07-14 11:34:58 -04:00
install	Merge remote-tracking branch 'upstream/develop' into ticket/11574	2013-07-14 11:34:58 -04:00
language	Merge branch 'develop-olympus' into develop	2013-07-13 13:16:58 -04:00
phpbb	Merge remote-tracking branch 'upstream/develop' into ticket/11574	2013-07-14 11:34:58 -04:00
store
styles	Merge pull request #1429 from cyberalien/ticket/11553	2013-07-13 14:20:23 -07: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	[ticket/11698] Moving all autoloadable files to phpbb/	2013-07-14 01:32:34 -04:00
composer.json	Merge branch 'develop-olympus' into develop	2013-07-13 10:28:02 -05:00
composer.lock	Merge branch 'develop-olympus' into develop	2013-07-13 10:28:02 -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/11481] Move prepended slash from calls into function	2013-06-06 20:35:38 +02:00
index.php	[ticket/11103] Instantiate $phpbb_notifications as needed	2012-12-13 19:19:40 -06:00
mcp.php	[ticket/9657] Use the service instead of the static class	2013-07-11 14:24:07 +02:00
memberlist.php	Merge remote-tracking branch 'phpbb/develop' into feature/softdelete-1-permission	2013-07-11 11:41:48 +02:00
posting.php	[ticket/9657] Use the service instead of the static class	2013-07-11 14:24:07 +02:00
report.php	Merge branch 'ticket/11566' into ticket/11566-develop	2013-07-01 23:25:29 +05:30
search.php	[ticket/9657] Use the service instead of the static class	2013-07-11 14:24:07 +02:00
ucp.php	[ticket/11685] Remove logout confirmation page	2013-07-13 12:27:00 -04:00
viewforum.php	[ticket/11702] Fix forum_posts left over for link-click counts in viewforum.php	2013-07-14 10:49:23 -04:00
viewonline.php	[ticket/11259] adm_relative_path -> phpbb_adm_relative_path	2012-12-09 19:29:51 -06:00
viewtopic.php	Merge remote-tracking branch 'phpbb/develop' into ticket/9657	2013-07-13 09:36:24 -04:00
web.config	[feature/controller] Remove URL rewriting by default	2012-11-16 17:06:02 -05:00