aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'develop-olympus' into develop with no effectNils Adermann2013-07-110-0/+0
|\ | | | | | | | | | | | | | | No changes! * develop-olympus: [ticket/10772] Updating tests [ticket/10772] Remove 3.1 code
| * [ticket/10772] Updating testsVjacheslav Trushkin2013-07-111-12/+6
| | | | | | | | PHPBB3-10772
| * [ticket/10772] Remove 3.1 codeVjacheslav Trushkin2013-07-111-70/+51
| | | | | | | | PHPBB3-10772
* | Merge pull request #1509 from EXreaction/ticket/11388Nils Adermann2013-07-1111-1/+107
|\ \ | | | | | | Ticket/11388 INCLUDECSS
| * | [ticket/11388] Add newlines at EOFNathaniel Guse2013-07-112-2/+2
| | | | | | | | | | | | PHPBB3-11388
| * | [ticket/11388] INCLUDECSSNathaniel Guse2013-07-1110-0/+106
|/ / | | | | | | PHPBB3-11388
* | Merge pull request #1470 from EXreaction/feature/twigNils Adermann2013-07-1174-2638/+2645
|\ \ | | | | | | Feature/twig
| * | [ticket/11388] Do not append assets_version if using remote path (e.g. http)Nathaniel Guse2013-07-112-6/+5
| | | | | | | | | | | | PHPBB3-11388
| * | [ticket/11388] Fix typoNathaniel Guse2013-07-111-3/+3
| | | | | | | | | | | | PHPBB3-11388
| * | [ticket/11388] Remove typehints (causing tests to fail)Nathaniel Guse2013-07-111-1/+1
| | | | | | | | | | | | PHPBB3-11388
| * | [ticket/11388] Disable cache if IN_INSTALL definedNathaniel Guse2013-07-111-1/+1
| | | | | | | | | | | | PHPBB3-11388
| * | [ticket/11388] Do not modify by referenceNathaniel Guse2013-07-111-6/+8
| | | | | | | | | | | | PHPBB3-11388
| * | [ticket/11388] typehitsNathaniel Guse2013-07-111-1/+1
| | | | | | | | | | | | PHPBB3-11388
| * | [ticket/11388] INCLUDEJS test for //(url)Nathaniel Guse2013-07-112-0/+6
| | | | | | | | | | | | PHPBB3-11388
| * | [ticket/11388] INCLUDEJS supports //(url)Nathaniel Guse2013-07-111-1/+1
| | | | | | | | | | | | PHPBB3-11388
| * | [ticket/11388] Fixing includejs testNathaniel Guse2013-07-102-44/+118
| | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * | [ticket/11388] includejs inherit from includeassetNathaniel Guse2013-07-102-31/+73
| | | | | | | | | | | | | | | | | | | | | | | | | | | Copied from the INCLUDECSS PR, since this needed to be modified. Added checks for argument strings/anchors/http/https paths in asset files to load files properly PHPBB3-11388
| * | Merge remote-tracking branch ↵Nathaniel Guse2013-07-102-7/+32
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | '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
| | * | [feature/twig] Unit tests for includejsVjacheslav Trushkin2013-07-102-7/+32
| | | | | | | | | | | | | | | | PHPBB3-11598
| * | | [feature/twig] Add simple test to make sure Twig filters/tags are workingNathan Guse2013-07-083-0/+20
| | | | | | | | | | | | | | | | PHPBB3-11598
| * | | [feature/twig] Variable regular expressions should be lazyNathan Guse2013-07-081-3/+3
| |/ / | | | | | | | | | PHPBB3-11598
| * | [feature/twig] If DEBUG, EVENT will always look for new/missing tpl event filesNathan Guse2013-07-061-3/+23
| | | | | | | | | | | | | | | | | | | | | | | | | | | If debug mode is enabled, lets check for new/removed EVENT templates on page load rather than at compile. This is slower, but makes developing extensions easier (no need to purge the cache when a new event template file is added) PHPBB3-11598
| * | [feature/twig] Put $SCRIPTS below overall_footer_after, use includejs for coreNathan Guse2013-07-052-3/+7
| | | | | | | | | | | | | | | | | | Moved below overall_footer_after so events can add JS files in that event. PHPBB3-11598
| * | [feature/twig] Use Twig mask for IF statements instead of our own tokenparserNathan Guse2013-07-053-90/+6
| | | | | | | | | | | | PHPBB3-11598
| * | [feature/twig] context_recursive_loop_builder isn't used anymore, removing itNathan Guse2013-07-051-22/+0
| | | | | | | | | | | | PHPBB3-11598
| * | [feature/twig] Add check for defined IN_PHPBB in all new Twig related filesNathan Guse2013-07-0515-0/+135
| | | | | | | | | | | | PHPBB3-11598
| * | [feature/twig] Can't use typehint here, causes tests to failNathan Guse2013-07-051-1/+1
| | | | | | | | | | | | PHPBB3-11598
| * | [feature/twig] Add template tests for S_NUM_ROWS and S_BLOCK_NAMENathan Guse2013-07-052-3/+34
| | | | | | | | | | | | PHPBB3-11598
| * | [feature/twig] Fix S_NUM_ROWS assignmentNathan Guse2013-07-051-1/+1
| | | | | | | | | | | | PHPBB3-11598
| * | [feature/twig] Remove style dependency for controller helperNathan Guse2013-07-053-26/+2
| | | | | | | | | | | | | | | | | | If a controller wants to use set_style, it can just use phpbb_style PHPBB3-11598
| * | [feature/twig] Add template test for ===, !==Nathan Guse2013-07-052-4/+26
| | | | | | | | | | | | PHPBB3-11598
| * | [feature/twig] Clarify commentNathan Guse2013-07-051-1/+1
| | | | | | | | | | | | PHPBB3-11598
| * | [feature/twig] SpacingNathan Guse2013-07-051-1/+1
| | | | | | | | | | | | PHPBB3-11598
| * | [feature/twig] Nicer code for get_user_style.php()Nathan Guse2013-07-051-4/+9
| | | | | | | | | | | | PHPBB3-11598
| * | [feature/twig] Docs/typehinting for Twig extensionNathan Guse2013-07-051-1/+13
| | | | | | | | | | | | PHPBB3-11598
| * | [feature/twig] Removing template/renderer.php (no longer used)Nathan Guse2013-07-051-35/+0
| | | | | | | | | | | | PHPBB3-11598
| * | [feature/twig] Remove debug codeNathaniel Guse2013-07-041-5/+0
| | | | | | | | | | | | PHPBB3-11598
| * | [feature/twig] SpacingNathaniel Guse2013-07-041-1/+1
| | | | | | | | | | | | PHPBB3-11598
| * | [feature/twig] acp module tpls are in ext/adm, ucp/mcp in styles/Nathaniel Guse2013-07-041-17/+35
| | | | | | | | | | | | PHPBB3-11598
| * | [feature/twig] Fix copy/pasted codeNathaniel Guse2013-07-041-1/+1
| | | | | | | | | | | | PHPBB3-11598
| * | [feature/twig] Attempt to automatically set style dir for ext modulesNathaniel Guse2013-07-041-1/+19
| | | | | | | | | | | | | | | | | | Extension authors can change it themselves if necessary PHPBB3-11598
| * | [feature/twig] Trying some new debug code for this mkdir errorNathaniel Guse2013-07-041-8/+4
| | | | | | | | | | | | PHPBB3-11598
| * | [feature/twig] Fix a regular expressionNathaniel Guse2013-07-041-1/+1
| | | | | | | | | | | | PHPBB3-11598
| * | [feature/twig] Fix helper URL testNathaniel Guse2013-07-041-1/+4
| | | | | | | | | | | | PHPBB3-11598
| * | [feature/twig] Fix debug codeNathaniel Guse2013-07-041-1/+1
| | | | | | | | | | | | PHPBB3-11598
| * | [feature/twig] Support using Twig filters on {VAR}, add masks for Twig tagsNathaniel Guse2013-07-042-7/+71
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Now we can do {L_TITLE|upper}, {SITENAME|lower}, etc We can also use all the Twig tags in our own syntax. E.g. <!-- BLOCK foo --> = {% block foo %]. All tags are the same as the Twig tag names, but are in uppercase. PHPBB3-11598
| * | Merge branch 'develop' of https://github.com/phpbb/phpbb3 into feature/twigNathaniel Guse2013-07-0426-1081/+1697
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | # By Joseph Warner (44) and others # Via Joas Schilling (4) and others * 'develop' of https://github.com/phpbb/phpbb3: (63 commits) [ticket/11617] Remove spaces and tabs from empty lines [ticket/11617] Missing U_ACTION in acp_captcha.php [feature/auth-refactor] Fix code style issue [feature/auth-refactor] Fix comment grammar [feature/auth-refactor] Fix the actual cause of test failures [feature/auth-refactor] A possible fix for the functional test failures [ticket/11566] Subsilver template error displayed after table headers [ticket/11566] Remove extra pair of brackets from conditional statement [ticket/11566] Check that guest doesn't have reporting permission by default [ticket/11566] Add captcha to report post template in subsilver [ticket/11566] Use the new constant CONFIRM_REPORT for captcha init [ticket/11566] Rename var to $visual_confirmation_response [ticket/11566] Revert forum permission changes [ticket/11566] Use language variable instead of hardcode [ticket/11566] add tests for reporting post [ticket/11566] add captcha reset and hidden fields [ticket/11566] display error instead of trigger_error [ticket/11566] add error in template [ticket/11566] add error functionality [ticket/11566] add interface for captcha ...
| * | | [feature/twig] Make style dependency optional for resolverNathaniel Guse2013-07-041-2/+2
| | | | | | | | | | | | | | | | PHPBB3-11598
| * | | [feature/twig] Safety check for 2fb48d6Nathaniel Guse2013-07-041-1/+1
| | | | | | | | | | | | | | | | PHPBB3-11598
| * | | Revert "[feature/twig] Call set_style in the foo/bar controller for ↵Nathaniel Guse2013-07-041-2/+0
| | | | | | | | | | | | | | | | | | | | | | | | functional tests" This reverts commit 5c39f26cd27d5e4a1debfa24407825906f42d346.
generated by cgit v1.2.1 (git 2.21.0) at 2025-04-08 18:44:54 +0000