aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/language/en
Commit message (Expand)AuthorAgeFilesLines
* [ticket/9657] Include poster name in "deleted post" messageJoas Schilling2013-03-111-2/+2
* [ticket/9657] Fix some language problems and inconsistencesJoas Schilling2013-03-113-6/+6
* [ticket/9657] Explain soft delete permission in ACPJoas Schilling2013-03-071-2/+2
* [ticket/9657] Move softdelete permission to new post-tabJoas Schilling2013-03-061-1/+1
* Merge branch 'develop' of https://github.com/phpbb/phpbb3 into feature/softde...Joas Schilling2013-03-055-4/+25
|\
| * Merge remote-tracking branch 'EXreaction/ticket/11394' into developDavid King2013-03-041-4/+0
| |\
| | * [ticket/11394] Relax Migration ToolsNathaniel Guse2013-03-041-4/+0
| * | Merge remote-tracking branch 'EXreaction/ticket/11393' into developDavid King2013-03-041-0/+3
| |\ \
| | * | [ticket/11393] Give more information on database updaterNathaniel Guse2013-03-031-0/+3
| | |/
| * | Merge remote-tracking branch 'remotes/marc/feature/avatars' into developNathaniel Guse2013-03-043-0/+19
| |\ \
| | * \ Merge branch 'develop' of https://github.com/phpbb/phpbb3 into feature/avatarsMarc Alexander2013-03-0431-10/+425
| | |\ \ | | | |/
| | * | [feature/avatars] Use "Main" as category for avatars in root of galleryMarc Alexander2013-02-191-0/+1
| | * | Merge branch 'develop' of https://github.com/phpbb/phpbb3 into feature/avatarsMarc Alexander2013-02-072-3/+14
| | |\ \
| | * | | [feature/avatars] Improve handling of incorrect input for avatarsMarc Alexander2013-01-041-0/+1
| | * | | Merge branch 'develop' of https://github.com/phpbb/phpbb3 into feature/avatarsMarc Alexander2013-01-041-1/+1
| | |\ \ \
| | * | | | [feature/avatars] Inform user of no available local avatarsMarc Alexander2013-01-041-0/+1
| | * | | | Merge branch 'develop' of github.com:marc1706/phpbb3 into feature/avatarsMarc Alexander2012-12-242-4/+8
| | |\ \ \ \
| | * \ \ \ \ Merge branch 'develop' into feature/avatarsMarc Alexander2012-12-097-11/+64
| | |\ \ \ \ \
| | * | | | | | [feature/avatars] Change gravatar explain as discussed in PRMarc Alexander2012-11-251-1/+1
| | * | | | | | [feature/avatars] Add missing language variables for avatarsMarc Alexander2012-11-161-0/+15
| | * | | | | | [feature/avatars] Add gravatar to avatar settingsMarc Alexander2012-11-161-0/+1
| * | | | | | | Merge remote-tracking branch 'remotes/nickv/ticket/10411-2' into developNathaniel Guse2013-03-041-0/+3
| |\ \ \ \ \ \ \ | | |_|_|_|_|_|/ | |/| | | | | |
| | * | | | | | Merge branch 'develop' of https://github.com/phpbb/phpbb3 into ticket/10411-2Joas Schilling2013-02-271-0/+3
| | |\ \ \ \ \ \
| | * \ \ \ \ \ \ Merge branch 'develop' of https://github.com/phpbb/phpbb3 into ticket/10411-2Joas Schilling2013-02-257-9/+82
| | |\ \ \ \ \ \ \
| | * | | | | | | | [ticket/10411] Use template loops instead of defining the html in php filesJoas Schilling2013-02-251-2/+2
| | * | | | | | | | Merge branch 'develop' of https://github.com/phpbb/phpbb3 into ticket/10411-2Joas Schilling2012-12-066-11/+62
| | |\ \ \ \ \ \ \ \
| | * | | | | | | | | [ticket/10411] Use new teampage and legend class in ACP and memberlistJoas Schilling2012-11-141-0/+3
| | | |_|_|/ / / / / | | |/| | | | | | |
* | | | | | | | | | Merge branch 'develop' of https://github.com/phpbb/phpbb3 into feature/softde...Joas Schilling2013-03-0332-14/+440
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / /
| * | | | | | | | | [ticket/11103] Few more minor language thingsNathan Guse2013-02-281-3/+3
| * | | | | | | | | Merge branch 'develop' of git://github.com/phpbb/phpbb3 into ticket/11103Nathaniel Guse2013-02-264-1/+60
| |\ \ \ \ \ \ \ \ \ | | | |_|_|/ / / / / | | |/| | | | | | |
| | * | | | | | | | Merge remote-tracking branch 'EXreaction/feature/migrations-data' into developDavid King2013-02-261-0/+3
| | |\ \ \ \ \ \ \ \ | | | |_|_|/ / / / / | | |/| | | | | | |
| | | * | | | | | | Merge branch 'develop' of git://github.com/phpbb/phpbb3 into feature/migratio...Nathaniel Guse2013-02-231-0/+56
| | | |\ \ \ \ \ \ \
| | | * | | | | | | | [feature/migrations] Remove hardcoded language, use lang instead.Nathan Guse2013-02-061-0/+3
| | | | |_|_|_|_|_|/ | | | |/| | | | | |
| | * | | | | | | | Merge branch 'develop-olympus' into developNils Adermann2013-02-242-1/+1
| | |\ \ \ \ \ \ \ \ | | | |_|/ / / / / / | | |/| | | | | | |
| | | * | | | | | | [ticket/10896] Move EMAIL_INVALID_EMAIL to common, replace EMAIL_INVALIDNathan Guse2013-02-042-2/+1
| | | * | | | | | | [ticket/10896] Adds email validation to email settings in ACPDavid Tobin2013-02-041-0/+1
| | * | | | | | | | [feature/migrations] Add explanatory language string for migration errorsNathaniel Guse2013-02-091-0/+1
| | * | | | | | | | [feature/migrations] Add language strings for migrations errorsNathaniel Guse2013-02-091-0/+55
| | | |/ / / / / / | | |/| | | | | |
| * | | | | | | | [ticket/11103] Make the number of notifications strong if > 0Nathaniel Guse2013-02-131-2/+3
| * | | | | | | | Merge branch 'develop' of https://github.com/phpbb/phpbb3 into ticket/11103Nathaniel Guse2013-02-112-3/+14
| |\ \ \ \ \ \ \ \ | | |/ / / / / / /
| | * | | | | | | [ticket/11201] Revert WLM dropping because it is still used in China.Andreas Fischer2013-02-044-0/+9
| | * | | | | | | Merge branch 'develop-olympus' into developAndreas Fischer2013-02-031-3/+3
| | |\ \ \ \ \ \ \ | | | |/ / / / / /
| | | * | | | | | [ticket/11220] Improvement to the info pop-up from "list="Crizz02013-02-031-3/+3
| | * | | | | | | [ticket/11328] Add language variables for buttonsVjacheslav Trushkin2013-01-161-0/+11
| | * | | | | | | [ticket/11201] Remove MSN/WLM fieldsJoas Schilling2013-01-114-9/+0
| | | |_|_|_|_|/ | | |/| | | | |
| * | | | | | | Merge branch 'develop' of github.com:phpbb/phpbb3 into ticket/11103Nathan Guse2013-01-151-1/+1
| |\ \ \ \ \ \ \ | | |/ / / / / /
| | * | | | | | Merge PR #1130 branch 'EXreaction/ticket/11259' into developOleg Pudeyev2012-12-291-1/+1
| | |\ \ \ \ \ \ | | | |_|_|_|_|/ | | |/| | | | |
| | | * | | | | [ticket/11259] Make phpbb_admin_path available everywhereNathan Guse2012-12-091-1/+1
| | | | |_|_|/ | | | |/| | |
| * | | | | | Merge branch 'develop' of github.com:phpbb/phpbb3 into ticket/11103Nathan Guse2012-12-131-4/+6
| |\ \ \ \ \ \ | | |/ / / / /
| * | | | | | Merge branch 'develop' of git://github.com/phpbb/phpbb3 into ticket/11103Nathaniel Guse2012-12-121-0/+2
| |\ \ \ \ \ \