aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'develop-olympus' into develop-ascraeusMarc Alexander2014-05-021-0/+1
|\
| * [ticket/12120] Add Marc Alexander to AUTHORSJoas Schilling2014-05-021-0/+1
* | Merge remote-tracking branch 'github-prototech/ticket/12265' into develop-asc...Nils Adermann2014-05-0222-79/+229
|\ \
| * | [ticket/12265] Actually use $u_pm.Cesar G2014-04-151-1/+1
| * | [ticket/12265] Ensure that dropdown is always at the very left of the containerCesar G2014-04-151-0/+1
| * | [ticket/12265] Define a loop for contact icons.Cesar G2014-04-154-66/+117
| * | [ticket/12265] Break the icons that aren't in loop in case extensions add moreCesar G2014-04-152-0/+12
| * | [ticket/12265] Fix modulo logic.Cesar G2014-04-152-2/+2
| * | [ticket/12265] Adjust alignment of AIM and Jabber icons.Cesar G2014-04-151-2/+2
| * | [ticket/12265] Ensure that there's only 4 icons per row in IE & Opera.Cesar G2014-04-151-0/+4
| * | [ticket/12265] Add contact icon and remove border from last row & cells.Cesar G2014-04-156-46/+70
| * | [ticket/12265] Fix issue with dropdown being restricted by the width of parentCesar G2014-04-152-2/+13
| * | [ticket/12265] Remove ugly logic.Cesar G2014-04-153-47/+12
| * | [ticket/12265] Simplify contact icon design and move to dropdown.Cesar G2014-04-1516-66/+149
* | | Merge remote-tracking branch 'github-nickvergessen/feature/sqlite3' into deve...Nils Adermann2014-05-0219-121/+757
|\ \ \
| * | | [feature/sqlite3] Remove unneeded ORDER BY type from sqlite_master queriesJoas Schilling2014-05-022-5/+3
| * | | [feature/sqlite3] Correctly recreate indexes when recreating a tableJoas Schilling2014-05-021-82/+135
| * | | [feature/sqlite3] Fix sql_index_drop() for sqlite3Joas Schilling2014-05-021-1/+1
| * | | [feature/sqlite3] Remove trailing comma from column listJoas Schilling2014-05-021-1/+6
| * | | [feature/sqlite3] Update docblocks and function visibilityPatrick Webster2014-05-021-23/+48
| * | | [feature/sqlite3] Add support for SQLite 3Patrick Webster2014-05-0219-55/+610
* | | | 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