aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB
Commit message (Expand)AuthorAgeFilesLines
* Merge remote-tracking branch 'github-prototech/ticket/11508' into develop-asc...Nils Adermann2014-05-023-61/+131
|\
| * [ticket/11508] Use $phpbb_path_helper.Cesar G2014-04-222-8/+6
| * [ticket/11508] Allow equal sign in parameter value.Cesar G2014-04-221-4/+6
| * [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] 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] 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 'github-exreaction/ticket/8323' into develop-asc...Nils Adermann2014-05-026-25/+150
|\ \
| * | [ticket/8323] Cache auth requestNathan Guse2013-09-051-2/+3
| * | Merge branch 'develop' of github.com:phpbb/phpbb3 into ticket/8323Nathan Guse2013-09-05633-20256/+39967
| |\ \
| * | | [ticket/8323] Combine into a single queryNathaniel Guse2013-05-011-30/+28
| * | | [ticket/8323] CommentsNathan Guse2012-12-071-6/+15
| * | | [ticket/8323] CommentsNathan Guse2012-12-072-7/+16
| * | | [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-07462-3987/+15410
| |\ \ \
| * | | | [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
|\ \ \ \ \
| * | | | | [ticket/12468] Having mbstring.http_input set to '' is as good as 'pass'.Andreas Fischer2014-05-021-3/+4
| * | | | | Merge remote-tracking branch 'github-marc1706/ticket/8960-olympus' into devel...Nils Adermann2014-05-022-2/+2
| |\ \ \ \ \
| * \ \ \ \ \ Merge pull request #2319 from n-aleha/ticket/12186Joas Schilling2014-04-292-1/+40
| |\ \ \ \ \ \
| * | | | | | | [ticket/12413] Revert e65a6dd8f45d0ce4c8700fb68c19ac6268162aa0Joas Schilling2014-04-221-70/+9
* | | | | | | | Merge pull request #2336 from Nicofuma/ticket/12413Joas Schilling2014-05-026-43/+90
|\ \ \ \ \ \ \ \
| * | | | | | | | [ticket/12413] Move parent:open() call to the end of the functionNicofuma2014-05-022-4/+4
| * | | | | | | | [ticket/12413] Fix coding styleNicofuma2014-05-023-4/+5
| * | | | | | | | [ticket/12413] Fix: coding styleNicofuma2014-05-022-46/+10
| * | | | | | | | [ticket/12413] Adding the missing visibilitiesNicofuma2014-05-021-9/+9
| * | | | | | | | [ticket/12413] Fatal Error for feed.php?mode=forumsTristan Darricau2014-05-026-6/+88
* | | | | | | | | Merge branch 'exreaction/ticket/11881' into develop-ascraeusNils Adermann2014-05-021-10/+35
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | [ticket/11881] Limit to 500Nathan Guse2013-10-041-1/+1
| * | | | | | | | | [ticket/11881] Make sure user_timezone isn't converted twiceNathan Guse2013-10-041-1/+6
| * | | | | | | | | [ticket/11881] Better split the timezone conversion into chunks; add testNathan Guse2013-10-041-12/+20
| * | | | | | | | | [ticket/11881] Timezone migration can take a long timeNathan2013-10-021-2/+14
* | | | | | | | | | Merge remote-tracking branch 'github-rxu/ticket/12403' into develop-ascraeusNils Adermann2014-05-022-2/+56
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | [ticket/12403] Add template events to acp_users_prefs.htmlrxu2014-04-252-2/+56