Joas Schilling 42c062cedf Merge branch 'develop' of https://github.com/phpbb/phpbb3 into feature/softdelete-1-permission ... * 'develop' of https://github.com/phpbb/phpbb3: (480 commits) [ticket/6723] Show info that message has been deleted before delivery [ticket/11385] Fix issue with migration module tool not getting extension module info [ticket/11386] Fix failing tests from constructor changes [ticket/11386] Fix circular reference error & serialize error [ticket/11386] Remove tests that check if finder cache is working [ticket/11386] Forgot to get the migration classes [ticket/11386] Update tests with new constructors for ext.manager/migrator [ticket/11386] Use finder to find migration files [ticket/11363] Fix to make get_module_infos get from all extensions [ticket/11381] Make finder able to search in all available extensions [ticket/11103] Revert whitespace changes [ticket/11103] Few more minor language things [ticket/11103] Don't call generate_board_url many times [ticket/11103] Case time in queries as an int [ticket/11103] Fix effectively installed check [ticket/11103] Remove padding from notifications for now. [ticket/11363] Fix a couple bugs and throw errors if the file not found [ticket/11372] Migrator should only check if effectively installed if not [ticket/11363] Load module info files for extensions too [ticket/11103] Notifications Migration file ... Conflicts: phpBB/includes/functions_posting.php phpBB/includes/mcp/mcp_queue.php phpBB/includes/search/fulltext_mysql.php phpBB/includes/search/fulltext_native.php phpBB/includes/search/fulltext_postgres.php phpBB/includes/search/fulltext_sphinx.php phpBB/install/database_update.php phpBB/styles/prosilver/template/ajax.js		2013-03-03 20:06:52 +01:00
..
adm	[feature/migrations] Catch and display errors from the migrator	2013-02-09 21:09:29 -06:00
assets/javascript	[ticket/11103] Only lookup $(target) once	2013-01-15 12:30:26 -06:00
cache	[ticket/9520] Removed per directory web.config files.	2010-05-03 19:31:40 +02:00
config	[ticket/11386] Fix circular reference error & serialize error	2013-03-02 14:15:59 -06:00
develop	Merge branch 'develop' of https://github.com/phpbb/phpbb3 into feature/softdelete-1-permission	2013-03-03 20:06:52 +01:00
docs	Merge branch 'develop-olympus' into develop	2013-02-24 17:37:38 +01:00
download	[ticket/11306] Introduce phpbb_create_default_container	2013-01-02 06:41:35 +01:00
files	[ticket/9520] Removed per directory web.config files.	2010-05-03 19:31:40 +02:00
images	[ticket/9520] Removed per directory web.config files.	2010-05-03 19:31:40 +02:00
includes	Merge branch 'develop' of https://github.com/phpbb/phpbb3 into feature/softdelete-1-permission	2013-03-03 20:06:52 +01:00
install	Merge branch 'develop' of https://github.com/phpbb/phpbb3 into feature/softdelete-1-permission	2013-03-03 20:06:52 +01:00
language	Merge branch 'develop' of https://github.com/phpbb/phpbb3 into feature/softdelete-1-permission	2013-03-03 20:06:52 +01:00
store	[ticket/9520] Removed per directory web.config files.	2010-05-03 19:31:40 +02:00
styles	Merge branch 'develop' of https://github.com/phpbb/phpbb3 into feature/softdelete-1-permission	2013-03-03 20:06:52 +01: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/11305] Define hook finder as a service on the container.	2013-01-02 01:36:50 -05:00
composer.json	[ticket/11238] Set goutte version to 0.1.0.	2012-12-02 23:44:49 -05:00
composer.lock	[ticket/11238] Set goutte version to 0.1.0.	2012-12-02 23:44:49 -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	Merge branch 'develop' of https://github.com/phpbb/phpbb3 into feature/softdelete-1-permission-rebase	2012-12-20 22:51:38 +01:00
index.php	[ticket/11103] Instantiate $phpbb_notifications as needed	2012-12-13 19:19:40 -06:00
mcp.php	[feature/soft-delete] Fix the rest of *_approved and the delete_post unit test	2012-11-10 11:24:52 +01:00
memberlist.php	Merge branch 'develop' of https://github.com/phpbb/phpbb3 into feature/softdelete-1-permission	2013-03-03 20:06:52 +01:00
posting.php	Merge branch 'develop' of https://github.com/phpbb/phpbb3 into feature/softdelete-1-permission-rebase	2012-12-20 22:51:38 +01:00
report.php	Merge branch 'develop' of github.com:phpbb/phpbb3 into ticket/11103	2013-01-15 11:31:39 -06:00
search.php	Merge remote-tracking branch 'remotes/phpbb/develop' into feature/softdelete-merge-develop	2012-11-10 12:27:19 +01:00
ucp.php	[ticket/10679] Use module_auth to limit access to the module	2012-12-06 16:33:12 +01:00
viewforum.php	Merge branch 'develop' of https://github.com/phpbb/phpbb3 into feature/softdelete-1-permission-rebase	2012-12-20 22:51:38 +01:00
viewonline.php	[ticket/11259] adm_relative_path -> phpbb_adm_relative_path	2012-12-09 19:29:51 -06:00
viewtopic.php	[ticket/11201] Revert WLM dropping because it is still used in China.	2013-02-04 01:31:43 +01:00
web.config	[feature/controller] Remove URL rewriting by default	2012-11-16 17:06:02 -05:00