| Commit message (Collapse) | Author | Age | Files | Lines |
| |\
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
* EXreaction/ticket/11832:
[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)
|
| | |
| |
| |
| | |
PHPBB3-11832
|
| | |
| |
| |
| | |
PHPBB3-11832
|
| | |
| |
| |
| | |
PHPBB3-11832
|
| | |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
Now symfony_request is also a service (removed the function
phpbb_create_symfony_request).
Inject symfony request into filesystem
Cleanup for the tests
PHPBB3-11832
|
| | |\
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
# By Nathan Guse (22) and others
# Via Nathan Guse (10) and others
* 'develop' of github.com:phpbb/phpbb3: (39 commits)
[ticket/11843] Added newlines and included numbers in the DEFINE vars test
[ticket/11843] Add checking DEFINE variables with underscores to template_test
[ticket/11843] The twig lexer fixes DEFINE variables with underscores again
[ticket/11727] Fix indentation
[ticket/11727] Fix indentation
[ticket/11745] Correct language, coding guidelines
[ticket/11828] Fix greedy operators in lexer
[ticket/11833] Prevent Twig errors from invalid template loops using BEGINELSE
[ticket/11833] Fix bad template loop
[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/11816] Test !$DEFINITION
[ticket/11822] Use namespace lookup order for asset loading
[ticket/11727] Template loader support for safe directories to load files from
[ticket/11816] Fix define/loop checks in IF statements containing parenthesis
[ticket/11373] Use inheritdoc
[ticket/11637] generate_text_for_display on search.php
[ticket/11744] Cast to int
[ticket/11744] Inheritdoc
...
|
| | |\ \
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
ticket/11832
* remotes/imkingdavid/ticket/11824:
[ticket/11824] Revert changes in functions.php
[ticket/11824] Reorganize test file
[ticket/11824] Update language string for board settings
[ticket/11824] Revert changes to functions_content.php
[ticket/11824] Add tests for urls with mod_rewrite enabled
[ticket/11824] Correct a comment
[ticket/11824] Change copyright year in migration file
[ticket/11824] Remove unused globals
[ticket/11824] Fix smilies
[ticket/11824] Fix logic
[ticket/11824] Add option for mod_rewrite
|
| | |\ \ \
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
# By Joseph Warner (187) and others
# Via Andreas Fischer (2) and others
* 'develop' of github.com:phpbb/phpbb3: (189 commits)
[ticket/11835] Fix ucp_auth_link adding in migration
[prep-release-3.0.12] Remove changelog entry for ticket that was not resolved.
[feature/oauth] Fix tabindex
[feature/oauth] Fix bug on ucp_auth_link related to error display
[feature/oauth] More small fixes
[feature/oauth] More minor changes from review
[feature/oauth] Fix small bug introduced by update in OAuth library
[feature/oauth] Fix small issues on ucp pages
[feature/oauth] Fix typo in OAuth logout method
[feature/oauth] Make token storage service ignorant
[feature/oauth] Update oauth::logout() to use clearAllTokens()
[feature/oauth] Update storage implementation due to inteface change
[feature/oauth] Update lusitanian/oauth to stable branch
[feature/oauth] Update comment on oauth service exception
[feature/oauth] Forgot to remove placeholder comment
[feature/oauth] OAuth service exception
[feature/oauth] A few more minor changes
[feature/oauth] Changes due to code review
[feature/oauth] Fix redirects
[feature/oauth] Fix issues on ucp_login_link from review
...
|
| | | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
Add some real life examples to test
PHPBB3-11832
|
| | | | | |
| | | | |
| | | | |
| | | | | |
PHPBB3-11832
|
| | | | | |
| | | | |
| | | | |
| | | | | |
PHPBB3-11832
|
| | | | | |
| | | | |
| | | | |
| | | | | |
PHPBB3-11832
|
| | | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
framework"
This reverts commit 5e09afa0bc3ff9014812282fd4454f0df54b9dfd.
|
| | | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
Setup common items needed from the container (e.g. filesystem)
PHPBB3-11832
|
| | | | | |
| | | | |
| | | | |
| | | | | |
PHPBB3-11832
|
| | | | | |
| | | | |
| | | | |
| | | | | |
PHPBB3-11832
|
| | | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
Function moved from phpbb_get_web_root_path to filesystem::get_web_root_path
PHPBB3-11832
|
| |\ \ \ \ \
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
* 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
|
| |\ \ \ \ \ \
| | |_|_|/ /
| |/| | | /
| |_|_|_|/
|/| | | | |
|
| | | | | |
| | | | |
| | | | |
| | | | | |
PHPBB3-11824
|
| | | | | |
| | | | |
| | | | |
| | | | | |
PHPBB3-11824
|
| | | |/ /
| |/| |
| | | |
| | | | |
PHPBB3-11824
|
| | | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
Per suggestion of nickvergessen, I added newlines in the DEFINE variables with
underscores test. Now if the test fails, it's easier to spot which part is
failing. Also added a test for DEFINE variables containing numbers.
PHPBB3-11843
|
| | | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
To prevent the underscore in DEFINE variables from being forgotten again,
the template tests now test INCLUDEing a file based on the contents of a
DEFINE variable with underscores in it.
PHPBB3-11843
|
| |\ \ \ \
| | | | |
| | | | | |
Group join approved notification
|
| | | | | |
| | | | |
| | | | |
| | | | | |
PHPBB3-11745
|
| |\ \ \ \ \
| |/ / / /
| | | | | |
[ticket/11744] Group join request notification
|
| | | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
This also fixes tests
PHPBB3-11744
|
| | | | | |
| | | | |
| | | | |
| | | | | |
PHPBB3-11744
|
| | | | | |
| | | | |
| | | | |
| | | | | |
PHPBB3-11744
|
| | | | | |
| | | | |
| | | | |
| | | | | |
PHPBB3-11744
|
| | | | | |
| | | | |
| | | | |
| | | | | |
PHPBB3-11744
|
| | | | | |
| | | | |
| | | | |
| | | | | |
PHPBB3-11744
|
| | | | | |
| | | | |
| | | | |
| | | | | |
PHPBB3-11744
|
| | | | | |
| | | | |
| | | | |
| | | | | |
PHPBB3-11744
|
| | | | | |
| | | | |
| | | | |
| | | | | |
PHPBB3-11744
|
| | | | | |
| | | | |
| | | | |
| | | | | |
PHPBB3-11744
|
| | | | | |
| | | | |
| | | | |
| | | | | |
PHPBB3-11744
|
| |\ \ \ \ \
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
# By Joseph Warner (187) and others
# Via Nathan Guse (6) and others
* 'develop' of github.com:phpbb/phpbb3: (195 commits)
[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
[feature/oauth] Fix tabindex
[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
[feature/oauth] Fix bug on ucp_auth_link related to error display
[feature/oauth] More small fixes
[feature/oauth] More minor changes from review
[feature/oauth] Fix small bug introduced by update in OAuth library
[feature/oauth] Fix small issues on ucp pages
[feature/oauth] Fix typo in OAuth logout method
[feature/oauth] Make token storage service ignorant
[feature/oauth] Update oauth::logout() to use clearAllTokens()
[feature/oauth] Update storage implementation due to inteface change
[feature/oauth] Update lusitanian/oauth to stable branch
[ticket/11822] Use namespace lookup order for asset loading
[feature/oauth] Update comment on oauth service exception
[feature/oauth] Forgot to remove placeholder comment
...
Conflicts:
phpBB/phpbb/template/twig/lexer.php
tests/template/template_test.php
|
| | | |_|_|/
| |/| | |
| | | | |
| | | | |
| | | | |
| | | | | |
Use lazy operators and use stricter validation
PHPBB3-11828
|
| | |\ \ \ \
| | | |/ /
| | |/| |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
feature/oauth
Conflicts:
phpBB/composer.json
phpBB/composer.lock
phpBB/develop/create_schema_files.php
phpBB/includes/ucp/ucp_register.php
PHPBB3-11673
|
| | | | | |
| | | | |
| | | | |
| | | | | |
PHPBB3-11673
|
| | | | | |
| | | | |
| | | | |
| | | | | |
PHPBB3-11673
|
| | | | | |
| | | | |
| | | | |
| | | | | |
PHPBB3-11673
|
| | | | | |
| | | | |
| | | | |
| | | | | |
PHPBB3-11673
|
| | | | | |
| | | | |
| | | | |
| | | | | |
PHPBB3-11673
|
| | | | | |
| | | | |
| | | | |
| | | | | |
PHPBB3-11673
|
| | | | | |
| | | | |
| | | | |
| | | | | |
PHPBB3-11673
|
| | | | | |
| | | | |
| | | | |
| | | | | |
PHPBB3-11673
|