| Commit message (Collapse) | Author | Age | Files | Lines |
| ... | |
| | | | | |
| | | | |
| | | | |
| | | | | |
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
|
| | |\ \ \ \
| | |_|/ /
| |/| | /
| | | |/
| | |/|
| | | |
| | | |
| | | |
| | | | |
* remotes/upstream/develop-olympus:
[ticket/11831] getAttribute was replaced with attr
[ticket/11831] Update fabpot/goutte to 1.0.*
Conflicts:
phpBB/composer.lock
|
| | | | |
| | | |
| | | |
| | | | |
PHPBB3-11831
|
| | |\ \ \
| | |_|/
| |/| | |
[ticket/11744] Group join request notification
|
| | | | |
| | | |
| | | |
| | | | |
PHPBB3-11744
|
| | | | |
| | | |
| | | |
| | | | |
PHPBB3-11744
|
| | |\ \ \
| | |/ /
| |/| /
| | |/
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
* develop-olympus:
[ticket/11775] Fix doc blocks syntax
[ticket/11775] Remove spaces at line ends
[ticket/11775] Split test into multiple steps
[ticket/11775] Add functional test for moving the last post
[ticket/11775] Backport moving of the posting functions to 3.0
[ticket/11775] Fix error when moving the last post to another topic
Conflicts:
tests/test_framework/phpbb_functional_test_case.php
|
| | | |\
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
* prep-release-3.0.12:
[ticket/11775] Fix doc blocks syntax
[ticket/11775] Remove spaces at line ends
[ticket/11775] Split test into multiple steps
[ticket/11775] Add functional test for moving the last post
[ticket/11775] Backport moving of the posting functions to 3.0
[ticket/11775] Fix error when moving the last post to another topic
|
| | | | |
| | | |
| | | |
| | | | |
PHPBB3-11775
|
| | | | |
| | | |
| | | |
| | | | |
PHPBB3-11775
|
| | | | |
| | | |
| | | |
| | | | |
PHPBB3-11775
|
| | |\ \ \
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
* asperous/ticket/11620: (46 commits)
[ticket/11620] Whitespace and combine function into test_case
[ticket/11620] Move check_ban_test functions to setUp/tearDown for clarity
[ticket/11620] Changed incorrect global variable
[ticket/11620] Minor indentation changes and comment clarity
[ticket/11620] Expected and actual test conditions wrongly swapped
[ticket/11620] Space between . in directory import concatenation
[ticket/11620] Changes to match merge
[ticket/11620] Changes for code guidelines consistency
[ticket/11620] Fix a static calls to non-static for session captcha
[ticket/11620] Cleanup creation_test that was renamed on a cherry-pick
[ticket/11620] Update auth_provider for new interface
[ticket/11620] Added garbage_collection_test
[ticket/11620] Fixed check_ban_test errors with cache and ban warning message
[ticket/11620] Fixed a typo on check_ban_test
[ticket/11620] Refactored check_isvalid_test to use session_test_case
[ticket/11615] Refactored isvalid test to be more imperative
[ticket/11615] Rename continue -> check_isvalid for clarity
[ticket/11620] Added a test for checking if users are banned
[ticket/11620] Remove typo in beginning of session_key_test
[ticket/11620] Typo in file name session_key_tests -> test
...
|
| | | | | |
| | | | |
| | | | |
| | | | | |
PHPBB3-11620
|
| | | |\ \ \ |
|
| | | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
When defining a database test case with a setUp function, it is important
to call the parent's setup function, because that is when the database is setup.
PHPBB3-11620
|
| | | |/ / /
| |/| | |
| | | | |
| | | | | |
PHPBB3-11733
|
| | | | | |
| | | | |
| | | | |
| | | | | |
PHPBB3-11700
|
| | | | | |
| | | | |
| | | | |
| | | | | |
PHPBB3-11700
|
| |/ / / /
| | | |
| | | |
| | | | |
PHPBB3-11700
|
| |\ \ \ \
| | |/ /
| |/| |
| | | |
| | | | |
* develop-olympus:
[ticket/11686] Not checking for phpBB Debug errors on functional tests
|
| | | |/
| |/|
| | |
| | | |
PHPBB3-11686
|
| | | |
| | |
| | |
| | | |
PHPBB3-10772
|
| |\ \ \
| | | |
| | | | |
[ticket/11684] Remove useless confirmation page after login and admin login
|
| | | | |
| | | |
| | | |
| | | | |
PHPBB3-11684
|
| |\ \ \ \
| | | | |
| | | | | |
[ticket/11685] Remove logout confirmation page
|
| | |/ / /
| | | |
| | | |
| | | | |
PHPBB3-11685
|
| |\ \ \ \
| |/ / /
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
* phpbb/develop: (216 commits)
[ticket/11626] Remove last reference to template in ldap
[ticket/11626] Remove LDAP dependency on template
[develop-olympus] Increment version number to 3.0.13-dev.
[develop-olympus] Add changelog for 3.0.12 release.
[develop-olympus] Bump version numbers for 3.0.12-RC1 release.
[develop-olympus] Bumping version numbers to final for 3.0.12 releases.
[ticket/11669] Fix PHP bug #55124 (recursive mkdir on /./)
[ticket/11668] Run lint test at the end of the test suite
[ticket/11548] Fix test errors in groups test on develop
[ticket/11548] Check upload avatar URL the same way as in phpBB 3.0
[ticket/11548] Fix incorrect usage of array_map on acp groups page
[ticket/11665] Fix test class name
[ticket/11664] Stop creating php.html file in root path in tests
[ticket/11665] Can't change file names already sent to set_filenames
[ticket/11662] Typos: occured -> occurred
[ticket/11662] Typos: occured -> occurred
[ticket/11660] Fix bugs from bugs in #11651 (missing vars, db->sql_connect)
[feature/auth-refactor] Add parent::setUp() in setUp()
[feature/auth-refactor] Changes
[feature/auth-refactor] DataProvider for acp_board test
...
|
| | | | |
| | | |
| | | |
| | | | |
PHPBB3-11669
|
| | |\ \ \
| | |/ /
| | | /
| | |/
| |/|
| | |
| | |
| | |
| | |
| | |
| | | |
# By Vjacheslav Trushkin
# Via Nathaniel Guse (1) and Vjacheslav Trushkin (1)
* develop-olympus:
[ticket/10772] Remove unnecessary comment
[ticket/10772] Functional tests for forum style
Conflicts:
tests/functional/forum_style_test.php
|
| | | |\
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
develop-olympus
# By Vjacheslav Trushkin
# Via Vjacheslav Trushkin
* remotes/cyberalien/ticket/10772:
[ticket/10772] Remove unnecessary comment
[ticket/10772] Functional tests for forum style
[ticket/10772] Use forum specific style for trigger_error
|
| | | | |
| | | |
| | | |
| | | | |
PHPBB3-10772
|
| |/ / /
| | |
| | |
| | | |
PHPBB3-9657
|
| |\ \ \
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
* dhruvgoel92/ticket/9341:
[ticket/9341] Assert that page doesnt contain next or prev page posts
[ticket/9341] Follow the Next/Prev link in tests follow the next/prev link and then assert if the page contains its last post or not
[ticket/9341] remove PREV_PAGE tpl var used for backward compatability
[ticket/9341] Add tests for checking Next and Previous template vars
[ticket/9341] Move create_topic and post into functional test case
[ticket/9341] Use U_PREVIOUS and U_NEXT in template files
[ticket/9341] Correctly named template vars
|
| | | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
create_topic and create_post are moved into functional test case
so that they can be used by other tests as well
PHPBB3-9341
|
| |\ \ \ \
| |/ / /
|/| / /
| |/ /
| | | |
Conflicts:
tests/test_framework/phpbb_functional_test_case.php
|
| | | |
| | |
| | |
| | | |
PHPBB3-11604
|
| | | |
| | |
| | |
| | | |
PHPBB3-11604
|
| | | |
| | |
| | |
| | | |
PHPBB3-11604
|
| | | |
| | |
| | |
| | | |
PHPBB3-11605
|
| | | |
| | |
| | |
| | | |
PHPBB3-11605
|
| |\ \ \
| |/ /
| | |
| | |
| | |
| | | |
* develop-olympus:
[ticket/11601] Add protected method for database sync and call it
[ticket/11601] Split post_setup_synchronisation logic from xml parsing
|
| | | |
| | |
| | |
| | | |
PHPBB3-11601
|
| | | |
| | |
| | |
| | | |
PHPBB3-11601
|
| | | |
| | |
| | |
| | | |
PHPBB3-11550
|
| | | |
| | |
| | |
| | |
| | |
| | |
| | | |
Instead of duplicating the extension copy code, it is now in the helpers.
So we remove the code from existing tests.
PHPBB3-11550
|
| | | |
| | |
| | |
| | | |
PHPBB3-11550
|
| |\ \ \
| |/ /
| | |
| | |
| | |
| | |
| | | |
# By Joas Schilling
# Via Joas Schilling (1) and Nils Adermann (1)
* remotes/upstream/develop-olympus:
[ticket/11590] Close database connections when tearDown() is called
|