aboutsummaryrefslogtreecommitdiffstats
path: root/tests
Commit message (Collapse)AuthorAgeFilesLines
...
| * | | | | [ticket/11843] Add checking DEFINE variables with underscores to template_testrechosen2013-09-132-1/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | To prevent the underscore in DEFINE variables from being forgotten again, the template tests now test INCLUDEing a file based on the contents of a DEFINE variable with underscores in it. PHPBB3-11843
| * | | | | Merge pull request #1620 from EXreaction/ticket/11745David King2013-09-121-0/+29
| |\ \ \ \ \ | | | | | | | | | | | | | | Group join approved notification
| | * | | | | [ticket/11745] Add test for group request approvedNathan Guse2013-07-271-0/+29
| | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11745
| * | | | | | Merge pull request #1617 from EXreaction/ticket/11744David King2013-09-126-254/+365
| |\ \ \ \ \ \ | | |/ / / / / | | | | | | | [ticket/11744] Group join request notification
| | * | | | | [ticket/11744] Helper function to assert notifications in base testNathan Guse2013-07-273-168/+145
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This also fixes tests PHPBB3-11744
| | * | | | | [ticket/11744] Copyright yearNathan Guse2013-07-271-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11744
| | * | | | | [ticket/11744] Fix tests for postgresqlNathaniel Guse2013-07-263-50/+31
| | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11744
| | * | | | | [ticket/11744] spellingNathaniel Guse2013-07-261-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11744
| | * | | | | [ticket/11744] Empty notifications tables after testing themNathaniel Guse2013-07-261-0/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11744
| | * | | | | [ticket/11744] Tables are not truncated in some dbms during testsNathaniel Guse2013-07-262-11/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11744
| | * | | | | [ticket/11744] Fix functional test case that's failingNathaniel Guse2013-07-261-6/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11744
| | * | | | | [ticket/11744] Include onceNathaniel Guse2013-07-261-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11744
| | * | | | | [ticket/11744] CleanupNathaniel Guse2013-07-261-3/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11744
| | * | | | | [ticket/11744] Group request testNathaniel Guse2013-07-262-0/+127
| | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11744
| | * | | | | [ticket/11744] Create base notification test class for setupNathaniel Guse2013-07-262-83/+107
| | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11744
| * | | | | | Merge branch 'develop' of github.com:phpbb/phpbb3 into ticket/11816Nathan Guse2013-09-125-1/+224
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | # By Joseph Warner (187) and others # Via Nathan Guse (6) and others * 'develop' of github.com:phpbb/phpbb3: (195 commits) [ticket/11828] Fix greedy operators in lexer [ticket/11835] Fix ucp_auth_link adding in migration [prep-release-3.0.12] Remove changelog entry for ticket that was not resolved. [ticket/develop/11832] Fix path detection [feature/oauth] Fix tabindex [ticket/9550] Add the core.viewtopic_post_rowset_data event to viewtopic.php [ticket/11829] Use report_closed to determine status in MCP report_details [feature/oauth] Fix bug on ucp_auth_link related to error display [feature/oauth] More small fixes [feature/oauth] More minor changes from review [feature/oauth] Fix small bug introduced by update in OAuth library [feature/oauth] Fix small issues on ucp pages [feature/oauth] Fix typo in OAuth logout method [feature/oauth] Make token storage service ignorant [feature/oauth] Update oauth::logout() to use clearAllTokens() [feature/oauth] Update storage implementation due to inteface change [feature/oauth] Update lusitanian/oauth to stable branch [ticket/11822] Use namespace lookup order for asset loading [feature/oauth] Update comment on oauth service exception [feature/oauth] Forgot to remove placeholder comment ... Conflicts: phpBB/phpbb/template/twig/lexer.php tests/template/template_test.php
| | * | | | | | [ticket/11828] Fix greedy operators in lexerNathan Guse2013-09-122-1/+2
| | | |_|_|/ / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Use lazy operators and use stricter validation PHPBB3-11828
| | * | | | | [feature/oauth] Merge branch 'develop' of git://github.com/phpbb/phpbb3 into ↵Joseph Warner2013-09-0667-385/+1757
| | |\ \ \ \ \ | | | | |/ / / | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | feature/oauth Conflicts: phpBB/composer.json phpBB/composer.lock phpBB/develop/create_schema_files.php phpBB/includes/ucp/ucp_register.php PHPBB3-11673
| | * | | | | [feature/oauth] More small fixesJoseph Warner2013-09-021-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11673
| | * | | | | [feature/oauth] Make token storage service ignorantJoseph Warner2013-09-021-22/+22
| | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11673
| | * | | | | [feature/oauth] Fix remaining issues with token storageJoseph Warner2013-08-151-10/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11673
| | * | | | | [feature/oauth] Refactor test to provide for easier to read testsJoseph Warner2013-08-141-12/+17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11673
| | * | | | | [feature/oauth] Forgot new line characterJoseph Warner2013-08-011-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11673
| | * | | | | [feature/oauth] Add tests for the new token methodsJoseph Warner2013-07-291-0/+40
| | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11673
| | * | | | | [feature/oauth] Refactor clear token test to get more useful output firstJoseph Warner2013-07-241-3/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11673
| | * | | | | [feature/oauth] Fixes for problems found by testsJoseph Warner2013-07-241-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11673
| | * | | | | [feature/oauth] Clear token storage testJoseph Warner2013-07-241-0/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11673
| | * | | | | [feature/oauth] Has Access Token testJoseph Warner2013-07-241-1/+18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11673
| | * | | | | [feature/oauth] Clean up oauth_tokens test fixtureJoseph Warner2013-07-241-15/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11673
| | * | | | | [feature/oauth] Token storage test set_user_id()Joseph Warner2013-07-241-6/+20
| | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11673
| | * | | | | [feature/oauth] Replace spaces with tabsJoseph Warner2013-07-241-8/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11673
| | * | | | | [feature/oauth] Token Storage retrieve access token testJoseph Warner2013-07-241-4/+35
| | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11673
| | * | | | | [feature/oauth] Initial token storage testsJoseph Warner2013-07-242-0/+109
| | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11673
| | * | | | | [feature/oauth] Change name of new method on requestJoseph Warner2013-07-141-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11673
| | * | | | | [feature/oauth] Allow getting original global arrays from requestJoseph Warner2013-07-141-0/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11673
| * | | | | | Merge branch 'develop' of github.com:phpbb/phpbb3 into ticket/11816Nathan Guse2013-09-0612-142/+41
| |\ \ \ \ \ \ | | | |/ / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | # By David King (16) and others # Via David King (13) and others * 'develop' of github.com:phpbb/phpbb3: (67 commits) [ticket/11825] Move schema_data.php into includes/ instead of phpbb/ [ticket/11215] Remove unnecessary comment [ticket/11755] MySQL upgrader out of date [prep-release-3.0.12] Update Changelog for 3.0.12-RC3 release. [prep-release-3.0.12] Bumping version number for 3.0.12-RC3. [ticket/11823] Set up nginx server to match PHP files with characters after .php [ticket/11812] Fix empty define [ticket/11818] Update Symfony dependencies to 2.3.* [ticket/11791] Load adm/ events from styles/adm/event/ [ticket/11215] Fix helper_url_test.php tests [ticket/11215] Add newline back to .htaccess, fix wording [ticket/11215] Update comment in .htaccess [ticket/11215] Uncomment rewrite rules in .htaccess [ticket/11215] Make controller helper url() method use correct format [ticket/11215] Add commented-out URL rewrite capability to .htaccess [ticket/11821] Fix comma usage next to "You are receiving this notification". [ticket/11769] Allow using 0 as poster name [ticket/11769] Allow '0' as username [ticket/11215] Use new URL structure for controllers [ticket/11215] Everything appears to be working... ... Conflicts: phpBB/phpbb/template/twig/lexer.php tests/template/template_test.php
| | * | | | | Merge pull request #1102 from imkingdavid/ticket/11215Nathan Guse2013-09-022-20/+22
| | |\ \ \ \ \ | | | | | | | | | | | | | | | | [ticket/11215] Correct paths when path info is used for controller access
| | | * | | | | [ticket/11215] Fix helper_url_test.php testsDavid King2013-09-021-15/+17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11215
| | | * | | | | Merge remote-tracking branch 'upstream/develop' into ticket/11215David King2013-09-021-32/+2
| | | |\ \ \ \ \
| | | * | | | | | [ticket/11215] Use new URL structure for controllersDavid King2013-08-311-5/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In tests, the old app.php?controller=foo structure was used. Instead it should be app.php/foo. PHPBB3-11215
| | * | | | | | | [ticket/11812] Fix empty defineNathan Guse2013-09-022-1/+3
| | | |/ / / / / | | |/| | | | | | | | | | | | | | | | | | | | | PHPBB3-11812
| | * | | | | | Merge remote-tracking branch 'Hardolaf/ticket/11813' into developAndreas Fischer2013-09-011-32/+2
| | |\ \ \ \ \ \ | | | |/ / / / / | | |/| | | | | | | | | | | | | | | | | | | | | * Hardolaf/ticket/11813: [ticket/11813] Change mock auth provider to implement base provider
| | | * | | | | [ticket/11813] Change mock auth provider to implement base providerJoseph Warner2013-08-271-32/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11813
| | * | | | | | Merge remote-tracking branch 'EXreaction/ticket/11724' into developJoas Schilling2013-08-302-0/+9
| | |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * EXreaction/ticket/11724: [ticket/11724] Handle ELSE IF separately [ticket/11724] Replace spaces with tabs [ticket/11724] Support "ELSE IF" and "ELSEIF" in the same way
| | | * | | | | | [ticket/11724] Support "ELSE IF" and "ELSEIF" in the same wayNathan Guse2013-07-272-0/+9
| | | | |_|/ / / | | | |/| | | | | | | | | | | | | | | | | | | | PHPBB3-11724
| | * | | | | | Merge branch 'develop' of github.com:phpbb/phpbb3 into ticket/11628Nathan Guse2013-08-2829-62/+292
| | |\ \ \ \ \ \ | | | | |/ / / / | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | # By Bruno Ais (42) and others # Via Joas Schilling (39) and others * 'develop' of github.com:phpbb/phpbb3: (157 commits) [ticket/11803] Revert POLL_MAX_OPTIONS min value to 0 [ticket/11799] Send anti abuse headers in "new password" emails. [ticket/11792] Add functional test for var lang_set_ext of core.user_setup [ticket/11804] Remove </li> from overall_header which was not open [ticket/11802] replace $browser with $user->browser [ticket/11801] removed some whitespace and added missing semi colon's in css [ticket/11792] Add performance remark to core.user_setup event PHPDoc [ticket/11792] Add variable 'lang_set_ext' to event core.user_setup [ticket/11789] Remove inline color in memberlist_view [ticket/11800] Fix scripts variable in subsilver simple_footer [ticket/11800] Fix JavaScript in simple_footer.html [ticket/11800] Remove forum_fn from memberlist_search.html [ticket/11796] Replace pagination with pagination.html [ticket/11794] Add missing array element commas to docs/coding-guidelines.html [ticket/11775] Fix doc blocks syntax [ticket/11775] Remove spaces at line ends [ticket/11789] Remove colors from HTML code [ticket/11784] Remove naming redundancy for event listeners [ticket/11775] Split test into multiple steps [ticket/11777] Fix new test for loop variables in extension template listeners ... Conflicts: phpBB/install/index.php phpBB/install/install_update.php
| | * | | | | | [ticket/11628] Remove remaining style_path_provider_testNathaniel Guse2013-07-241-18/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11628
| | * | | | | | [ticket/11628] Remove template_path option on set_custom_styleNathaniel Guse2013-07-245-5/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This was set to default 'template/' to append template/ to all the paths, but every location was actually just setting it to '' to not append anything. So removed the option entirely (additional paths can be appended to the paths being sent to the function already) PHPBB3-11628
| | * | | | | | [ticket/11628] Remove third parameter ($names) from set_custom_styleNathaniel Guse2013-07-245-5/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This was basically duplicating functionality. $names would be used if not empty, else array($name) would be used. Merged functionality into the first argument PHPBB3-11628
| | * | | | | | [ticket/11628] Remove phpbb_style (move methods to phpbb_template)Nathaniel Guse2013-07-246-10/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11628