aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/language/en
Commit message (Collapse)AuthorAgeFilesLines
* [ticket/10744] Prevent installing styles with reserved namesJoas Schilling2014-11-211-0/+1
| | | | PHPBB3-10744
* Merge pull request #3108 from Elsensee/ticket/13284Joas Schilling2014-11-211-1/+1
|\ | | | | | | [ticket/13284] Message body not included in email
| * [ticket/13284] Fix request name so users can cc themselvesOliver Schramm2014-11-041-1/+1
| | | | | | | | PHPBB3-13284
* | Merge pull request #2765 from Elsensee/ticket/11863Joas Schilling2014-11-211-2/+3
|\ \ | | | | | | | | | [ticket/11863] Set require_activation to none if emails are disabled
| * | [ticket/11863] Display warning to user because of activation methodOliver Schramm2014-10-171-0/+1
| | | | | | | | | | | | PHPBB3-11863
| * | [ticket/11863] Grey out unavailable activation methods when emails disabledOliver Schramm2014-10-171-2/+2
| | | | | | | | | | | | | | | | | | | | | Further fall back to USER_ACTIVATION_DISABLE when emails are disabled but evaluate it at runtime. PHPBB3-11863
* | | [ticket/13083] Fix language string NO_ENTRIES for logsOliver Schramm2014-11-051-1/+1
| |/ |/| | | | | | | | | | | The string was misleading because there does not always have to be a period when viewing log entries. PHPBB3-13083
* | [ticket/13267] Update Automatic Update instructions to include vendor directoryPatrick Webster2014-11-011-1/+1
| | | | | | | | PHPBB3-13267
* | Merge remote-tracking branch 'Nicofuma/ticket/13126' into ticket/13211Marc Alexander2014-10-241-0/+4
|\ \
| * | [ticket/13126] Improve the feedback when running the migrationsTristan Darricau2014-10-141-0/+4
| | | | | | | | | | | | PHPBB3-13126
* | | [ticket/13205] Add a mark all messages read link to PM foldersNils Adermann2014-10-221-0/+2
| | | | | | | | | | | | PHPBB3-13205
* | | Merge pull request #3052 from VSEphpbb/ticket/13041Marc Alexander2014-10-211-32/+44
|\ \ \ | | | | | | | | | | | | [ticket/13041] Help_faq.php language file needs to be revised
| * | | [ticket/13041] Final grammar and language changes to help_faqMatt Friedman2014-10-211-9/+9
| | | | | | | | | | | | | | | | PHPBB3-13041
| * | | [ticket/13041] Added multiple changesMario Skouat2014-10-181-9/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Improper english in some sentences. - Improper use of singular/plural in some sentences - Replace "the board administrator" by "a board administrator" - Update the category "Posting Issues" and "Subscriptions and Bookmarks" PHPBB3-13041
| * | | [ticket/13041] Added multiple changesMario Skouat2014-10-111-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | - Added the changes reported by VSE. PHPBB3-13041
| * | | [ticket/13041] Added multiple changesMario Skouat2014-10-081-21/+25
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - "phpBB3" replaced by "phpBB" - Added the changes suggested by VSE. - "Subscriptions and Bookmarks" reviewed - Added trailing comma on modified lines PHPBB3-13041
| * | | [ticket/13041] Updating "Topic Subscriptions and Bookmarks"Mario Skouat2014-10-021-1/+1
| | | | | | | | | | | | | | | | PHPBB3-13041
| * | | [ticket/13041] Updating "phpBB3 Issues"Mario Skouat2014-10-021-2/+6
| | | | | | | | | | | | | | | | PHPBB3-13041
| * | | [ticket/13041] Updating "Searching the Forums"Mario Skouat2014-10-021-1/+1
| | | | | | | | | | | | | | | | PHPBB3-13041
| * | | [ticket/13041] Updating "Posting Issues"Mario Skouat2014-10-021-1/+1
| | | | | | | | | | | | | | | | PHPBB3-13041
| * | | [ticket/13041] Updating "Login and Registration Issues"Mario Skouat2014-10-021-4/+4
| | | | | | | | | | | | | | | | PHPBB3-13041
| * | | [ticket/13041] Updating "User Preferences and settings"Mario Skouat2014-10-011-4/+8
| | | | | | | | | | | | | | | | PHPBB3-13041
| * | | [ticket/13041] Reordering "Login and Registration Issues"Mario Skouat2014-09-211-17/+17
| | | | | | | | | | | | | | | | PHPBB3-13041
* | | | [ticket/13181] Replace database credentials with placeholders in sphinx confNils Adermann2014-10-181-1/+1
| |_|/ |/| | | | | | | | PHPBB3-13181
* | | [ticket/12796] Use dedicated lang varsPayBas2014-10-152-0/+3
| |/ |/| | | | | PHPBB3-12796
* | Merge pull request #2942 from Senky/ticket/12489Joas Schilling2014-10-071-1/+1
|\ \ | | | | | | | | | [ticket/12489] Description for Contact link in custom profile fields
| * | [ticket/12489] Language correctionJakub Senko2014-10-071-1/+1
| | | | | | | | | | | | PHPBB3-12489
| * | [ticket/12489] Add notice about %s wildcard in FIELD_IS_CONTACT_EXPLAINJakub Senko2014-09-181-1/+1
| | | | | | | | | | | | PHPBB3-12489
* | | Merge pull request #2307 from PayBas/ticket/12408Joas Schilling2014-10-061-1/+5
|\ \ \ | | | | | | | | | | | | [ticket/12408] Add quick setting for "default guest style" to ACP
| * | | [ticket/12408] Clarify the behavior of "override style"PayBas2014-09-151-1/+1
| | | | | | | | | | | | | | | | PHPBB3-12408
| * | | [ticket/12408] Changed lang vars, added fieldset and removed "default"PayBas2014-09-151-3/+4
| | | | | | | | | | | | | | | | PHPBB3-12408
| * | | [ticket/12408] Add quick setting for "default guest style" to ACPPayBas2014-09-151-0/+3
| | | | | | | | | | | | | | | | PHPBB3-12408
* | | | Merge branch 'develop-olympus' into develop-ascraeusAndreas Fischer2014-09-241-1/+1
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * develop-olympus: [ticket/13086] String replaces 50 with 20 Conflicts: phpBB/language/en/acp/email.php
| * | | | [ticket/13086] String replaces 50 with 20Mario Skouat2014-09-241-1/+1
| | | | | | | | | | | | | | | | | | | | PHPBB3-13086
* | | | | Merge pull request #2844 from marc1706/ticket/12858Joas Schilling2014-09-241-26/+28
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | [ticket/12858] Remove hard-coded GMT from timezone drop-down and rename to UTC
| * | | | | [ticket/12858] Remove hardcoded language entries from timezone selectsMarc Alexander2014-09-171-26/+28
| | |/ / / | |/| | | | | | | | | | | | | PHPBB3-12858
* | | | | Merge pull request #2954 from rxu/ticket/13055Joas Schilling2014-09-242-0/+11
|\ \ \ \ \ | |_|_|_|/ |/| | | | | | | | | [ticket/13055] Fix string profile fields validation to support unicode
| * | | | [ticket/13055] Add string profile fields validation options to support unicoderxu2014-09-182-0/+11
| | | | | | | | | | | | | | | | | | | | PHPBB3-13055
* | | | | Merge pull request #2875 from PayBas/ticket/12961Joas Schilling2014-09-181-0/+1
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ticket/12961] Add link in anti-spam ACP page which links directly to captchas in titania * PayBas/ticket/12961: [ticket/12961] Shorten ext-db link text [ticket/12961] Fix missing phpBB.com [ticket/12961] Remove target="_blank" and switch to <strong> [ticket/12961] Add additional link to the KB [ticket/12961] Move link to language file [ticket/12961] Refactor lang entry [ticket/12961] Change url to anti-spam-ext [ticket/12961] Change url to https://www.phpbb.com/go/anti-spam/ [ticket/12961] Add link in anti-spam ACP page to titania
| * | | | | [ticket/12961] Shorten ext-db link textPayBas2014-08-261-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-12961
| * | | | | [ticket/12961] Fix missing phpBB.comPayBas2014-08-231-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Don't know how that happened. Weird PHPBB3-12961
| * | | | | [ticket/12961] Remove target="_blank" and switch to <strong>PayBas2014-08-221-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-12961
| * | | | | [ticket/12961] Add additional link to the KBPayBas2014-08-211-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-12961
| * | | | | [ticket/12961] Move link to language filePayBas2014-08-151-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-12961
| * | | | | [ticket/12961] Refactor lang entryPayBas2014-08-141-2/+1
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-12961
| * | | | | [ticket/12961] Add link in anti-spam ACP page to titaniaPayBas2014-08-131-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-12961
* | | | | | Merge pull request #2927 from Senky/ticket/13022Joas Schilling2014-09-181-1/+1
|\ \ \ \ \ \ | |_|_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ticket/13022] "Return to advanced search" wrong assumption * Senky/ticket/13022: [ticket/13022] Language adjustments [ticket/13022] Remove ternary condition [ticket/13022] Condition Return to advanced search link
| * | | | | [ticket/13022] Language adjustmentsJakub Senko2014-09-081-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-13022
* | | | | | [ticket/13068] Language correction in FIELD_IS_CONTACT_EXPLAINGiampaolo Falqui2014-09-181-1/+1
| |_|_|/ / |/| | | | | | | | | | | | | | PHPBB3-13068
* | | | | [ticket/13019] Rename deletion reason label.Cesar G2014-09-141-1/+1
| | | | | | | | | | | | | | | | | | | | PHPBB3-13019