aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge remote-tracking branch 'EXreaction/ticket/11660' into developAndreas Fischer2013-07-121-5/+9
|\ | | | | | | | | * EXreaction/ticket/11660: [ticket/11660] Fix bugs from bugs in #11651 (missing vars, db->sql_connect)
| * [ticket/11660] Fix bugs from bugs in #11651 (missing vars, db->sql_connect)Nathaniel Guse2013-07-121-5/+9
| | | | | | | | PHPBB3-11660
* | Merge branch 'develop-olympus' into developNathaniel Guse2013-07-124-6/+6
|\ \ | |/ |/| | | | | | | | | | | | | | | # By Andreas Fischer # Via Andreas Fischer (1) and Nathaniel Guse (1) * develop-olympus: [ticket/11662] Typos: occured -> occurred Conflicts: tests/template/template_test.php
| * Merge remote-tracking branch 'remotes/bantu/ticket/11662' into develop-olympusNathaniel Guse2013-07-125-7/+7
| |\ | | | | | | | | | | | | | | | | | | # By Andreas Fischer # Via Andreas Fischer * remotes/bantu/ticket/11662: [ticket/11662] Typos: occured -> occurred
| | * [ticket/11662] Typos: occured -> occurredAndreas Fischer2013-07-125-7/+7
| |/ | | | | | | PHPBB3-11662
* | Merge pull request #1522 from igorw/feature/bootstrap-dicNils Adermann2013-07-113-14/+74
|\ \ | | | | | | [feature/bootstrap-dic] Bootstrap container from config.php
| * | [feature/bootstrap-dic] Bootstrap container from config.phpIgor Wiedler2013-07-113-14/+74
| | | | | | | | | | | | PHPBB3-11651
* | | Merge branch 'develop-olympus' into developAndreas Fischer2013-07-122-1/+51
|\ \ \ | | |/ | |/| | | | | | | | | | | | | | | | | | | * develop-olympus: [ticket/11548] Use new static methods for request and submit [ticket/11548] Run array_map on complete error array and not just colour_error Conflicts: tests/functional/ucp_groups_test.php
| * | Merge remote-tracking branch 'marc1706/ticket/11548' into develop-olympusAndreas Fischer2013-07-112-1/+51
| |\ \ | | | | | | | | | | | | | | | | | | | | * marc1706/ticket/11548: [ticket/11548] Use new static methods for request and submit [ticket/11548] Run array_map on complete error array and not just colour_error
| | * | [ticket/11548] Use new static methods for request and submitMarc Alexander2013-07-111-5/+4
| | | | | | | | | | | | | | | | PHPBB3-11548
| | * | Merge branch 'develop-olympus' of https://github.com/phpbb/phpbb3 into ↵Marc Alexander2013-07-1153-307/+2205
| | |\ \ | | |/ / | |/| | | | | | ticket/11548
| | * | [ticket/11548] Run array_map on complete error array and not just colour_errorMarc Alexander2013-07-112-1/+52
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Up to now the array_map() that turns error messages into the localized output was only ran if the group's color was set. With this patch it'll run the array_map() on the complete error array if it's not empty. PHPBB3-11548
* | | | 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
generated by cgit v1.2.1 (git 2.21.0) at 2025-04-10 13:56:06 +0000