aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/language/en/acp
Commit message (Expand)AuthorAgeFilesLines
* [ticket/15642] Replace > with >Jakub Senko2018-09-251-1/+1
* Merge branch 'prep-release-3.2.3' into 3.2.xMarc Alexander2018-07-301-1/+4
|\
| * [ticket/15731] Fix language string parametersRubén Calvo2018-07-301-1/+4
* | [ticket/15674] Improve CPF lang descriptionsJakub Senko2018-06-191-2/+2
|/
* Merge pull request #5246 from marc1706/ticket/15633Marc Alexander2018-06-171-1/+1
|\
| * [ticket/15633] Double space to single spacescootergrisen2018-06-171-1/+1
* | Merge pull request #5190 from Crizz0/ticket/15627Marc Alexander2018-06-171-2/+2
|\ \ | |/ |/|
| * [ticket/15627] Reword the YES_ACCURATE_PM_BUTTON incl explainationChristian Schnegelberger2018-04-111-2/+2
* | [ticket/15548] Fix dead link in ACP_COOKIE_SETTINGS_EXPLAIN language entryrxu2018-06-011-1/+1
* | [ticket/15630] ACP_COOKIE_SETTINGS_EXPLAIN change <b> to <strong>Christian Schnegelberger2018-04-141-1/+1
|/
* Merge pull request #5094 from JoshyPHP/ticket/15518Marc Alexander2018-02-211-0/+2
|\
| * [ticket/15518] Add a setting to toggle permission checks for pms in viewtopicJoshyPHP2018-01-171-0/+2
* | Merge pull request #5103 from JoshyPHP/ticket/15531Marc Alexander2018-01-251-0/+1
|\ \
| * | [ticket/15531] Log malformed BBCodesJoshyPHP2018-01-221-0/+1
| |/
* | Merge pull request #5100 from senky/ticket/15528Marc Alexander2018-01-241-0/+1
|\ \
| * | [ticket/15528] Rename column labelJakub Senko2018-01-221-1/+1
| * | [ticket/15528] Display style phpBB versionJakub Senko2018-01-211-0/+1
| |/
* | [ticket/15514] Improve SMTP_SERVER lang keyJakub Senko2018-01-241-1/+1
|/
* [ticket/15322] Adjust language variables as suggestedMarc Alexander2017-12-271-2/+2
* [ticket/15322] Adjust email language and move force sender settingMarc Alexander2017-12-161-2/+2
* [ticket/15322] Try to make new email setting more readableMarc Alexander2017-12-131-2/+2
* [ticket/15322] Add config setting for -f parameter & remove mail function nameMarc Alexander2017-12-111-2/+2
* Merge pull request #4977 from rxu/ticket/15384Marc Alexander2017-11-011-19/+19
|\
| * [ticket/15384] Use html5 version of <br> instead of xhtml oneMarc Alexander2017-11-011-19/+19
| * [ticket/15384] Add linebreaks to SMTP/Jabber configuration option explanationsrxu2017-10-021-6/+6
* | Merge pull request #4973 from DavidIQ/ticket/15372Marc Alexander2017-11-011-0/+1
|\ \
| * | [ticket/15372] Add and handle f_list_topics permissionDavid Colón2017-10-261-0/+1
| |/
* | Merge pull request #4980 from senky/ticket/15381Marc Alexander2017-10-311-1/+1
|\ \
| * | [ticket/15381] Better explain CONTACT_US_ENABLE_EXPLAINJakub Senko2017-10-021-1/+1
| |/
* | Merge pull request #4975 from senky/ticket/15273Marc Alexander2017-10-311-1/+1
|\ \ | |/ |/|
| * [ticket/15273] Better explain cookie pathJakub Senko2017-09-281-1/+1
| * Merge pull request #32 from phpbb/ticket/security-203Marc Alexander2017-07-161-5/+8
| |\
* | | [ticket/15352] Descriptions are not using in categoriesJim Mossing Holsteyn2017-09-081-1/+1
* | | Merge pull request #35 from phpbb/ticket/security-203-rheaMarc Alexander2017-07-161-8/+11
|\ \ \
| * \ \ Merge branch 'ticket/security-203' into ticket/security-203-rheaMarc Alexander2016-12-281-8/+11
| |\ \ \ | | | |/ | | |/|
| | * | [ticket/security-203] Fully validate version check data in version helperMarc Alexander2016-12-261-5/+8
* | | | Merge pull request #4794 from lr94/ticket/15176Marc Alexander2017-06-241-0/+2
|\ \ \ \
| * | | | [ticket/15176] Add setting for user activity display limit.lr942017-04-161-0/+2
* | | | | Merge branch '3.1.x' into 3.2.xMarc Alexander2017-06-051-16/+22
|\ \ \ \ \ | | |_|_|/ | |/| | |
| * | | | Merge pull request #4784 from rubencm/ticket/15150Marc Alexander2017-06-051-16/+22
| |\ \ \ \
| | * | | | [ticket/15150] Add Jabber SSL context configuration optionsRubén Calvo2017-03-301-16/+22
* | | | | | [ticket/15198] Add PHP version to board stats in the ACPMatt Friedman2017-04-261-6/+2
* | | | | | Merge branch '3.1.x' into 3.2.xTristan Darricau2017-04-191-1/+4
|\ \ \ \ \ \ | |/ / / / /
| * | | | | Merge pull request #4781 from nomind60s/ticket/15151Tristan Darricau2017-04-191-1/+4
| |\ \ \ \ \ | | |/ / / / | |/| | | |
| | * | | | [ticket/15151] Use redirected link for consistencynomind60s2017-04-191-1/+1
| | * | | | [ticket/15151] ACP Cookie settings explanatory textnomind60s2017-03-291-1/+1
| | * | | | [ticket/15151] ACP Cookie settings add explanatory text where it was missingnomind60s2017-03-291-1/+4
* | | | | | Merge pull request #4705 from nomind60s/ticket/15097Tristan Darricau2017-04-181-1/+6
|\ \ \ \ \ \ | |_|_|/ / / |/| | | | |
| * | | | | [ticket/15097] New 'Installed software' lead sectionnomind60s2017-02-191-2/+6
| * | | | | [ticket/15097] Resolve travis-ci errornomind60s2017-02-171-1/+1