aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #4 from prototech/ticket/12431PayBas2014-05-042-3/+3
|\ | | | | [ticket/12431] Add topic poll icon.
| * [ticket/12431] Add topic poll icon.Cesar G2014-05-042-3/+3
|/ | | | PHPBB3-12431
* [ticket/12431] Add has_poll icon to topiclistsPayBas2014-05-026-0/+11
| | | | PHPBB3-12431
* Merge remote-tracking branch 'github-marc1706/ticket/12071' into ↵Nils Adermann2014-05-021-1/+40
|\ | | | | | | | | | | | | | | | | develop-ascraeus * github-marc1706/ticket/12071: [ticket/12071] Add test that covers not available fileinfo [ticket/12071] Get rid of unneeded cast to boolean in tests [ticket/12071] Skip tests that depend on fileinfo and fix expected results
| * [ticket/12071] Add test that covers not available fileinfomarc17062014-01-031-2/+22
| | | | | | | | | | | | | | | | The newly added test case will also emulate a non-existing fileinfo in order to check if the mimetype guesser is properly working when fileinfo is not available. PHPBB3-12071
| * [ticket/12071] Get rid of unneeded cast to boolean in testsmarc17062014-01-031-1/+1
| | | | | | | | PHPBB3-12071
| * [ticket/12071] Skip tests that depend on fileinfo and fix expected resultsmarc17062014-01-031-1/+20
| | | | | | | | | | | | | | | | | | | | Tests that depend on fileinfo being enabled will now be skipped to prevent fatal errors while running the test suite. The expected results will be modified to "application/octet-stream" in test_guess_files() if only the extension_guesser is available due to the non-existing extension of those files. PHPBB3-12071
* | Merge remote-tracking branch 'github-prototech/ticket/11508' into ↵Nils Adermann2014-05-026-62/+393
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | develop-ascraeus * github-prototech/ticket/11508: [ticket/11508] Fix build_url test. [ticket/11508] Add functional test for jumpbox. [ticket/11508] Use $phpbb_path_helper. [ticket/11508] Allow equal sign in parameter value. [ticket/11508] Remove unnecessary implode. [ticket/11508] Remove unnecessary isset check. [ticket/11508] Fix build_url test. [ticket/11508] Curly brace should be on its own line... [ticket/11508] The question mark is expected even if there are no parameters. [ticket/11508] Add tests. [ticket/11508] Do not add the '?' unless there are parameters. [ticket/11508] Change separator parameter to a simple true|false $is_amp. [ticket/11508] Move helper functions to path_helper class. [ticket/11508] Move the stripping param code to separate function as well. [ticket/11508] Build the jumpbox hidden fields using the _form action_ [ticket/11508] Split parts of build_url() into reusable functions.
| * | [ticket/11508] Fix build_url test.Cesar G2014-04-221-2/+2
| | | | | | | | | | | | PHPBB3-11508
| * | [ticket/11508] Add functional test for jumpbox.Cesar G2014-04-221-0/+33
| | | | | | | | | | | | PHPBB3-11508
| * | [ticket/11508] Use $phpbb_path_helper.Cesar G2014-04-222-8/+6
| | | | | | | | | | | | PHPBB3-11508
| * | [ticket/11508] Allow equal sign in parameter value.Cesar G2014-04-222-4/+21
| | | | | | | | | | | | PHPBB3-11508
| * | [ticket/11508] Remove unnecessary implode.Cesar G2014-04-221-1/+1
| | | | | | | | | | | | PHPBB3-11508
| * | [ticket/11508] Remove unnecessary isset check.Cesar G2014-04-221-4/+1
| | | | | | | | | | | | PHPBB3-11508
| * | [ticket/11508] Fix build_url test.Cesar G2014-04-221-3/+3
| | | | | | | | | | | | PHPBB3-11508
| * | [ticket/11508] Curly brace should be on its own line...Cesar G2014-04-221-1/+2
| | | | | | | | | | | | PHPBB3-11508
| * | [ticket/11508] The question mark is expected even if there are no parameters.Cesar G2014-04-221-1/+1
| | | | | | | | | | | | PHPBB3-11508
| * | [ticket/11508] Add tests.Cesar G2014-04-222-1/+214
| | | | | | | | | | | | PHPBB3-11508
| * | [ticket/11508] Do not add the '?' unless there are parameters.Cesar G2014-04-221-1/+1
| | | | | | | | | | | | PHPBB3-11508
| * | [ticket/11508] Change separator parameter to a simple true|false $is_amp.Cesar G2014-04-222-9/+10
| | | | | | | | | | | | PHPBB3-11508
| * | [ticket/11508] Move helper functions to path_helper class.Cesar G2014-04-223-118/+126
| | | | | | | | | | | | PHPBB3-11508
| * | [ticket/11508] Move the stripping param code to separate function as well.Cesar G2014-04-221-19/+37
| | | | | | | | | | | | PHPBB3-11508
| * | [ticket/11508] Build the jumpbox hidden fields using the _form action_Cesar G2014-04-222-6/+7
| | | | | | | | | | | | PHPBB3-11508
| * | [ticket/11508] Split parts of build_url() into reusable functions.Cesar G2014-04-221-28/+72
| | | | | | | | | | | | PHPBB3-11508
* | | Merge remote-tracking branch 'naderman/ticket/12469' into develop-ascraeusAndreas Fischer2014-05-021-14/+0
|\ \ \ | | | | | | | | | | | | | | | | * naderman/ticket/12469: [ticket/12469] Remove user table columns from fixtures that were deleted
| * | | [ticket/12469] Remove user table columns from fixtures that were deletedNils Adermann2014-05-021-14/+0
|/ / / | | | | | | | | | PHPBB3-12469
* | | Merge remote-tracking branch 'github-exreaction/ticket/8323' into ↵Nils Adermann2014-05-028-25/+246
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | develop-ascraeus * github-exreaction/ticket/8323: [ticket/8323] Cache auth request [ticket/8323] Combine into a single query [ticket/8323] Comments on phpbb_get_banned_user_ids input for test [ticket/8323] More readability in test case [ticket/8323] Comments [ticket/8323] dataProvider for the test; better test data [ticket/8323] Comments [ticket/8323] Unit test for phpbb_get_banned_user_ids [ticket/8323] Comments for inactive reasons in constants.php [ticket/8323] Only disable administrative deactivated accounts from receiving PMs [ticket/8323] Allow temporarily banned users to receive PMs, but not a notification [ticket/8323] Correct PM notification settings (only notify those who can receive them) [ticket/8323] Cleanup viewtopic code (not sure how this mess happened) [ticket/8323] Allow sending PMs to temporarily banned users [ticket/8323] Do not allow sending PMs to Inactive users [ticket/8323] Hide the Send PM link if users cannot receive the PM [ticket/8323] Correcting the comment [ticket/8323] Do not allow sending of Private Messages to users who are banned [ticket/8323] Remove code used for testing [ticket/8323] Do not allow sending of Private Messages to users who do not have permission to read private messages Conflicts: phpBB/language/en/ucp.php
| * | | [ticket/8323] Cache auth requestNathan Guse2013-09-051-2/+3
| | | | | | | | | | | | | | | | PHPBB3-8323
| * | | Merge branch 'develop' of github.com:phpbb/phpbb3 into ticket/8323Nathan Guse2013-09-05936-21985/+58233
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | # By Joas Schilling (613) and others # Via Andreas Fischer (214) and others * 'develop' of github.com:phpbb/phpbb3: (2494 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/includes/functions_privmsgs.php
| * | | | [ticket/8323] Combine into a single queryNathaniel Guse2013-05-011-30/+28
| | | | | | | | | | | | | | | | | | | | PHPBB3-8323
| * | | | [ticket/8323] Comments on phpbb_get_banned_user_ids input for testNathan Guse2012-12-131-0/+3
| | | | | | | | | | | | | | | | | | | | PHPBB3-8323
| * | | | [ticket/8323] More readability in test caseNathan Guse2012-12-111-3/+14
| | | | | | | | | | | | | | | | | | | | PHPBB3-8323
| * | | | [ticket/8323] CommentsNathan Guse2012-12-071-6/+15
| | | | | | | | | | | | | | | | | | | | PHPBB3-8323
| * | | | [ticket/8323] dataProvider for the test; better test dataNathan Guse2012-12-072-7/+23
| | | | | | | | | | | | | | | | | | | | PHPBB3-8323
| * | | | [ticket/8323] CommentsNathan Guse2012-12-072-7/+16
| | | | | | | | | | | | | | | | | | | | PHPBB3-8323
| * | | | [ticket/8323] Unit test for phpbb_get_banned_user_idsNathan Guse2012-12-072-0/+66
| | | | | | | | | | | | | | | | | | | | PHPBB3-8323
| * | | | [ticket/8323] Comments for inactive reasons in constants.phpNathan Guse2012-12-071-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Copied from language output PHPBB3-8323
| * | | | Merge branch 'develop' of git://github.com/phpbb/phpbb3 into ticket/8323Nathan Guse2012-12-07606-4322/+19831
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: phpBB/viewtopic.php
| * | | | | [ticket/8323] Only disable administrative deactivated accounts from ↵Nathan2012-07-105-8/+36
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | receiving PMs Allow other types of inactive accounts to receive PMs. Remove the banned PM error message and use the string saying they do not have permission (less translation) PHPBB3-8323
| * | | | | [ticket/8323] Allow temporarily banned users to receive PMs, but not a ↵Nathan2012-07-101-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | notification PHPBB3-8323
| * | | | | [ticket/8323] Correct PM notification settings (only notify those who can ↵Nathan2012-07-104-31/+38
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | receive them) Also correcting the way it was setup for users to be able to receive PMs (do not allow administrators/moderators to send to banned, inactive, or non-standard users, that just doesn't make sense) PHPBB3-8323
| * | | | | [ticket/8323] Cleanup viewtopic code (not sure how this mess happened)Nathan2012-07-101-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-8323
| * | | | | [ticket/8323] Allow sending PMs to temporarily banned usersNathan2012-07-105-18/+39
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Added an argument to the phpbb_get_banned_user_ids() function to allow specifying a banned end time (default true for current functionality, false for only permanent bans, timestamp to find banned until a specified time) PHPBB3-8323
| * | | | | [ticket/8323] Do not allow sending PMs to Inactive usersNathan2012-07-103-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-8323
| * | | | | [ticket/8323] Hide the Send PM link if users cannot receive the PMNathan2012-07-102-2/+22
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Updated memberlist/viewtopic to the new rules PHPBB3-8323
| * | | | | [ticket/8323] Correcting the commentNathan2012-07-101-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-8323
| * | | | | [ticket/8323] Do not allow sending of Private Messages to users who are bannedNathan2012-07-102-0/+18
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-8323
| * | | | | [ticket/8323] Remove code used for testingNathan2012-07-101-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-8323
| * | | | | [ticket/8323] Do not allow sending of Private Messages to users who do not ↵Nathan2012-07-102-0/+21
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | have permission to read private messages PHPBB3-8323
* | | | | | Merge branch 'develop-olympus' into develop-ascraeusNils Adermann2014-05-021-3/+4
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | * develop-olympus: [ticket/12468] Having mbstring.http_input set to '' is as good as 'pass'.
generated by cgit v1.2.1 (git 2.21.0) at 2025-11-12 11:25:32 +0000