| Commit message (Collapse) | Author | Age | Files | Lines |
... | |
| |
| |
| |
| | |
PHPBB3-13073
|
| |
| |
| |
| | |
PHPBB3-13073
|
| |
| |
| |
| | |
PHPBB3-13073
|
| |
| |
| |
| | |
PHPBB3-13073
|
| |
| |
| |
| | |
PHPBB3-13073
|
|\ \
| |/ |
|
| |
| |
| |
| | |
PHPBB3-13036
|
| |
| |
| |
| | |
PHPBB3-13036
|
|\ \
| |/ |
|
| |
| |
| |
| | |
PHPBB3-13034
|
| |
| |
| |
| | |
PHPBB3-13034
|
|\ \
| |/
| |
| |
| |
| |
| |
| |
| |
| | |
* develop-ascraeus:
[ticket/12932] Remove set_datetime_class method from user class
[ticket/12932] Fix tests and calls to create_datetime
[ticket/12932] Add method for getting the datetime class and allow overriding
Conflicts:
phpBB/config/services.yml
|
| |
| |
| |
| | |
PHPBB3-12932
|
|/
|
|
| |
PHPBB3-11649
|
|
|
|
| |
PHPBB3-12099
|
|
|
|
| |
PHPBB3-12099
|
|
|
|
| |
PHPBB3-12508
|
|
|
|
| |
PHPBB3-12508
|
|
|
|
| |
PHPBB3-12508
|
|
|
|
| |
PHPBB3-12594
|
|
|
|
| |
PHPBB3-12529
|
|
|
|
| |
PHPBB3-12529
|
|
|
|
| |
PHPBB3-11497
|
|
|
|
| |
PHPBB3-11497
|
|
|
|
| |
PHPBB3-11497
|
|
|
|
| |
PHPBB3-12480
|
|
|
|
| |
PHPBB3-12480
|
|
|
|
| |
PHPBB3-12090
|
|
|
|
| |
PHPBB3-12090
|
|
|
|
| |
PHPBB3-12090
|
|
|
|
| |
PHPBB3-12090
|
|
|
|
| |
PHPBB3-12090
|
|
|
|
| |
PHPBB3-11948
|
|
|
|
| |
PHPBB3-11948
|
|
|
|
| |
PHPBB3-11948
|
|
|
|
| |
PHPBB3-11852
|
|
|
|
| |
PHPBB3-11700
|
|
|
|
|
|
|
| |
class loader now expects all classes to be prefixed with a backslash
when resolving paths
PHPBB3-11700
|
|
|
|
| |
PHPBB3-11700
|
|\
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
* github-phpbb/develop:
[ticket/11832] Correct paths in tests
[ticket/11832] Correct ROOT_PATH variable
[ticket/11832] get_url() from phpbb_template_asset should return web path
[ticket/11832] Fix INCLUDE(JS/CSS)
[ticket/11832] Fix constructions of phpbb_filesystem
[ticket/11832] Fix smiley paths
[ticket/11832] Create phpbb_symfony_request to handle initiating symfony_request
[ticket/11832] Fix build_url and the S_LOGIN_ACTION
[ticket/11832] Changing comments to say app.php rather than index.php
[ticket/11832] We must instantiate the $phpbb_filesystem in common
[ticket/11832] Fix the web path corrections
[ticket/11832] More extensive testing
[ticket/11832] Use dirname(__FILE__)
[ticket/11832] Use $phpbb_filesystem instead of the container in append_sid
Revert "[ticket/11832] Make $phpbb_container a global initiated by the framework"
[ticket/11832] Make $phpbb_container a global initiated by the framework
[ticket/11832] Fix log tests
[ticket/11832] update_web_root_path helper and tests
[ticket/11832] Inject dependencies for phpbb_get_web_root_path (also moving)
Conflicts:
phpBB/common.php
phpBB/config/services.yml
phpBB/includes/bbcode.php
phpBB/includes/functions.php
phpBB/includes/functions_messenger.php
phpBB/install/index.php
phpBB/phpbb/filesystem.php
phpBB/phpbb/template/twig/environment.php
phpBB/phpbb/template/twig/node/includeasset.php
phpBB/phpbb/template/twig/twig.php
tests/controller/helper_url_test.php
tests/dbal/migrator_test.php
tests/extension/manager_test.php
tests/extension/metadata_manager_test.php
tests/filesystem/clean_path_test.php
tests/mock/extension_manager.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-11832
|
|\ \
| |/
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
* 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
|
| |
| |
| |
| | |
PHPBB3-11824
|
| |
| |
| |
| | |
PHPBB3-11215
|
| |
| |
| |
| | |
PHPBB3-11628
|
| |
| |
| |
| |
| |
| | |
No longer used since Twig was implemented.
PHPBB3-11628
|
|/
|
|
| |
PHPBB3-11700
|
|
|
|
| |
PHPBB3-11698
|