| Commit message (Collapse) | Author | Age | Files | Lines |
|
|
|
| |
PHPBB3-11854
|
|
|
|
| |
PHPBB3-10073
|
|
|
|
| |
PHPBB3-10073
|
|
|
|
|
|
| |
Error pages still contain the email address.
PHPBB3-10073
|
|
|
|
| |
PHPBB3-12594
|
|
|
|
|
|
|
|
|
| |
* 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
|
|
|
|
| |
PHPBB3-10763
|
|
|
|
| |
PHPBB3-11980
|
|
|
|
| |
PHPBB3-11981
|
|\
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
* 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
|
| |
| |
| |
| | |
PHPBB3-11731
|
|/
|
|
| |
PHPBB3-11700
|
|
|
|
| |
PHPBB3-11696
|
|
|
|
|
|
| |
There were a few error messages that a user could experience that would, previously, be without any the ability to be localized. There are some more E_USER_ERRORs that I did not change to a constant, for example the error message that is displayed if there aren't any folders in /language.
PHPBB3-9975
|
|\
| |
| |
| |
| |
| |
| |
| | |
# By Andreas Fischer
# Via Andreas Fischer (1) and Oleg Pudeyev (1)
* develop-olympus:
[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.
|
| |
| |
| |
| | |
PHPBB3-11301
|
| |
| |
| |
| | |
PHPBB3-11301
|
| |
| |
| |
| | |
PHPBB3-11183
|
| |
| |
| |
| | |
PHPBB3-11159
|
|\ \
| | |
| | |
| | |
| | |
| | |
| | | |
* p/ticket/11157:
[ticket/11157] static public is the currently approved order.
[ticket/11157] Fix remaining captcha spam.
[ticket/11157] get_captcha_types is an instance method.
|
| | |
| | |
| | |
| | | |
PHPBB3-11157
|
| | |
| | |
| | |
| | | |
PHPBB3-11157
|
|/ /
| |
| |
| | |
PHPBB3-11159
|
| |
| |
| |
| |
| |
| | |
Added public visibility to the methods
PHPBB3-10575
|
| |
| |
| |
| |
| |
| |
| |
| | |
These changes should solve the strict standards error about accessing
the non-static get_instance() in a non-static way.
For that, I changed the get_instance methods to static methods.
PHPBB3-10575
|
| |
| |
| |
| | |
PHPBB3-9916
|
| |
| |
| |
| |
| |
| |
| | |
There are now extension_ and core_ methods for all finder settings as well as
a generic method which overwrites both.
PHPBB3-10323
|
| |
| |
| |
| |
| |
| |
| | |
The base class for captcha plugins has been renamed, but the old name continues
to exist as an empty subclass of it for backwards compatability.
PHPBB3-10323
|
|\ \
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
* develop: (157 commits)
[ticket/10316] Resolve inconsistent move topic behavior
[ticket/9297] Add network to class name of unit tests.
[ticket/9297] Fix typo in localhost.
[ticket/9297] Rename test class to reflect its contents.
[ticket/9297] Adjust comment - IPv6 is needed for IPv6 connections to work.
[ticket/9297] Fix markTestSkipped call in setUpBeforeClass.
[ticket/9608] Remove use of references in topic_review
[ticket/9297] Skip FTP PASV/EPSV test if FTP connection fails.
[ticket/9297] Separate ipv4 and ipv6 tests into separate functions.
[ticket/9297] Update copyright year of unit test file.
[feature/template-engine] Delete _get_locator function.
[feature/template-engine] Clean up template locator usage in bbcode.
[ticket/9297] Make EPSV unit tests work without IPv6.
[ticket/9297] Unit tests for ftp_fsock PASV and EPSV.
[ticket/9297] Add support for Extended Passive Mode (EPSV) in ftp_fsock class.
[ticket/10312] Un-check the shadow option while moving.
[feature/template-engine] Need to call set_template on template.
[feature/template-engine] Update installer for template engine changes.
[feature/template-engine] Dependency inject locator into template.
[feature/template-engine] Delete useless code from set_template.
...
Conflicts:
phpBB/includes/functions.php
|
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
References are not really needed in PHP due to copy-on-write. Since
PHP5, objects are always passed around as identifiers, which means they
are mutable. So it is no longer required to pass these by reference
either.
PHPBB3-9608
|
| | |
| | |
| | |
| | | |
PHPBB3-9716
|
|/ /
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
Extend the request class with helpers for reading server vars (server())
and HTTP request headers (header()). Refactor the existing code base
to make use of these helpers, make $_SERVER a deactivated super global.
Also introduce an is_ajax() method, which checks the X-Requested-With
header for the value 'XMLHttpRequest', which is sent by JavaScript
libraries, such as jQuery.
PHPBB3-9716
|
|\ \
| |/
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
* develop-olympus:
[ticket/9892] Correct copyright year
[ticket/9892] Remove incorrect use of camel case
[ticket/9892] Removing closing php tag from create_schema_files
[ticket/9892] Transaction support for database update sql execution function
[ticket/9892] count is a keyword in firebird, so renaming this alias
[ticket/9892] Q&A CAPTCHA did not work on firebird, so no need to change config
[ticket/9892] Shorten login_attempt key names to avoid firebird length problems
[ticket/9892] Drop Q&A CAPTCHA tables if left in inconsistent state
[ticket/9892] Adding a number of tests for db_tools
[ticket/9892] Table prefix lengths influence index lengths in db_tools
[ticket/9892] Shorten the index names on the q&a captcha
[ticket/9892] column & index name limits, firebird auto increment in db_tools
Conflicts:
phpBB/develop/create_schema_files.php
|
| |
| |
| |
| | |
PHPBB3-9892
|
|\ \
| |/
| |
| |
| |
| |
| | |
* develop-olympus:
[ticket/10042] GD CAPTCHA: Call phpbb_mt_rand() where required.
[ticket/10042] GD CAPTCHA: Round offset to the next pixel.
[ticket/10042] Add mt_rand() wrapper which allows swapping $min and $max.
|
| |\
| | |
| | |
| | |
| | |
| | |
| | | |
* ticket/bantu/10042:
[ticket/10042] GD CAPTCHA: Call phpbb_mt_rand() where required.
[ticket/10042] GD CAPTCHA: Round offset to the next pixel.
[ticket/10042] Add mt_rand() wrapper which allows swapping $min and $max.
|
| | |
| | |
| | |
| | | |
PHPBB3-10042
|
| | |
| | |
| | |
| | | |
PHPBB3-10042
|
|\ \ \
| |/ /
| | |
| | |
| | |
| | |
| | |
| | | |
* develop-olympus:
[ticket/10170] Fix broken recaptcha verification host.
[ticket/10170] Include www in hostname in language strings.
[ticket/10170] Update language entries
[ticket/10170] reCaptcha API has been moved.
|
| | |
| | |
| | |
| | | |
PHPBB3-10170
|
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
The reCaptcha API has been moved from recaptcha.net to
google.com/recaptcha.
PHPBB3-10170
|
|\ \ \
| |/ /
| | |
| | |
| | | |
* develop-olympus:
[ticket/10112] Replaced a couple occurrences of count() with sizeof()
|
| |/
| |
| |
| |
| |
| | |
As per the coding guidlines, sizeof() should be used instead of count().
PHPBB3-10112
|
| |
| |
| |
| |
| |
| |
| | |
Delete phpbb_default_captcha:delete_code() and phpbb_captcha_qa::delete_code()
methods. We never call it and it has a bogus body.
PHPBB3-9766
|
|\ \
| |/
| |
| |
| |
| | |
* develop-olympus:
[ticket/9985] 3D Wave CAPTCHA: Pass min/max in the correct order to mt_rand().
[ticket/9989] Skip PM popup in overall_header.html, if there are no new PMs.
|
| |
| |
| |
| | |
PHPBB3-9985
|
| |
| |
| |
| | |
PHPBB3-9988
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
There is a phpbb_config class which simply holds an array and does not persist
any data. It implements ArrayAccess, Countable and IteratorAggregate to allow
regular use of configuration as if it was still an array. The phpbb_config_db
class depends on an instance of the dbal and a cache driver. It obtains the
configuration data from cache and database as necessary and persists data to
the database.
The functions set_config and set_config_count remain for backward compatability
but they only call methods on the new config class now instead of directly
manipulating the database and cache.
PHPBB3-9988
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
Closing tags converted using Oleg's script.
remove-php-end-tags.py -a .
Trailing newlines added using the following where $ext is file extension.
find . -type f -name "*.$ext" -print | xargs printf "e %s\nw\n" | ed -s;
Extensions: php, css, html, js, xml.
PHPBB3-9556
|
|\ \
| |/
| |
| |
| |
| | |
* develop-olympus:
[ticket/9804] Account evil3 renamed to igorw, adjust AUTHORS
[ticket/9829] Fix error in recaptcha validation.
|