aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/includes
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #2363 from Elsensee/ticket/12451Joas Schilling2014-05-081-2/+2
|\
| * [ticket/12451] Remove duplicated lang varOliver Schramm2014-05-031-2/+2
| * [ticket/12451] Use new line to concatenate stringsOliver Schramm2014-05-031-2/+2
| * [ticket/12451] Split TOO_MANY_CHARS vars for pluralsOliver Schramm2014-05-031-1/+1
| * [ticket/12451] Split TOO_FEW_CHARS_LIMIT for pluralsOliver Schramm2014-05-031-1/+1
* | Merge pull request #2419 from prototech/ticket/12510Joas Schilling2014-05-081-0/+4
|\ \
| * | [ticket/12510] Convert & to & in build_url() when no params are stripped.Cesar G2014-05-061-0/+4
* | | Merge pull request #2421 from n-aleha/ticket/12493Joas Schilling2014-05-081-8/+7
|\ \ \
| * | | [ticket/12493] Fix sql query for selection of users that have disabled PMn-aleha2014-05-071-8/+7
* | | | Merge pull request #2413 from prototech/ticket/12357Joas Schilling2014-05-071-2/+2
|\ \ \ \ | |_|/ / |/| | |
| * | | [ticket/12357] Support routes in generate_smilies() function.Cesar G2014-05-051-2/+2
* | | | Merge pull request #2397 from Nicofuma/ticket/11497Joas Schilling2014-05-061-10/+12
|\ \ \ \
| * | | | [ticket/11497] Rename set_ext_finder in find_routing_filesTristan Darricau2014-05-051-2/+2
| * | | | [ticket/11497] Remove 'ext.finder' from services' listNicofuma2014-05-031-10/+12
| | |_|/ | |/| |
* | | | Merge remote-tracking branch 'VSEphpbb/ticket/12332' into develop-ascraeusCesar G2014-05-051-1/+1
|\ \ \ \ | |_|_|/ |/| | |
| * | | [ticket/12332] Restore some changes back to original stateMatt Friedman2014-04-262-2/+2
| * | | [ticket/12332] Accomplish all word creaking in template and CSSMatt Friedman2014-04-262-3/+3
| * | | [ticket/12332] Fix displaying attachments with long file namesMatt Friedman2014-04-252-2/+2
* | | | [ticket/12491] Fix clashing USERNAME_FULL template variable.Cesar G2014-05-041-3/+3
| |_|/ |/| |
* | | [prep-release-3.1.0-b3] Update phpBB Version for b4 developmentJoas Schilling2014-05-041-1/+1
* | | [prep-release-3.1.0-b3] Update version to 3.1.0-b3Joas Schilling2014-05-041-1/+1
* | | Merge pull request #2267 from prototech/ticket/10737Joas Schilling2014-05-031-0/+1
|\ \ \ | |_|/ |/| |
| * | [ticket/10737] Add config setting to disable live searches.Cesar G2014-04-231-0/+1
* | | Merge remote-tracking branch 'github-vse/ticket/12254' into develop-ascraeusNils Adermann2014-05-021-9/+14
|\ \ \
| * | | [ticket/12254] Use a cookie instead of SID to store language selectionMatt Friedman2014-05-021-2/+9
| * | | [ticket/12254] No longer need to add change_lang to the URL paramsMatt Friedman2014-04-111-5/+4
| * | | [ticket/12254] Use 'language' instead of 'set_lang' as the variable nameMatt Friedman2014-04-111-2/+2
| * | | [ticket/12254] Persist set_lang after reg only if changed from defaultMatt Friedman2014-04-071-2/+2
| * | | [ticket/12254] Use new set_lang var to avoid conflict with change_langMatt Friedman2014-04-071-3/+3
| * | | [ticket/12254] Better language switching on registration pageMatt Friedman2014-04-061-1/+0
* | | | Merge remote-tracking branch 'github-bantu/ticket/12473' into develop-ascraeusNils Adermann2014-05-021-0/+44
|\ \ \ \
| * | | | [ticket/12473] Move compatibility globals out into its own file.Andreas Fischer2014-05-021-0/+44
* | | | | Merge remote-tracking branch 'github-prototech/ticket/12265' into develop-asc...Nils Adermann2014-05-021-2/+49
|\ \ \ \ \
| * | | | | [ticket/12265] Actually use $u_pm.Cesar G2014-04-151-1/+1
| * | | | | [ticket/12265] Define a loop for contact icons.Cesar G2014-04-151-2/+49
* | | | | | Merge remote-tracking branch 'github-nickvergessen/feature/sqlite3' into deve...Nils Adermann2014-05-029-4/+144
|\ \ \ \ \ \
| * | | | | | [feature/sqlite3] Remove unneeded ORDER BY type from sqlite_master queriesJoas Schilling2014-05-021-1/+1
| * | | | | | [feature/sqlite3] Add support for SQLite 3Patrick Webster2014-05-029-4/+144
* | | | | | | Merge remote-tracking branch 'github-prototech/ticket/11508' into develop-asc...Nils Adermann2014-05-022-61/+15
|\ \ \ \ \ \ \ | |_|_|/ / / / |/| | | | | |
| * | | | | | [ticket/11508] Use $phpbb_path_helper.Cesar G2014-04-222-8/+6
| * | | | | | [ticket/11508] The question mark is expected even if there are no parameters.Cesar G2014-04-221-1/+1
| * | | | | | [ticket/11508] Change separator parameter to a simple true|false $is_amp.Cesar G2014-04-221-1/+1
| * | | | | | [ticket/11508] Move helper functions to path_helper class.Cesar G2014-04-222-118/+11
| * | | | | | [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-023-23/+95
|\ \ \ \ \ \ | |_|/ / / / |/| | | | |
| * | | | | [ticket/8323] Cache auth requestNathan Guse2013-09-051-2/+3
| * | | | | Merge branch 'develop' of github.com:phpbb/phpbb3 into ticket/8323Nathan Guse2013-09-05182-35340/+7624
| |\ \ \ \ \
| * | | | | | [ticket/8323] Combine into a single queryNathaniel Guse2013-05-011-30/+28