aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/language/en
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'ticket/suheb/11666' into develop-ascraeusJoas Schilling2014-03-281-3/+3
|\
| * [ticket/11666] Rewording POST_DELETED andSuhaib Khan2014-03-281-3/+4
| * [ticket/11666] Removing MESSAGE_DELETED..Suhaib Khan2014-03-101-1/+0
* | [ticket/12311] Use British-English spelling of licence in lang fileMatt Friedman2014-03-281-1/+1
* | [ticket/12311] Use valid composer schema - license - for extensionsMatt Friedman2014-03-271-1/+1
* | Merge branch 'develop-olympus' into develop-ascraeusJoas Schilling2014-03-242-3/+3
|\ \
| * | [ticket/10174] Rename "Ban usernames" to "Ban users" in ACPDaniel Schosser2014-03-232-3/+3
* | | Merge remote-tracking branch 'vsephpbb/ticket/11904' into develop-ascraeusJoas Schilling2014-03-221-1/+1
|\ \ \
| * | | [ticket/11904] Update explanation for what Allow CDN doesMatt Friedman2014-03-161-1/+1
* | | | Merge pull request #2137 from geetakshi/ticket/8309Dhruv Goel2014-03-201-1/+0
|\ \ \ \
| * | | | [ticket/8309] Removing key with similar function to avoid redundancygeetakshi2014-03-171-1/+0
| * | | | [ticket/8309] Moving key to get keys in alphabetical ordergeetakshi2014-03-161-1/+1
| * | | | [ticket/8309] Renaming "Last visit" to "Last activity"geetakshi2014-03-161-1/+1
| |/ / /
* | | | Merge remote-tracking branch 'netdeamon/ticket/12198-Language-issue' into dev...Joas Schilling2014-03-191-2/+0
|\ \ \ \
| * | | | [ticket/12198] Language issue in en/common.phpnetdeamon2014-03-181-2/+0
| |/ / /
* | | | [ticket/12269] Delete folder mods in languagenetdeamon2014-03-171-0/+0
|/ / /
* | | Merge remote-tracking branch 'EXreaction/ticket/9871-2' into developJoas Schilling2014-03-141-9/+3
|\ \ \
| * | | [ticket/9871] Update version check file to use json formatNathan Guse2014-02-191-9/+3
* | | | [ticket/11787] Changes <samp> to <strong> in en/acp/permissions.phpCrizzo2014-03-131-43/+43
* | | | Merge remote-tracking branch 'crizz0/ticket/8785' into developJoas Schilling2014-03-131-1/+5
|\ \ \ \
| * | | | [ticket/8785] Rebuilding posting_editor pm head + new language varsCrizzo2014-03-031-1/+5
| |/ / /
* | | | Merge pull request #2113 from nickvergessen/ticket/8041Andreas Fischer2014-03-132-2/+2
|\ \ \ \
| * | | | [ticket/8041] Wrap forum name, topic title and pm folder name with quotesJoas Schilling2014-03-121-1/+2
| * | | | [ticket/8041] Merge item name into "Return to" string for better translationsJoas Schilling2014-03-122-2/+1
* | | | | Merge branch 'develop-olympus' into developJoas Schilling2014-03-131-0/+1
|\ \ \ \ \ | | |_|/ / | |/| | |
| * | | | Merge remote-tracking branch 'bantu/ticket/12176' into develop-olympusJoas Schilling2014-03-131-0/+1
| |\ \ \ \
| | * | | | [ticket/12176] Display correct message when trying to delete founder.Andreas Fischer2014-02-151-0/+1
* | | | | | Merge remote-tracking branch 'vsephpbb/ticket/12244' into developJoas Schilling2014-03-121-1/+1
|\ \ \ \ \ \
| * | | | | | [ticket/12244] Rename extensions manager tabMatt Friedman2014-03-111-1/+1
| * | | | | | [ticket/12244] Rename link to Extensions Manager in the ACPMatt Friedman2014-03-031-1/+1
* | | | | | | Merge branch 'develop-olympus' into developAndreas Fischer2014-03-121-1/+1
|\ \ \ \ \ \ \ | | |/ / / / / | |/| | / / / | |_|_|/ / / |/| | | | |
| * | | | | [ticket/10549] changed "right" to "incorrect"Crizzo2014-03-111-1/+1
* | | | | | Merge remote-tracking branch 'remotes/upstream/develop-olympus' into developNathan Guse2014-03-101-1/+1
|\ \ \ \ \ \ | |/ / / / /
| * | | | | Merge pull request #2105 from Crizz0/ticket/12106Nathan Guse2014-03-101-1/+1
| |\ \ \ \ \
| | * | | | | [ticket/12106] Combined first and second sentenceCrizzo2014-03-101-1/+1
| | * | | | | [ticket/12106] Adds a explaination that admin/mods still able to use the boardCrizzo2014-03-101-1/+1
| | | |/ / / | | |/| | |
* | | | | | Merge branch 'develop-olympus' into developNathan Guse2014-03-101-0/+3
|\ \ \ \ \ \ | |/ / / / / | | | | | / | |_|_|_|/ |/| | | |
| * | | | [ticket/10549] Adds language variablesCrizzo2014-03-101-0/+3
| |/ / /
* | | | [ticket/12251] Add string validation for a-zA-Z0-9 and underscoreJoas Schilling2014-03-062-1/+4
* | | | [ticket/12236] Fix language key name for Yahoo MessangerJoas Schilling2014-03-061-1/+1
* | | | [ticket/12236] Move AOL Instant Messanger field to custom profile fieldJoas Schilling2014-03-054-7/+0
* | | | [ticket/12237] Convert yahoo messanger to custom profile fieldJoas Schilling2014-03-053-5/+1
* | | | Merge remote-tracking branch 'github-nickvergessen/ticket/12235' into developNils Adermann2014-03-056-23/+7
|\ \ \ \
| * | | | [ticket/12235] Convert WLM to custom profile fieldJoas Schilling2014-03-044-9/+1
| * | | | [ticket/12187] Remove user_website functionalityJoas Schilling2014-03-034-7/+0
| * | | | [ticket/12187] Add URL type for profile fieldsJoas Schilling2014-03-032-0/+2
| * | | | [ticket/12234] Replace ICQ with custom profile fieldJoas Schilling2014-02-284-7/+0
| * | | | [ticket/12233] Allow profile fields to be contact fieldsJoas Schilling2014-02-281-0/+4
| | |_|/ | |/| |
* | | | Merge pull request #2057 from nickvergessen/ticket/12226Nils Adermann2014-03-052-5/+10
|\ \ \ \ | |_|_|/ |/| | |
| * | | [ticket/12227] "X from Y messages" should be "X out of Y messages"Joas Schilling2014-02-241-6/+6