aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge remote-tracking branch 'github-prototech/ticket/11508' into develop-asc...Nils Adermann2014-05-026-62/+393
|\
| * [ticket/11508] Fix build_url test.Cesar G2014-04-221-2/+2
| * [ticket/11508] Add functional test for jumpbox.Cesar G2014-04-221-0/+33
| * [ticket/11508] Use $phpbb_path_helper.Cesar G2014-04-222-8/+6
| * [ticket/11508] Allow equal sign in parameter value.Cesar G2014-04-222-4/+21
| * [ticket/11508] Remove unnecessary implode.Cesar G2014-04-221-1/+1
| * [ticket/11508] Remove unnecessary isset check.Cesar G2014-04-221-4/+1
| * [ticket/11508] Fix build_url test.Cesar G2014-04-221-3/+3
| * [ticket/11508] Curly brace should be on its own line...Cesar G2014-04-221-1/+2
| * [ticket/11508] The question mark is expected even if there are no parameters.Cesar G2014-04-221-1/+1
| * [ticket/11508] Add tests.Cesar G2014-04-222-1/+214
| * [ticket/11508] Do not add the '?' unless there are parameters.Cesar G2014-04-221-1/+1
| * [ticket/11508] Change separator parameter to a simple true|false $is_amp.Cesar G2014-04-222-9/+10
| * [ticket/11508] Move helper functions to path_helper class.Cesar G2014-04-223-118/+126
| * [ticket/11508] Move the stripping param code to separate function as well.Cesar G2014-04-221-19/+37
| * [ticket/11508] Build the jumpbox hidden fields using the _form action_Cesar G2014-04-222-6/+7
| * [ticket/11508] Split parts of build_url() into reusable functions.Cesar G2014-04-221-28/+72
* | Merge remote-tracking branch 'naderman/ticket/12469' into develop-ascraeusAndreas Fischer2014-05-021-14/+0
|\ \
| * | [ticket/12469] Remove user table columns from fixtures that were deletedNils Adermann2014-05-021-14/+0
|/ /
* | Merge remote-tracking branch 'github-exreaction/ticket/8323' into develop-asc...Nils Adermann2014-05-028-25/+246
|\ \
| * | [ticket/8323] Cache auth requestNathan Guse2013-09-051-2/+3
| * | Merge branch 'develop' of github.com:phpbb/phpbb3 into ticket/8323Nathan Guse2013-09-05936-21985/+58233
| |\ \
| * | | [ticket/8323] Combine into a single queryNathaniel Guse2013-05-011-30/+28
| * | | [ticket/8323] Comments on phpbb_get_banned_user_ids input for testNathan Guse2012-12-131-0/+3
| * | | [ticket/8323] More readability in test caseNathan Guse2012-12-111-3/+14
| * | | [ticket/8323] CommentsNathan Guse2012-12-071-6/+15
| * | | [ticket/8323] dataProvider for the test; better test dataNathan Guse2012-12-072-7/+23
| * | | [ticket/8323] CommentsNathan Guse2012-12-072-7/+16
| * | | [ticket/8323] Unit test for phpbb_get_banned_user_idsNathan Guse2012-12-072-0/+66
| * | | [ticket/8323] Comments for inactive reasons in constants.phpNathan Guse2012-12-071-4/+4
| * | | Merge branch 'develop' of git://github.com/phpbb/phpbb3 into ticket/8323Nathan Guse2012-12-07606-4322/+19831
| |\ \ \
| * | | | [ticket/8323] Only disable administrative deactivated accounts from receiving...Nathan2012-07-105-8/+36
| * | | | [ticket/8323] Allow temporarily banned users to receive PMs, but not a notifi...Nathan2012-07-101-2/+2
| * | | | [ticket/8323] Correct PM notification settings (only notify those who can rec...Nathan2012-07-104-31/+38
| * | | | [ticket/8323] Cleanup viewtopic code (not sure how this mess happened)Nathan2012-07-101-1/+1
| * | | | [ticket/8323] Allow sending PMs to temporarily banned usersNathan2012-07-105-18/+39
| * | | | [ticket/8323] Do not allow sending PMs to Inactive usersNathan2012-07-103-3/+3
| * | | | [ticket/8323] Hide the Send PM link if users cannot receive the PMNathan2012-07-102-2/+22
| * | | | [ticket/8323] Correcting the commentNathan2012-07-101-1/+1
| * | | | [ticket/8323] Do not allow sending of Private Messages to users who are bannedNathan2012-07-102-0/+18
| * | | | [ticket/8323] Remove code used for testingNathan2012-07-101-1/+1
| * | | | [ticket/8323] Do not allow sending of Private Messages to users who do not ha...Nathan2012-07-102-0/+21
* | | | | Merge branch 'develop-olympus' into develop-ascraeusNils Adermann2014-05-021-3/+4
|\ \ \ \ \
| * \ \ \ \ Merge remote-tracking branch 'github-bantu/ticket/12468' into develop-olympusNils Adermann2014-05-022-7/+6
| |\ \ \ \ \
| | * | | | | [ticket/12468] Having mbstring.http_input set to '' is as good as 'pass'.Andreas Fischer2014-05-021-3/+4
* | | | | | | Merge pull request #2336 from Nicofuma/ticket/12413Joas Schilling2014-05-027-43/+1596
|\ \ \ \ \ \ \
| * | | | | | | [ticket/12413] Update configuration's assertsNicofuma2014-05-021-2/+2
| * | | | | | | [ticket/12413] Update initNicofuma2014-05-021-3/+1
| * | | | | | | [ticket/12413] Remove unnecessary castsNicofuma2014-05-021-2/+2
| * | | | | | | [ticket/12413] Disabled unapproved and solftdeleted testsNicofuma2014-05-021-9/+22