aboutsummaryrefslogtreecommitdiffstats
path: root/tests
Commit message (Expand)AuthorAgeFilesLines
* [ticket/11664] Stop creating php.html file in root path in testsNathaniel Guse2013-07-122-2/+2
* [ticket/11662] Typos: occured -> occurredAndreas Fischer2013-07-121-1/+1
* Merge pull request #1522 from igorw/feature/bootstrap-dicNils Adermann2013-07-112-2/+6
|\
| * [feature/bootstrap-dic] Bootstrap container from config.phpIgor Wiedler2013-07-112-2/+6
* | Merge branch 'develop-olympus' into developAndreas Fischer2013-07-121-0/+49
|\ \ | |/ |/|
| * [ticket/11548] Use new static methods for request and submitMarc Alexander2013-07-111-5/+4
| * Merge branch 'develop-olympus' of https://github.com/phpbb/phpbb3 into ticket...Marc Alexander2013-07-1130-122/+1868
| |\
| | * [ticket/10772] Updating testsVjacheslav Trushkin2013-07-111-12/+6
| | * [ticket/10772] Remove 3.1 codeVjacheslav Trushkin2013-07-111-70/+51
| * | [ticket/11548] Run array_map on complete error array and not just colour_errorMarc Alexander2013-07-111-0/+50
* | | [ticket/11388] Add newlines at EOFNathaniel Guse2013-07-112-2/+2
* | | [ticket/11388] INCLUDECSSNathaniel Guse2013-07-114-0/+31
* | | Merge pull request #1470 from EXreaction/feature/twigNils Adermann2013-07-1127-502/+288
|\ \ \
| * | | [ticket/11388] Do not append assets_version if using remote path (e.g. http)Nathaniel Guse2013-07-111-3/+3
| * | | [ticket/11388] INCLUDEJS test for //(url)Nathaniel Guse2013-07-112-0/+6
| * | | [ticket/11388] Fixing includejs testNathaniel Guse2013-07-102-44/+118
| * | | Merge remote-tracking branch 'remotes/cyberalien/feature/twig/includejs_tests...Nathaniel Guse2013-07-102-7/+32
| |\ \ \
| | * | | [feature/twig] Unit tests for includejsVjacheslav Trushkin2013-07-102-7/+32
| * | | | [feature/twig] Add simple test to make sure Twig filters/tags are workingNathan Guse2013-07-083-0/+20
| |/ / /
| * | | [feature/twig] Add template tests for S_NUM_ROWS and S_BLOCK_NAMENathan Guse2013-07-052-3/+34
| * | | [feature/twig] Remove style dependency for controller helperNathan Guse2013-07-051-1/+1
| * | | [feature/twig] Add template test for ===, !==Nathan Guse2013-07-052-4/+26
| * | | [feature/twig] Remove debug codeNathaniel Guse2013-07-041-5/+0
| * | | [feature/twig] Trying some new debug code for this mkdir errorNathaniel Guse2013-07-041-8/+4
| * | | [feature/twig] Fix helper URL testNathaniel Guse2013-07-041-1/+4
| * | | Merge branch 'develop' of https://github.com/phpbb/phpbb3 into feature/twigNathaniel Guse2013-07-046-0/+376
| |\ \ \
| * | | | Revert "[feature/twig] Call set_style in the foo/bar controller for functiona...Nathaniel Guse2013-07-041-2/+0
| * | | | [feature/twig] Add test to make sure nested loops get the correct S_ROW_COUNTNathaniel Guse2013-07-042-0/+13
| * | | | [feature/twig] Call set_style in the foo/bar controller for functional testsNathaniel Guse2013-07-041-0/+2
| * | | | [feature/twig] Debugging test failuresNathaniel Guse2013-07-031-0/+6
| * | | | [feature/twig] Prevent errors from mkdir if the dir already existsNathaniel Guse2013-07-021-1/+4
| * | | | [feature/twig] template->cachepath is now private, missed checking testsNathaniel Guse2013-07-022-2/+6
| * | | | [feature/twig] Move test_php back to template_testNathaniel Guse2013-07-022-30/+16
| * | | | [feature/twig] Should compare to $this->test_path rather than hardcoded pathNathaniel Guse2013-07-021-6/+6
| * | | | [feature/twig] Fix includejs testNathaniel Guse2013-07-022-7/+7
| * | | | [feature/twig] Fix template test caseNathaniel Guse2013-07-021-1/+1
| * | | | Merge branch 'develop' of https://github.com/phpbb/phpbb3 into feature/twigNathaniel Guse2013-07-011-4/+34
| |\ \ \ \
| * | | | | [feature/twig] Remove resource locator dependency from templateNathaniel Guse2013-07-015-6/+4
| * | | | | [feature/twig] Fix template/template_php_test.phpNathaniel Guse2013-07-011-1/+10
| * | | | | [feature/twig] Fix includephp_from_subdir_test.phpNathaniel Guse2013-07-012-5/+7
| * | | | | [feature/twig] Changing INCLUDEJS behavior slightlyNathaniel Guse2013-07-011-6/+6
| * | | | | [feature/twig] PHP test moved to a separate fileNathaniel Guse2013-07-011-0/+21
| * | | | | Merge branch 'develop' of https://github.com/phpbb/phpbb3 into feature/twigNathaniel Guse2013-07-014-104/+144
| |\ \ \ \ \
| * | | | | | [feature/twig] Fix template_test.phpNathaniel Guse2013-07-017-88/+38
| * | | | | | [feature/twig] Going back to Twig's handling of cache file names for nowNathaniel Guse2013-06-251-1/+1
| * | | | | | [feature/twig] Fixing template events test (and behavior)Nathaniel Guse2013-06-251-11/+7
| * | | | | | [feature/twig] INCLUDEPHP token abs paths & fix testNathaniel Guse2013-06-251-9/+4
| * | | | | | [feature/twig] Remove duplicate test callsNathaniel Guse2013-06-241-15/+2
| * | | | | | [feature/twig] Delete template_spacing_test.phpNathaniel Guse2013-06-241-87/+0
| * | | | | | [feature/twig] Delete template_locate_test.phpNathaniel Guse2013-06-241-68/+0