aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* [ticket/11628] Move setting core namespace to set_style()Nathaniel Guse2013-07-241-15/+15
* [ticket/11628] Remove $this->names, $this->style_names from phpbb_templateNathaniel Guse2013-07-241-16/+3
* [ticket/11628] Remove phpbb_style (move methods to phpbb_template)Nathaniel Guse2013-07-2419-218/+161
* [ticket/11628] Remove style path providerNathaniel Guse2013-07-2412-346/+7
* [ticket/11628] Remove style resource locatorNathaniel Guse2013-07-246-563/+3
* Merge remote-tracking branch 'EXreaction/ticket/11667' into developAndreas Fischer2013-07-244-9/+37
|\
| * [ticket/11667] Use @inheritdocNathan Guse2013-07-232-14/+4
| * Merge branch 'develop' of github.com:phpbb/phpbb3 into ticket/11667Nathan Guse2013-07-23465-2533/+9519
| |\
| | * Merge pull request #1601 from nickvergessen/ticket/11734Nathan Guse2013-07-231-0/+11
| | |\ | |/ / |/| |
| | * [ticket/11734] Readd accidently removed language strings of forum permissionsJoas Schilling2013-07-231-0/+11
* | | Merge remote-tracking branch 'EXreaction/ticket/11718' into developAndreas Fischer2013-07-233-5/+11
|\ \ \
| * | | [ticket/11718] Quick test for fixes in ELSEIFNathaniel Guse2013-07-192-1/+6
| * | | [ticket/11718] Twig lexer only correcting statements in IF, not ELSEIFNathaniel Guse2013-07-191-4/+5
* | | | Merge remote-tracking branch 'asperous/ticket/11620' into developAndreas Fischer2013-07-2320-204/+1014
|\ \ \ \ | |_|_|/ |/| | |
| * | | [ticket/11620] Whitespace and combine function into test_caseAndy Chase2013-07-227-39/+30
| * | | [ticket/11620] Move check_ban_test functions to setUp/tearDown for clarityAndy Chase2013-07-221-10/+26
| * | | [ticket/11620] Changed incorrect global variableAndy Chase2013-07-221-2/+2
| * | | [ticket/11620] Minor indentation changes and comment clarityAndy Chase2013-07-222-7/+5
| * | | Merge branch 'develop' into ticket/11620Andy Chase2013-07-225-8/+12
| |\ \ \
| * | | | [ticket/11620] Expected and actual test conditions wrongly swappedAndy Chase2013-07-221-1/+1
| * | | | [ticket/11620] Space between . in directory import concatenationAndy Chase2013-07-229-9/+9
| * | | | [ticket/11620] Changes to match mergeAndy Chase2013-07-222-1/+4
| * | | | Merge branch 'develop' into ticket/11620Andy Chase2013-07-22498-5058/+11718
| |\ \ \ \
| * | | | | [ticket/11620] Changes for code guidelines consistencyAndy Chase2013-07-223-13/+15
| * | | | | [ticket/11620] Fix a static calls to non-static for session captchaasperous2013-07-222-2/+4
| * | | | | [ticket/11620] Cleanup creation_test that was renamed on a cherry-pickasperous2013-07-221-69/+0
| * | | | | [ticket/11620] Update auth_provider for new interfaceasperous2013-07-221-1/+6
| * | | | | [ticket/11620] Added garbage_collection_testasperous2013-07-222-0/+121
| * | | | | [ticket/11620] Fixed check_ban_test errors with cache and ban warning messageasperous2013-07-221-6/+18
| * | | | | [ticket/11620] Fixed a typo on check_ban_testasperous2013-07-221-1/+1
| * | | | | [ticket/11620] Refactored check_isvalid_test to use session_test_caseasperous2013-07-221-20/+6
| * | | | | [ticket/11615] Refactored isvalid test to be more imperativeAndy Chase2013-07-222-85/+63
| * | | | | [ticket/11615] Rename continue -> check_isvalid for clarityAndy Chase2013-07-221-1/+1
| * | | | | [ticket/11620] Added a test for checking if users are bannedasperous2013-07-223-0/+121
| * | | | | [ticket/11620] Remove typo in beginning of session_key_testasperous2013-07-221-1/+1
| * | | | | [ticket/11620] Typo in file name session_key_tests -> testasperous2013-07-221-0/+0
| * | | | | [ticket/11620] Added a session key reset testasperous2013-07-221-5/+28
| * | | | | [ticket/11620] Added manual key testasperous2013-07-222-0/+72
| * | | | | [ticket/11620] Cherry-Pick merge tests from session-storage-cacheAndy Chase2013-07-222-7/+57
| * | | | | [ticket/11620] Abstracted session setUp into a test_case classasperous2013-07-225-56/+35
| * | | | | [ticket/11620] Removed unnecessary lines and whitespaceAndy Chase2013-07-092-10/+4
| * | | | | [ticket/11620] Rename provider -> mock_auth_providerAndy Chase2013-07-082-3/+4
| * | | | | [ticket/11620] Minor changes to tests for coding standardsAndy Chase2013-07-084-20/+28
| * | | | | [ticket/11620] More mock provider methodsAndy Chase2013-07-081-3/+25
| * | | | | [ticket/11620] Added validate_session to provider.Andy Chase2013-07-051-0/+7
| * | | | | [ticket/11620] Implemented a provider mock object.Andy Chase2013-07-052-1/+34
| * | | | | [ticket/11620] Reworked create_test without data providerAndy Chase2013-07-051-42/+11
| * | | | | [ticket/11620] Add create_test with test for bot detectionAndy Chase2013-07-052-10/+102
| * | | | | [ticket/11620] Fix typo and confusingly named testAndy Chase2013-07-051-2/+2
| * | | | | [ticket/11620] Add indentation, change quote style.Andy Chase2013-07-051-17/+17