aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/includes
Commit message (Expand)AuthorAgeFilesLines
* Merge remote-tracking branch 'vsephpbb/ticket/11098' into develop-ascraeusJoas Schilling2014-04-101-2/+2
|\
| * [ticket/11098] Fix error reporting on the autologin key pagesMatt Friedman2014-04-091-2/+2
* | [ticket/12356] Assign vars preventing Plupload from loading in PM editor.Cesar G2014-04-091-1/+3
|/
* [ticket/12358] Correctly check and change the redirect url for ajax requestsJoas Schilling2014-04-071-3/+3
* Merge remote-tracking branch 'Marc/ticket/12150' into develop-ascraeusJoas Schilling2014-04-062-0/+14
|\
| * [ticket/12150] Use shorter column names for prune settingsMarc Alexander2014-03-291-9/+9
| * [ticket/12150] Add missing space to query for shadow topicsMarc Alexander2014-03-291-1/+1
| * [ticket/12150] Add missing prune settings variables in acp_forumsMarc Alexander2014-03-291-0/+6
| * [ticket/12150] Add file and caller for pruning shadow topicsMarc Alexander2014-03-291-0/+5
| * [ticket/12150] Add options to acpMarc Alexander2014-03-291-0/+3
* | Merge remote-tracking branch 'Marc/ticket/10851-ascraeus' into develop-ascraeusJoas Schilling2014-04-051-0/+4
|\ \
| * \ Merge branch 'ticket/10851' into ticket/10851-ascraeusMarc Alexander2014-04-041-0/+4
| |\ \
| | * | [ticket/10851] Set disallowed content to empty array if checking is disabledMarc Alexander2014-04-031-0/+4
* | | | Merge remote-tracking branch 'Elsensee/ticket/7707' into develop-ascraeusJoas Schilling2014-04-055-22/+9
|\ \ \ \
| * | | | [ticket/7707] Fix undefined variable: perm_fromOliver Schramm2014-04-041-1/+3
| * | | | [ticket/7707] Add comma to last entry of arraysOliver Schramm2014-04-011-2/+2
| * | | | [ticket/7707] Remove unnecessary variablesOliver Schramm2014-03-262-12/+1
| * | | | [ticket/7707] Add get_username_string() where possibleOliver Schramm2014-03-165-21/+17
* | | | | Merge remote-tracking branch 'paybas/ticket/12339' into develop-ascraeusJoas Schilling2014-04-041-0/+16
|\ \ \ \ \
| * | | | | [ticket/12339] removed return varPayBas2014-04-041-3/+2
| * | | | | [ticket/12339] more complete params and updated _since versionPayBas2014-04-041-3/+9
| * | | | | [ticket/12339] Add Event core.page_header_afterPayBas2014-04-011-0/+11
* | | | | | Merge remote-tracking branch 'vsephpbb/ticket/11962' into develop-ascraeusJoas Schilling2014-04-041-1/+1
|\ \ \ \ \ \
| * | | | | | [ticket/11962] Resize posted images to fit and give them a classMatt Friedman2014-03-301-1/+1
| | |_|_|_|/ | |/| | | |
* | | | | | Merge branch 'develop-olympus' into develop-ascraeusJoas Schilling2014-04-041-1/+1
|\ \ \ \ \ \ | |_|_|_|/ / |/| | | | |
| * | | | | [ticket/12353] Fix displayed attachments in ACPOliver Schramm2014-04-041-1/+1
| | |_|_|/ | |/| | |
* | | | | Merge remote-tracking branch 'vsephpbb/ticket/12043' into develop-ascraeusJoas Schilling2014-04-031-28/+55
|\ \ \ \ \
| * | | | | [ticket/12043] Correct try/catch exceptions for invalid extensionsMatt Friedman2014-03-291-49/+49
| * | | | | [ticket/12043] Sort Extensions by Display Name in ACP Extension manangerMatt Friedman2014-03-291-3/+30
* | | | | | Merge remote-tracking branch 'crizz0/ticket/9758' into develop-ascraeusJoas Schilling2014-03-317-108/+95
|\ \ \ \ \ \
| * | | | | | [ticket/9758] Clickable avatar in header and renamed class for avatar-imgCrizzo2014-03-301-0/+1
| * | | | | | [ticket/9758] Remove unnessary if-question for include functions_displayCrizzo2014-03-281-5/+0
| * | | | | | [ticket/9758] Slims the line 4775 in includes/functions.phpCrizzo2014-03-281-1/+1
| * | | | | | [ticket/9758] Adding impr. for overall_header display of avatar and usernameCrizzo2014-03-281-1/+2
| * | | | | | [ticket/9758] Fixed bug in mcp_warn.phpCrizzo2014-03-282-2/+9
| * | | | | | [ticket/9758] Error because of missing functions_display.php fixedCrizzo2014-03-282-2/+8
| * | | | | | [ticket/9758] Removed useless if-conditions to include functions.phpCrizzo2014-03-285-24/+0
| * | | | | | [ticket/9758] Adds global template variable CURRENT_USER_AVATARCrizzo2014-03-287-92/+93
* | | | | | | [prep-release-3.1.0-b2] Prepare development of 3.1.0-b3Joas Schilling2014-03-301-1/+1
* | | | | | | [prep-release-3.1.0-b2] Update version to 3.1.0-b2Joas Schilling2014-03-301-1/+1
| |_|_|/ / / |/| | | | |
* | | | | | Merge remote-tracking branch 'github-nickvergessen/ticket/11459' into develop...Nils Adermann2014-03-292-1233/+0
|\ \ \ \ \ \
| * | | | | | [ticket/11459] Remove old schema fileJoas Schilling2014-03-292-1233/+0
* | | | | | | Merge remote-tracking branch 'prototech/ticket/11959' into develop-ascraeusJoas Schilling2014-03-291-0/+32
|\ \ \ \ \ \ \ | |_|_|/ / / / |/| | | | | |
| * | | | | | [ticket/11959] Move phpbb_generate_string_list() to functions_content.php.Cesar G2014-03-292-32/+32
| * | | | | | [ticket/11959] Remove use of plurals and make it possible to use Oxford comma.Cesar G2014-03-191-5/+15
| * | | | | | [ticket/11959] Rename phpbb_gen_string_list() & fix incorrect var name.Cesar G2014-03-191-1/+1
| * | | | | | [ticket/11959] Add function to create a string list.Cesar G2014-03-191-0/+22
* | | | | | | Merge remote-tracking branch 'vsephpbb/ticket/12300' into develop-ascraeusJoas Schilling2014-03-291-0/+2
|\ \ \ \ \ \ \ | |_|/ / / / / |/| | | | | |
| * | | | | | [ticket/12300] Make only red topic/forum row icons clickable to unread postsMatt Friedman2014-03-281-0/+2
| | |_|_|/ / | |/| | | |
* | | | | | Merge branch 'develop-olympus' into develop-ascraeusJoas Schilling2014-03-291-0/+16
|\ \ \ \ \ \ | | |_|_|/ / | |/| | | |