aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB
Commit message (Collapse)AuthorAgeFilesLines
* [feature/twig] Remove the twig loader class that I started (don't use it)Nathaniel Guse2013-07-011-51/+0
| | | | PHPBB3-11598
* [feature/twig] Changing INCLUDEJS behavior slightlyNathaniel Guse2013-07-019-8/+9
| | | | | | | Automatically parsing inline variables the same way it is done for INCLUDE, INCLUDEPHP PHPBB3-11598
* [feature/twig] Fix includephp nodeNathaniel Guse2013-07-011-8/+6
| | | | PHPBB3-11598
* Merge branch 'develop' of https://github.com/phpbb/phpbb3 into feature/twigNathaniel Guse2013-07-0115-30/+30
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | # By Dhruv (7) and others # Via Andreas Fischer (7) and others * 'develop' of https://github.com/phpbb/phpbb3: [ticket/11593] initialize $is_expr as null before being passed to get_varref [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/11618] Replace glob() with scandir() and string matching [ticket/9341] Add tests for checking Next and Previous template vars [ticket/9341] Move create_topic and post into functional test case [ticket/11615] Fix typo in creation_test [ticket/11615] Remove magic number in creation_test [ticket/11615] Rename class in file to match [ticket/11615] Rename init_test to creation_test for clarity [ticket/9341] Use U_PREVIOUS and U_NEXT in template files [ticket/9341] Correctly named template vars Conflicts: tests/template/template_test_case.php
| * Merge remote-tracking branch 'dhruvgoel92/ticket/9341' into developJoas Schilling2013-06-2914-30/+29
| |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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
| | * [ticket/9341] remove PREV_PAGE tpl var used for backward compatabilityDhruv2013-06-271-1/+0
| | | | | | | | | | | | PHPBB3-9341
| | * [ticket/9341] Use U_PREVIOUS and U_NEXT in template filesDhruv2013-06-2213-27/+27
| | | | | | | | | | | | PHPBB3-9341
| | * [ticket/9341] Correctly named template varssakimahesh2013-06-221-2/+2
| | | | | | | | | | | | PHPBB3-9341
| * | Merge remote-tracking branch 'dhruvgoel92/ticket/11593' into developAndreas Fischer2013-06-291-0/+1
| |\ \ | | | | | | | | | | | | | | | | * dhruvgoel92/ticket/11593: [ticket/11593] initialize $is_expr as null before being passed to get_varref
| | * | [ticket/11593] initialize $is_expr as null before being passed to get_varrefDhruv2013-06-291-0/+1
| | |/ | | | | | | | | | PHPBB3-11593
* | | [feature/twig] A bit of cleanup in twig.phpNathaniel Guse2013-07-011-11/+14
| | | | | | | | | | | | PHPBB3-11598
* | | [feature/twig] Add S_BLOCK_NAME to context, set S_NUM_ROWS in alter_blockNathaniel Guse2013-07-011-0/+22
| | | | | | | | | | | | PHPBB3-11598
* | | [feature/twig] Add addslashes filter (to use on LA_ instead of escape)Nathaniel Guse2013-07-012-2/+3
| | | | | | | | | | | | | | | | | | To match previous parser behavior PHPBB3-11598
* | | [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-251-3/+15
| | | | | | | | | | | | | | | | | | 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] 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-251-3/+11
| | | | | | | | | | | | 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] Append assets_version to includejs tagNathaniel Guse2013-06-245-12/+49
| | | | | | | | | | | | | | | | | | Some fixes for main template parser PHPBB3-11598
* | | [feature/twig] Working on fixing testsNathan Guse2013-06-244-31/+69
| | | | | | | | | | | | PHPBB3-11598
* | | Merge branch 'develop' of github.com:phpbb/phpbb3 into feature/twigNathan Guse2013-06-249-32/+56
|\ \ \ | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | # 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 developAndreas Fischer2013-06-201-0/+4
| |\ \ \ \ \ | | |/ / / / | |/| / / / | | |/ / / | | | | | * develop-olympus: [ticket/11094] Add textbox for jabber while memberlist search
| | * | | Merge remote-tracking branch 'dhruvgoel92/ticket/11094' into develop-olympusAndreas Fischer2013-06-201-0/+4
| | |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | * dhruvgoel92/ticket/11094: [ticket/11094] Add textbox for jabber while memberlist search
generated by cgit v1.2.1 (git 2.21.0) at 2025-11-12 03:01:57 +0000