[ticket/11854] Move captcha stuff to phpbb/ and use DI for plugins

2014-08-10T23:15:49+00:00

PHPBB3-11854

[ticket/10073] Deduplicate the if statement

2014-05-29T00:14:40+00:00

PHPBB3-10073

[ticket/10073] Fallback to board_contact when contact page is disabled

2014-05-29T00:14:39+00:00

PHPBB3-10073

[ticket/10073] Replace board_contact mail with links to contact page

2014-05-29T00:14:28+00:00

Error pages still contain the email address.

PHPBB3-10073

[ticket/12594] Remove @package tags and update file headers

2014-05-27T18:51:13+00:00

PHPBB3-12594

[ticket/12458] Apply Squiz.WhiteSpace.SuperfluousWhitespace.* to legacy code.

2014-04-29T15:51:21+00:00

* There MUST NOT be trailing whitespace at the end of lines.
* There MUST NOT be whitespace before the first content of a file.
* There MUST NOT be whitespace after the last content of a file.
* Functions MUST NOT contain multiple empty lines in a row.

PHPBB3-12458

[ticket/10763] Fix static calls to non static methods in colour_manager

2014-03-09T20:42:59+00:00

PHPBB3-10763

[task/code-sniffer] Replace spaces with tabs.

2013-10-30T12:37:29+00:00

PHPBB3-11980

[ticket/11981] Fix code sniffer complaints

2013-10-28T22:05:46+00:00

PHPBB3-11981

Merge remote-tracking branch 'github-phpbb/develop' into ticket/11700

2013-09-15T23:24:05+00:00

* github-phpbb/develop: (586 commits)
  [ticket/11735] Display disabled checkbox in subsilver for read notifications
  [ticket/11735] Display disabled checkbox when notification is already read
  [ticket/11844] update acp/authentication language var
  [ticket/11795] Remove PM popup
  [ticket/11795] Remove outdated comment from forum_fn.js
  [ticket/11795] Move find user JS to forum_fn
  [ticket/11795] Replace TWIG with phpBB syntax in ACP
  [ticket/11795] Move MSN scripts to forum_fn.js
  [ticket/11795] Use phpBB template syntax instead of TWIG
  [ticket/11795] Move PM popup JS to forum_fn.js
  [ticket/11795] Get rid of pagination JS variables
  [ticket/11795] Get rid of onload_functions
  [ticket/11795] Use data-reset-on-edit attr to reset elements
  [ticket/11795] Redo form elements auto-focus
  [ticket/11811] Remove outline on :focus
  [ticket/11836] Fix subsilver fatal error
  [ticket/11837] Replace escaped single quote with utf-8 single quote
  [ticket/11836] Fix fatal error on unsupported provider for auth link
  [ticket/11837] Translate UCP_AUTH_LINK_NOT_SUPPORTED
  [ticket/11809] Ensure code.js is first script included after jQuery
  ...

Conflicts:
	phpBB/config/services.yml
	phpBB/develop/create_schema_files.php
	phpBB/develop/mysql_upgrader.php
	phpBB/download/file.php
	phpBB/includes/bbcode.php
	phpBB/includes/functions_container.php
	phpBB/install/database_update.php
	phpBB/install/index.php
	phpBB/phpbb/controller/helper.php
	phpBB/phpbb/controller/resolver.php
	phpBB/phpbb/request/request_interface.php
	phpBB/phpbb/session.php
	phpBB/phpbb/style/extension_path_provider.php
	phpBB/phpbb/style/path_provider.php
	phpBB/phpbb/style/path_provider_interface.php
	phpBB/phpbb/style/resource_locator.php
	phpBB/phpbb/style/style.php
	phpBB/phpbb/template/locator.php
	phpBB/phpbb/template/template.php
	phpBB/phpbb/template/twig/node/includeasset.php
	phpBB/phpbb/template/twig/node/includecss.php
	phpBB/phpbb/template/twig/node/includejs.php
	phpBB/phpbb/template/twig/twig.php
	tests/controller/helper_url_test.php
	tests/di/create_container_test.php
	tests/extension/style_path_provider_test.php
	tests/notification/notification_test.php
	tests/session/continue_test.php
	tests/session/creation_test.php
	tests/template/template_events_test.php
	tests/template/template_test_case.php
	tests/template/template_test_case_with_tree.php
	tests/test_framework/phpbb_functional_test_case.php

forums/phpBB/includes/captcha, branch master