| Commit message (Collapse) | Author | Age | Files | Lines |
|
|
|
|
|
|
|
|
|
| |
Refactor assign_block_var to use the same block selection mechanism
as is used in alter_block_array. This allows creating new blocks
at any position in the template structure, not only on the last block.
Allows selecting a block as outer[2].middle.
Added tests.
PHPBB3-14994
|
|
|
|
| |
PHPBB3-13132
|
|
|
|
| |
PHPBB3-13132
|
|
|
|
| |
PHPBB3-13133
|
|
|
|
| |
PHPBB3-12781
|
|
|
|
| |
PHPBB3-12382
|
|
|
|
| |
PHPBB3-12382
|
|
|
|
|
|
|
|
|
|
| |
http://tracker.phpbb.com/browse/PHPBB3-7580
This test demonstrates that is possible to test if a
variable exists and then use it if it does, similar to
using isset(), but in template/twig syntax.
<!— IF {VAR} is defined —>{VAR}<!— ENDIF —>
PHPBB3-7580
|
|
|
|
| |
PHPBB3-10288
|
|
|
|
| |
PHPBB3-11943
|
|
|
|
| |
PHPBB3-11943
|
|
|
|
| |
PHPBB3-11943
|
|
|
|
| |
PHPBB3-11816
|
|
|
|
|
|
|
|
| |
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
|
|\
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
# 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
|
|\ \
| |/
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
# By David King (16) and others
# Via David King (13) and others
* 'develop' of github.com:phpbb/phpbb3: (67 commits)
[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.*
[ticket/11791] Load adm/ events from styles/adm/event/
[ticket/11215] Fix helper_url_test.php tests
[ticket/11215] Add newline back to .htaccess, fix wording
[ticket/11215] Update comment in .htaccess
[ticket/11215] Uncomment rewrite rules in .htaccess
[ticket/11215] Make controller helper url() method use correct format
[ticket/11215] Add commented-out URL rewrite capability to .htaccess
[ticket/11821] Fix comma usage next to "You are receiving this notification".
[ticket/11769] Allow using 0 as poster name
[ticket/11769] Allow '0' as username
[ticket/11215] Use new URL structure for controllers
[ticket/11215] Everything appears to be working...
...
Conflicts:
phpBB/phpbb/template/twig/lexer.php
tests/template/template_test.php
|
| |
| |
| |
| | |
PHPBB3-11812
|
| |\
| | |
| | |
| | |
| | |
| | |
| | | |
* EXreaction/ticket/11724:
[ticket/11724] Handle ELSE IF separately
[ticket/11724] Replace spaces with tabs
[ticket/11724] Support "ELSE IF" and "ELSEIF" in the same way
|
| | |
| | |
| | |
| | | |
PHPBB3-11724
|
| | |
| | |
| | |
| | | |
PHPBB3-11816
|
| | |
| | |
| | |
| | | |
PHPBB3-11816
|
|/ /
| |
| |
| | |
PHPBB3-11816
|
|/
|
|
| |
PHPBB3-11701
|
|\
| |
| |
| |
| |
| |
| |
| |
| | |
* EXreaction/ticket/11718:
[ticket/11718] Quick test for fixes in ELSEIF
[ticket/11718] Twig lexer only correcting statements in IF, not ELSEIF
Conflicts:
tests/template/template_test.php
|
| |
| |
| |
| | |
PHPBB3-11718
|
|/
|
|
| |
PHPBB3-11707
|
|\
| |
| | |
Fix INCLUDEJS URLs handling
|
| |
| |
| |
| |
| |
| |
| | |
Remove code for URLs separated with ;
Add test case for mix of & and & in URLs
PHPBB3-11647
|
| |
| |
| |
| | |
PHPBB-11647
|
| |
| |
| |
| | |
PHPBB3-11388
|
|/
|
|
| |
PHPBB3-11388
|
|
|
|
| |
PHPBB3-11388
|
|
|
|
|
|
|
|
|
| |
Changed expected output to file?(any supplied argument string)&asset_version
=($config['asset_version'])#(any supplied anchor string)
Testing lines one at a time to make checking them easier.
PHPBB3-11388
|
|\
| |
| |
| |
| |
| |
| |
| |
| | |
'remotes/cyberalien/feature/twig/includejs_tests' into feature/twig
# By Vjacheslav Trushkin
# Via Vjacheslav Trushkin
* remotes/cyberalien/feature/twig/includejs_tests:
[feature/twig] Unit tests for includejs
|
| |
| |
| |
| | |
PHPBB3-11598
|
|/
|
|
| |
PHPBB3-11598
|
|
|
|
| |
PHPBB3-11598
|
|
|
|
| |
PHPBB3-11598
|
|
|
|
| |
PHPBB3-11598
|
|
|
|
| |
PHPBB3-11598
|
|
|
|
|
|
|
| |
Automatically parsing inline variables the same way it is done for
INCLUDE, INCLUDEPHP
PHPBB3-11598
|
|
|
|
|
|
|
| |
Various tests were broken completely, and some things such as whitespace
changed with Twig
PHPBB3-11598
|
|
|
|
| |
PHPBB3-11598
|
|
|
|
|
|
|
|
| |
Invalid tags is no longer a valid test (invalid tags are ignored)
Twig contains tests for loading files, so we should not need to test this
PHPBB3-11598
|
|\
| |
| |
| |
| |
| |
| |
| |
| | |
# By Vjacheslav Trushkin
# Via Vjacheslav Trushkin
* remotes/cyberalien/ticket/11482:
[ticket/11482] Use double quotes for code
[ticket/11482] Unit tests for advanced DEFINE
[ticket/11482] Implementation of advanced DEFINE tag
|
| |
| |
| |
| |
| |
| | |
Unit tests for advanced DEFINE and ENDDEFINE
PHPBB3-11482
|
| |
| |
| |
| |
| |
| |
| |
| | |
This test fails until 11435 is fixed
Add newlines at EOF
PHPBB3-11435
|
|/
|
|
| |
PHPBB3-11435
|