| Commit message (Collapse) | Author | Age | Files | Lines |
|
|
|
| |
PHPBB3-11980
|
|
|
|
|
|
|
| |
Config variable: load_jquery_cdn -> allow_cdn
Template variable: S_JQUERY_FALLBACK -> S_ALLOW_CDN
PHPBB3-11703
|
|\
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
* 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-11824
|
| | |
| | |
| | |
| | | |
PHPBB3-11824
|
| |\ \
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
# 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
...
|
| | | |
| | | |
| | | |
| | | | |
PHPBB3-11673
|
| | |/
| | |
| | |
| | | |
PHPBB3-11673
|
| |/
| |
| |
| | |
PHPBB3-11373
|
| |
| |
| |
| | |
PHPBB3-11700
|
|/
|
|
| |
PHPBB3-11700
|
|\
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
# By Joseph Warner
# Via Joseph Warner
* remotes/Hardolaf/ticket/11626:
[ticket/11626] Remove last reference to template in ldap
[ticket/11626] Remove LDAP dependency on template
[ticket/11626] Make identifier uppercase per style requirements
[ticket/11626] Change the identifier template file in the template
[ticket/11626] Call method only one time per provider
[ticket/11626] Change interface to match functionality
[ticket/11626] Include the template file in acp_board
[ticket/11626] LDAP Auth ACP Template File
[ticket/11626] Create get_acp_template method for auth providers
|
| |
| |
| |
| |
| |
| | |
Returns template vars rather than requiring the template.
PHPBB3-11626
|
| |
| |
| |
| | |
PHPBB3-11626
|
| |
| |
| |
| | |
PHPBB3-11626
|
| |
| |
| |
| | |
PHPBB3-11626
|
| |
| |
| |
| |
| |
| |
| | |
Changes the interface so that it matches the new functionality of
phpbb_provider_auth_interface::acp().
PHPBB3-11626
|
| |
| |
| |
| | |
PHPBB3-11626
|
| |
| |
| |
| | |
PHPBB3-9734
|
|/
|
|
| |
PHPBB3-9734
|
|
|
|
| |
PHPBB3-9734
|
|
|
|
| |
PHPBB3-9734
|
|
|
|
| |
PHPBB3-9734
|
|
|
|
| |
PHPBB3-9734
|
|
|
|
|
|
| |
Fixes errors introduced by the last several commits.
PHPBB3-9734
|
|
|
|
| |
PHPBB3-9734
|
|
|
|
|
|
|
|
| |
Changes the acp_board code to directly call the auth providers out
of the $auth_providers variable that is populated by the
phpbb_container.
PHPBB3-9734
|
|
|
|
| |
PHPBB3-9734
|
|
|
|
|
|
|
| |
Removes what is hopefully the last references to the old auth
plugins in the code base.
PHPBB3-9734
|
|
|
|
|
|
|
| |
Refactors all loading of auth providers to use services instead of
directly calling the class.
PHPBB3-9734
|
|
|
|
|
|
|
|
|
|
| |
Partially refactors acp_board for the new authentication interface.
Leaves some questionable if statements in the file.
Modifies the interface to correctly impletment the acp() method.
Modifies each provider to comply with the above mentioned interface
modification.
PHPBB3-9734
|
|
|
|
| |
PHPBB3-11010
|
|
|
|
| |
PHPBB3-11010
|
|
|
|
| |
PHPBB3-11010
|
|
|
|
| |
PHPBB3-11010
|
|
|
|
| |
PHPBB3-11010
|
|
|
|
| |
PHPBB3-11010
|
|
|
|
| |
PHPBB3-11010
|
|
|
|
| |
PHPBB3-11010
|
|
|
|
| |
PHPBB3-10325
|
|
|
|
| |
PHPBB3-10325
|
| |
|
| |
|
|\
| |
| |
| |
| | |
Conflicts:
phpBB/install/database_update.php
|
| |\
| | |
| | |
| | |
| | | |
Conflicts:
phpBB/install/database_update.php
|
| | |\
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
* develop-olympus:
[ticket/10896] Move EMAIL_INVALID_EMAIL to common, replace EMAIL_INVALID
[ticket/10896] Adds email validation to email settings in ACP
Conflicts:
phpBB/adm/index.php
phpBB/language/en/common.php
phpBB/language/en/ucp.php
|
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
Adds a new validation type to the ACP validate_config_vars function
and implements it on the board_contact and board_email settings.
PHPBB3-10896
|
| |/ /
| | |
| | |
| | | |
PHPBB3-11103
|
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
The phpbb_user object might be used for language variables. Pass it as a
function argument to prepare_form_acp() instead of using globals.
PHPBB3-10018
|