aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* [feature/twig] Remove the get_rootref and get_tpldata functions prev addedNathaniel Guse2013-07-012-24/+3
| | | | | | These are not really necessary PHPBB3-11598
* [feature/twig] Transform {L_, {LA_ to use the lang() functionNathaniel Guse2013-07-013-16/+47
| | | | PHPBB3-11598
* [feature/twig] Fixing include nodeNathaniel Guse2013-07-011-17/+19
| | | | PHPBB3-11598
* [feature/twig] Fixing define nodeNathaniel Guse2013-07-011-3/+3
| | | | PHPBB3-11598
* [feature/twig] Fixing div by replacementNathaniel Guse2013-07-011-3/+3
| | | | PHPBB3-11598
* [feature/twig] Adding ! operatorNathaniel Guse2013-07-011-5/+7
| | | | PHPBB3-11598
* [feature/twig] Add S_NUM_ROWS to loops in contextNathaniel Guse2013-06-291-0/+5
| | | | PHPBB3-11598
* [feature/twig] Adding some operators to the extensionNathaniel Guse2013-06-291-3/+7
| | | | PHPBB3-11598
* [feature/twig] Fixing more stuff for DEFINE/INCLUDENathaniel Guse2013-06-292-9/+44
| | | | PHPBB3-11598
* [feature/twig] Fixing DEFINE statementsNathaniel Guse2013-06-295-33/+196
| | | | PHPBB3-11598
* [feature/twig] New Twig filter, subsetNathaniel Guse2013-06-282-5/+46
| | | | | | | This filter grabs a subset of a loop for output (according to past functionality). PHPBB3-11598
* [feature/twig] Replace BEGIN with Twig for using LexerNathaniel Guse2013-06-265-213/+83
| | | | | | | | | | | No longer using the begin tokenparser/node as it did not allow proper handling of <!-- BEGIN !foo, <!-- BEGIN foo(0,2). Now the lexer will use regular expressions to handle that correctly and replace it with Twig's for token Also fixing <!-- IF .foo as I discovered it evaluates to if sizeof(foo) PHPBB3-11598
* [feature/twig] Set S_ROW_NUM in context also (previously was a hack in filter)Nathaniel Guse2013-06-261-4/+4
| | | | PHPBB3-11598
* [feature/twig] Fix alter_block_array to correctly set S_ROW_COUNTNathaniel Guse2013-06-261-0/+3
| | | | PHPBB3-11598
* [feature/twig] Forgot to set up $config in node/php.phpNathaniel Guse2013-06-251-0/+2
| | | | PHPBB3-11598
* [feature/twig] Going back to Twig's handling of cache file names for nowNathaniel Guse2013-06-252-4/+16
| | | | | | My method was not working correctly, will work on it more later. PHPBB3-11598
* [feature/twig] No longer using the phpbb_template_locatorNathaniel Guse2013-06-251-23/+33
| | | | | | This functionality is handled by the Twig Filesystem Loader PHPBB3-11598
* [feature/twig] Fixing template events test (and behavior)Nathaniel Guse2013-06-251-11/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | According to the test, template event behavior was never correct. Only ONE template event file is supposed to be included from EACH extension. As it was before, EVERY matching template event file from each extension was included (this was how it was designed). E.g. Event call in prosilver "foo" Extension has template "foo" in prosilver AND all foo from all would be included, then foo from prosilver would be included This was clearly not designed correctly as only the most specific event file from each extension should be loaded, otherwise events could only ever be put in a single style tree (either only all, or only prosilver and subsilver2 and any style that inherits from neither of those). Otherwise the events would be duplicated on output (which is clearly not desirable). The Twig behavior already was correct as I designed it, so only the one most specific template event file found would be included from each extension. The tests had to be updated for the correct expected output. PHPBB3-11598
* [feature/twig] Don't require phpbb_config, some tests pass nullNathaniel Guse2013-06-251-1/+1
| | | | PHPBB3-11598
* [feature/twig] INCLUDEPHP token abs paths & fix testNathaniel Guse2013-06-252-12/+15
| | | | PHPBB3-11598
* [feature/twig] INCLUDEPHP token, replace variable usage with $contextNathaniel Guse2013-06-251-3/+6
| | | | | | I could find no better way to do this... PHPBB3-11598
* [feature/twig] INCLUDEPHP token supportNathaniel Guse2013-06-253-0/+114
| | | | PHPBB3-11598
* [feature/twig] Add a comment to tpl output if PHP used, but disabledNathaniel Guse2013-06-251-4/+8
| | | | PHPBB3-11598
* [feature/twig] Pass parameters required to twig env via constructorNathaniel Guse2013-06-252-43/+36
| | | | | | Instead of creating set functions PHPBB3-11598
* [feature/twig] PHP token supportNathaniel Guse2013-06-254-0/+89
| | | | PHPBB3-11598
* [feature/twig] Remove duplicate test callsNathaniel Guse2013-06-241-15/+2
| | | | PHPBB3-11598
* [feature/twig] Delete template_spacing_test.phpNathaniel Guse2013-06-241-87/+0
| | | | | | No longer needed PHPBB3-11598
* [feature/twig] Delete template_locate_test.phpNathaniel Guse2013-06-241-68/+0
| | | | | | No longer needed PHPBB3-11598
* [feature/twig] Correct template_inheritance_test.phpNathaniel Guse2013-06-241-10/+1
| | | | PHPBB3-11598
* [feature/twig] Correct includejs testNathaniel Guse2013-06-242-14/+13
| | | | PHPBB3-11598
* [feature/twig] Append assets_version to includejs tagNathaniel Guse2013-06-245-12/+49
| | | | | | Some fixes for main template parser PHPBB3-11598
* [feature/twig] Delete template_compile_test.phpNathaniel Guse2013-06-241-31/+0
| | | | | | No longer necessary PHPBB3-11598
* [feature/twig] Delete renderer_eval_test.phpNathaniel Guse2013-06-241-31/+0
| | | | | | No longer necessary PHPBB3-11598
* [feature/twig] Delete invalid constructs template testNathaniel Guse2013-06-243-89/+0
| | | | | | | | 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
* [feature/twig] Working on fixing testsNathan Guse2013-06-245-63/+72
| | | | PHPBB3-11598
* Merge branch 'develop' of github.com:phpbb/phpbb3 into feature/twigNathan Guse2013-06-2437-306/+1406
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | # By Dhruv (35) and others # Via Andreas Fischer (15) and others * 'develop' of github.com:phpbb/phpbb3: (75 commits) [ticket/10776] update min php version 5.3.3 in readme [ticket/11503] similar implementation for mssql_native and odbc [ticket/11603] Fix out dated comment [ticket/11603] Fix usage note [ticket/11604] Skip installer step where config.php is created. [ticket/11603] Throw RuntimeExceptions instead of using exit() [ticket/11603] Avoid using cURL [ticket/11604] Fix case where config.php is not generated by phpBB. [ticket/11604] Use variables for config.php filesnames. [ticket/11561] Specify used tables in notification fixture, so they are emptied [ticket/11094] Add textbox for jabber while memberlist search [ticket/10820] fix if condition to check for IE [ticket/11603] Split api_request into two functions (query only vs. full url) [ticket/11603] Fix spacing and add some comments [ticket/10820] Add additional check for IE in condition [ticket/11603] Fix github API calls [ticket/11603] Rename network to forks and fix handling [ticket/11603] Fix github api url and use curl with valid user agent [ticket/10820] Fix function docblock [ticket/10820] Inject IE version in function ...
| * Merge branch 'develop-olympus' into developJoas Schilling2013-06-211-16/+15
| |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | * develop-olympus: [ticket/10776] update min php version 5.3.3 in readme [ticket/10776] Fixed a couple language changes in docs/README.html. [ticket/10776] Fixed errors in docs/README.html. Conflicts: phpBB/docs/README.html
| | * Merge remote-tracking branch 'dhruvgoel92/ticket/10776' into develop-olympusJoas Schilling2013-06-211-15/+15
| | |\ | | | | | | | | | | | | | | | | | | | | | | | | * dhruvgoel92/ticket/10776: [ticket/10776] update min php version 5.3.3 in readme [ticket/10776] Fixed a couple language changes in docs/README.html. [ticket/10776] Fixed errors in docs/README.html.
| | | * [ticket/10776] update min php version 5.3.3 in readmeDhruv2013-06-211-1/+1
| | | | | | | | | | | | | | | | PHPBB3-10776
| | | * Merge branch 'ticket/10776' of git://github.com/callumacrae/phpbb3 into ↵Dhruv2013-06-201-15/+15
| | | |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ticket/10776 # By Callum Macrae # Via Callum Macrae * 'ticket/10776' of git://github.com/callumacrae/phpbb3: [ticket/10776] Fixed a couple language changes in docs/README.html. [ticket/10776] Fixed errors in docs/README.html. Conflicts: phpBB/docs/README.html
| | | | * [ticket/10776] Fixed a couple language changes in docs/README.html.Callum Macrae2012-04-121-3/+3
| | | | | | | | | | | | | | | | | | | | PHPBB3-10776
| | | | * [ticket/10776] Fixed errors in docs/README.html.Callum Macrae2012-04-101-39/+38
| | | | | | | | | | | | | | | | | | | | PHPBB3-10776
| * | | | Merge remote-tracking branch 'dhruvgoel92/ticket/11503' into developJoas Schilling2013-06-212-6/+6
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | * dhruvgoel92/ticket/11503: [ticket/11503] similar implementation for mssql_native and odbc
| | * | | | [ticket/11503] similar implementation for mssql_native and odbcDhruv2013-06-202-6/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | mssql_native and mssql_odbc db drivers varied at some places where they should have been similar. PHPBB3-11503
| * | | | | Merge branch 'develop-olympus' into developJoas Schilling2013-06-201-10/+43
| |\ \ \ \ \ | | | |/ / / | | |/| | | | | | | | | | | | | | | Conflicts: tests/test_framework/phpbb_functional_test_case.php
| | * | | | Merge remote-tracking branch 'bantu/ticket/11604' into develop-olympusJoas Schilling2013-06-201-10/+43
| | |\ \ \ \
| | | * | | | [ticket/11604] Skip installer step where config.php is created.Andreas Fischer2013-06-191-20/+27
| | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11604
| | | * | | | [ticket/11604] Fix case where config.php is not generated by phpBB.Andreas Fischer2013-06-181-1/+23
| | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11604
| | | * | | | [ticket/11604] Use variables for config.php filesnames.Andreas Fischer2013-06-181-6/+10
| | | | |/ / | | | |/| | | | | | | | | | | | | | PHPBB3-11604
| * | | | | Merge branch 'develop-olympus' into developAndreas Fischer2013-06-201-2/+2
| |\ \ \ \ \ | | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | * develop-olympus: [ticket/11603] Fix out dated comment [ticket/11603] Fix usage note
generated by cgit v1.2.1 (git 2.21.0) at 2025-11-12 08:05:20 +0000