| Commit message (Collapse) | Author | Age | Files | Lines |
... | |
|\
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
develop-ascraeus
* github-nickvergessen/ticket/12282:
[ticket/12282] Update new references
[ticket/12282] Update container db mock
[ticket/12282] Add new line at EOF of the interface
[ticket/12282] Use interface for type hinting
[ticket/12282] Use {@inheritDoc} for inherited methods
[ticket/12282] Add Interface for DBAL drivers
|
| |
| |
| |
| | |
PHPBB3-12282
|
|\ \
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
# By Joas Schilling
# Via Joas Schilling
* nickvergessen/ticket/12349:
[ticket/12349] Fix Sniffer for @license tag
[ticket/12349] Update license header in several new files
|
| |/
| |
| |
| | |
PHPBB3-12349
|
|\ \
| |/
|/|
| |
| |
| |
| |
| |
| |
| | |
* Elsensee/ticket/7707:
[ticket/7707] Fix undefined variable: perm_from
[ticket/7707] Add comma to last entry of arrays
[ticket/7707] Remove unnecessary variables
[ticket/7707] Add get_username_string() once more
[ticket/7707] Remove unnecessary variables
[ticket/7707] Add get_username_string() where possible
|
| |
| |
| |
| | |
PHPBB3-7707
|
|\ \
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
* prototech/ticket/11959:
[ticket/11959] Move phpbb_generate_string_list() to functions_content.php.
[ticket/11959] Add unit tests.
[ticket/11959] Remove use of plurals and make it possible to use Oxford comma.
[ticket/11959] Rename phpbb_gen_string_list() & fix incorrect var name.
[ticket/11959] Simplify how the users are trimmed.
[ticket/11959] Add function to create a string list.
[ticket/11959] Add samples for the untrimmed strings.
[ticket/11959] List the last user with "and" instead of a comma.
[ticket/11959] Use the plurals system for the untrimmed language strings.
[ticket/11959] Fix the NOTIFICATION_QUOTE_TRIMMED text.
[ticket/11959] Use plurals for the language strings.
|
| | |
| | |
| | |
| | | |
PHPBB3-11959
|
| | |
| | |
| | |
| | | |
PHPBB3-11959
|
| | |
| | |
| | |
| | | |
PHPBB3-11959
|
| | |
| | |
| | |
| | | |
PHPBB3-11959
|
| |/
| |
| |
| | |
PHPBB3-11959
|
|/
|
|
| |
PHPBB3-12317
|
|
|
|
| |
PHPBB3-12256
|
|
|
|
| |
PHPBB3-12192
|
|
|
|
| |
PHPBB3-12032
|
|
|
|
| |
PHPBB3-12034
|
|\
| |
| | |
[ticket/11959] Trim the list of users from post notifications.
|
| |
| |
| |
| | |
PHPBB3-11959
|
| |
| |
| |
| | |
PHPBB3-11959
|
| |
| |
| |
| | |
PHPBB3-11959
|
|/
|
|
|
|
|
| |
The link used for the latest post now uses view=unread so redirecting the user
using the value for the e parameter is no longer necessary.
PHPBB3-11484
|
|
|
|
| |
PHPBB3-12008
|
|
|
|
| |
PHPBB3-11746
|
|\
| |
| | |
[ticket/11746] Add "admin activation required" notification.
|
| |
| |
| |
| | |
PHPBB3-11746
|
| |
| |
| |
| | |
PHPBB3-11980
|
| |
| |
| |
| | |
PHPBB3-11980
|
|/
|
|
| |
PHPBB3-11981
|
|
|
|
| |
PHPBB3-11919
|
|\
| |
| | |
[ticket/11786] Fix various defects in PHPDoc in-code documentation
|
| |\ |
|
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
Further improve wording in phpbb/notification/type/quote.php per suggestion of
imkingdavid.
PHPBB3-11786
|
| | |
| | |
| | |
| | |
| | |
| | | |
The notification system contained two PHPDoc lines that needed improvement.
PHPBB3-11786
|
| | |
| | |
| | |
| | | |
PHPBB3-11700
|
| | |
| | |
| | |
| | | |
PHPBB3-11700
|
| | |
| | |
| | |
| | | |
PHPBB3-11700
|
| | |
| | |
| | |
| | | |
PHPBB3-11700
|
|\ \ \
| | |/
| |/|
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
* 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
|
| |\ \
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
# By Joseph Warner (188) and others
# Via Andreas Fischer (41) and others
* 'develop' of github.com:phpbb/phpbb3: (435 commits)
[ticket/11745] Correct language, coding guidelines
[ticket/11828] Fix greedy operators in lexer
[ticket/11835] Fix ucp_auth_link adding in migration
[prep-release-3.0.12] Remove changelog entry for ticket that was not resolved.
[ticket/develop/11832] Fix path detection
[ticket/11833] Prevent Twig errors from invalid template loops using BEGINELSE
[ticket/11833] Fix bad template loop
[feature/oauth] Fix tabindex
[ticket/11816] !$DOESNT_EXIST test
[ticket/9550] Add the core.viewtopic_post_rowset_data event to viewtopic.php
[ticket/11829] Use report_closed to determine status in MCP report_details
[ticket/11825] Move schema_data.php into includes/ instead of phpbb/
[ticket/11215] Remove unnecessary comment
[ticket/11755] MySQL upgrader out of date
[prep-release-3.0.12] Update Changelog for 3.0.12-RC3 release.
[prep-release-3.0.12] Bumping version number for 3.0.12-RC3.
[ticket/11823] Set up nginx server to match PHP files with characters after .php
[ticket/11812] Fix empty define
[ticket/11818] Update Symfony dependencies to 2.3.*
[feature/oauth] Fix bug on ucp_auth_link related to error display
...
|
| | |\ \
| | | | |
| | | | | |
Group join approved notification
|
| | | | |
| | | | |
| | | | |
| | | | | |
PHPBB3-11745
|
| | | | |
| | | | |
| | | | |
| | | | | |
PHPBB3-11745
|
| | |/ /
| | | |
| | | |
| | | | |
PHPBB3-11744
|
| | | |
| | | |
| | | |
| | | | |
PHPBB3-11744
|
| | |/
| | |
| | |
| | | |
PHPBB3-11744
|
| |/
| |
| |
| | |
PHPBB3-11373
|
| |
| |
| |
| | |
PHPBB3-11700
|
| |
| |
| |
| | |
PHPBB3-11700
|
| |
| |
| |
| | |
PHPBB3-11700
|