phpbb/phpBB/includes/mcp
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
..
info [feature/soft-delete] Add module for soft deleted topics 2012-10-15 15:53:32 +02:00
mcp_ban.php [ticket/9916] Updating header license and removing Version $Id$ 2011-12-31 13:32:52 +00:00
mcp_forum.php Merge branch 'develop' of https://github.com/phpbb/phpbb3 into feature/softdelete-1-permission-rebase 2012-12-20 22:51:38 +01:00
mcp_front.php Merge remote-tracking branch 'remotes/phpbb/develop' into feature/softdelete-merge-develop 2012-11-10 12:27:19 +01:00
mcp_logs.php [ticket/11023] Fix additional whitespaces that were added by PHPBB3-10968 2012-10-17 23:34:37 +02:00
mcp_main.php Merge branch 'develop' of https://github.com/phpbb/phpbb3 into feature/softdelete-1-permission-rebase 2012-12-20 22:51:38 +01:00
mcp_notes.php [ticket/11023] Fix additional whitespaces that were added by PHPBB3-10968 2012-10-17 23:34:37 +02:00
mcp_pm_reports.php Merge branch 'develop' of github.com:phpbb/phpbb3 into ticket/11103 2013-01-15 11:31:39 -06:00
mcp_post.php [feature/soft-delete] Lay the groundwork for a soft-delete feature 2012-08-29 17:49:37 +02:00
mcp_queue.php Merge branch 'develop' of https://github.com/phpbb/phpbb3 into feature/softdelete-1-permission 2013-03-03 20:06:52 +01:00
mcp_reports.php Merge branch 'develop' of https://github.com/phpbb/phpbb3 into feature/softdelete-1-permission 2013-03-03 20:06:52 +01:00
mcp_topic.php Merge branch 'develop' of https://github.com/phpbb/phpbb3 into feature/softdelete-1-permission-rebase 2012-12-20 22:51:38 +01:00
mcp_warn.php [ticket/11023] Fix additional whitespaces that were added by PHPBB3-10968 2012-10-17 23:34:37 +02:00