* phpbb/develop: (704 commits)
[ticket/11630] Improvements to the PHP lint pre-commit hook
[feature/auth-refactor] Move auth providers to separate directory
[ticket/11619] Use HTTP/1.0 because of lack of chunked-encoding handling.
[ticket/11619] Some tests for get_remote_file().
[ticket/11617] Remove spaces and tabs from empty lines
[ticket/11617] Missing U_ACTION in acp_captcha.php
[feature/auth-refactor] Fix code style issue
[feature/auth-refactor] Fix comment grammar
[feature/auth-refactor] Fix the actual cause of test failures
[ticket/10838] Fix URL for wiki and remove irrelevant line
[ticket/10838] Remove php 5.4 and builtin server references
[ticket/10838] Fix missing data
[ticket/10838] separate database used mentioned in unit tests
[ticket/11585] Make $auth_admin class property
[feature/auth-refactor] A possible fix for the functional test failures
[ticket/11566] Subsilver template error displayed after table headers
[ticket/11566] Remove extra pair of brackets from conditional statement
[ticket/11566] Check that guest doesn't have reporting permission by default
[ticket/11566] Add captcha to report post template in subsilver
[ticket/11566] Use the new constant CONFIRM_REPORT for captcha init
...
Conflicts:
phpBB/docs/sphinx.sample.conf
phpBB/feed.php
phpBB/styles/prosilver/template/search_results.html
phpBB/styles/prosilver/template/viewforum_body.html
* ticket/11566:
[ticket/11566] Subsilver template error displayed after table headers
[ticket/11566] Remove extra pair of brackets from conditional statement
[ticket/11566] Check that guest doesn't have reporting permission by default
[ticket/11566] Add captcha to report post template in subsilver
[ticket/11566] Use the new constant CONFIRM_REPORT for captcha init
[ticket/11566] Rename var to $visual_confirmation_response
[ticket/11566] Revert forum permission changes
[ticket/11566] Use language variable instead of hardcode
[ticket/11566] add tests for reporting post
[ticket/11566] add captcha reset and hidden fields
[ticket/11566] display error instead of trigger_error
[ticket/11566] add error in template
[ticket/11566] add error functionality
[ticket/11566] add interface for captcha
Conflicts:
phpBB/report.php
# By Vjacheslav Trushkin
# Via Vjacheslav Trushkin
* remotes/cyberalien/feature/editor-code-tabs:
[feature/editor-code-tabs] Make inTag function reusable
[feature/editor-code-tabs] Check for browser support in function
[feature/editor-code-tabs] Apply code editor to everything
[feature/editor-code-tabs] Correctly count indentation on first line
# By Dhruv
# Via Dhruv
* remotes/dhruv/ticket/11303:
[ticket/11303] rename attribute to timezone-preselect
[ticket/11303] remove additional brackets
[ticket/11303] use S_TZ_PRESELECT in subsilver
[ticket/11303] add S_TZ_PRESELECT template var
# By Marc Alexander
# Via Marc Alexander (1) and Nathaniel Guse (1)
* remotes/upstream/develop-olympus:
[ticket/6723] Show info that message has been deleted before delivery
If the message has been deleted before the delivery it will still show in
the message history, although with an empty message. This patch will
change that behavior to showing the info that it has been deleted before
it was delivered in red letters. The red letters ensure that users won't
mistake the info for the actual message.
PHPBB3-6723
# By Matt Friedman
# Via Matt Friedman
* remotes/VSE/ticket/11103-VSEphpbb:
[ticket/11103] Remove padding from notifications for now.
[ticket/11103] Add newlines to bottom of css file
[ticket/11103] HTML encode double arrow character
[ticket/11103] Update styling of UCP Notifications in subsilver2
[ticket/11103] Update styling of UCP Notifications in prosilver
[ticket/11103] Update styling of subsilver2 notification modal
[ticket/11103] Update styling of prosilver notification modal
[ticket/11103] Remove title attribute from notification link
# By Nathan Guse (28) and others
# Via Andreas Fischer (9) and others
* 'develop' of https://github.com/phpbb/phpbb3: (90 commits)
[ticket/11350] Do not pass $db by reference; typehint phpbb_db_driver
[feature/migrations] Remove default values from necessary parameters
[ticket/11201] Revert WLM dropping because it is still used in China.
[ticket/11220] Improvement to the info pop-up from "list="
[feature/migrations] Revert unrelated changes to functions.php
[ticket/11233] prohibit selecting anonymous user as a PM recipient
[ticket/11343] Remove spare parentheses.
[ticket/11343] Remove spare space.
[ticket/11343] Use === when checking stored user_actkey against user input.
[ticket/11295] Correct cases: replace postgres with phpbb_db_driver_postgres.
[ticket/10050] removing prosilver edits
[ticket/9737] Fix some comments
[ticket/11337] Abort setup-webserver.sh script when an error occurs.
[ticket/11337] Only run functional tests on 5.3.19 or higher. No FPM otherwise.
[ticket/11337] Silence nginx config file writing.
[ticket/11337] php-fpm.conf is no longer owned by root.
[ticket/11337] Run functional tests on travis using nginx and php-fpm.
[ticket/11338] Travis CI: Install PHP extension for redis key-value store.
[ticket/10050] adding .topicrow to template condition
[ticket/9737] Fix a few minor things in migrations
...
Conflicts:
phpBB/config/services.yml
phpBB/config/tables.yml
Windows Live Messenger is still in use in china which accounts for ~20% of world
population. Revert WLM dropping which has been merged under the assumption that
WLM data and features are completely useless.
This commit reverts commits
- 460470229d
- 9affd6f7e7
which have been merged by d59431691c.
PHPBB3-11201
# By Oleg Pudeyev (37) and others
# Via Oleg Pudeyev (24) and others
* 'develop' of github.com:phpbb/phpbb3: (179 commits)
[ticket/11323] Add tests for inclusion of defined variables
[ticket/11324] Add PHP 5.5 environment to travis and allow it to fail.
[ticket/11321] Recreate schema files with develop/create_schema_files.php
[ticket/11320] Include functions file as we need phpbb_convert_30_dbms_to_31
[ticket/11313] Use correct object el instead of eel in alt_text callback
[ticket/11301] Guidelines: Add spaces in front and after the / operator.
[ticket/11301] Explicitly cast str offset to int to prevent E_NOTICE on 5.4.
[ticket/11311] Include asset core.js in subsilver2 overall_footer.html
[ticket/10949] Remove not needed comma
[ticket/11309] phpbb_extension_interface::disable_step correct docblock.
[ticket/10949] Converted missing code to new JS coding guidelines
[ticket/11302] Correctly select first timezone or selected timezone
[ticket/11305] Mock container for cache driver in functional create_user()
[ticket/11305] Check for $cache being null before using it in db drivers.
[ticket/10805] Compare phpbbAlertTimer against null
[ticket/11305] Define hook finder as a service on the container.
[ticket/11305] Adjust comment.
[ticket/11305] Use phpbb_create_default_container.
[ticket/11305] Create a normal container during final installation step.
[ticket/11305] Retrieve cache driver from container rather than cache service.
...
Conflicts:
phpBB/install/schemas/firebird_schema.sql
phpBB/install/schemas/mssql_schema.sql
phpBB/install/schemas/mysql_40_schema.sql
phpBB/install/schemas/mysql_41_schema.sql
phpBB/install/schemas/oracle_schema.sql
phpBB/install/schemas/postgres_schema.sql
phpBB/install/schemas/sqlite_schema.sql
phpBB/styles/subsilver2/template/overall_footer.html
