aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/language
Commit message (Expand)AuthorAgeFilesLines
* Merge remote-tracking branch 'phpbb/develop' into feature/softdelete-1-permis...Joas Schilling2013-07-1128-58/+29
|\
| * Merge branch 'develop-olympus' into developDhruv2013-06-051-1/+1
| |\
| | * [ticket/11583] Use a new lang key instead of giving the old one a new meaning.Andreas Fischer2013-06-031-1/+1
| | * [ticket/11583] Allow FULLTEXT indexes on InnoDB when on MySQL 5.6.4 or higher.Andreas Fischer2013-06-011-1/+1
| * | Merge branch 'develop-olympus' into developAndreas Fischer2013-05-261-0/+1
| |\ \ | | |/
| | * [ticket/11538] Simplify colour value check and remove support for '#'Marc Alexander2013-05-141-1/+1
| | * [ticket/11538] Use regex for testing color value and improve testsMarc Alexander2013-05-141-0/+1
| * | Merge remote-tracking branch 'remotes/Senky/ticket/11010' into developNathaniel Guse2013-05-211-2/+2
| |\ \
| | * | [ticket/11010] adding type="number" and type="date" to prosilverSenky2013-05-201-2/+2
| * | | [ticket/11279] Clearer AJAX errorsVjacheslav Trushkin2013-05-201-0/+3
| |/ /
| * | Merge remote-tracking branch 'EXreaction/ticket/11413' into developDavid King2013-05-201-0/+1
| |\ \
| | * | [ticket/11413] Translate the errorNathan Guse2013-05-101-0/+1
| * | | Merge PR #1209 branch 'dhruvgoel92/ticket/10325' into developOleg Pudeyev2013-05-082-0/+3
| |\ \ \ | | |/ / | |/| |
| | * | [ticket/10325] fix acp languageDhruv2013-05-041-1/+1
| | * | [ticket/10325] fix language in acp and ucpDhruv2013-04-302-2/+2
| | * | [ticket/10325] fix language in acp and ucpDhruv2013-04-252-2/+2
| | * | [ticket/10325] improve acp option languageDhruv2013-04-251-1/+1
| | * | [ticket/10325] fix language keyDhruv2013-04-251-1/+1
| | * | [ticket/10325] fix language variableDhruv2013-04-251-1/+1
| | * | [ticket/10325] change language varDhruv2013-04-251-2/+2
| | * | [ticket/10325] fix languageDhruv2013-04-251-1/+1
| | * | [ticket/10325] trigger error if forgot password option disabledDhruv2013-04-251-0/+1
| | * | [ticket/10325] add allow forgot password option in acpDhruv2013-04-251-0/+2
| * | | [ticket/11236] Change PRUNE_USERS_GROUP_EXPLAIN languageNathaniel Guse2013-04-251-1/+1
| |/ /
| * | Merge pull request #1361 from MGaetan89/ticket/11471Nils Adermann2013-04-2520-54/+10
| |\ \
| | * | [ticket/11471] Unrelated text in e-mail templatesGaëtan Muller2013-04-2420-54/+10
| * | | Merge remote-tracking branch 'github-asperous/ticket/9975' into developNils Adermann2013-04-243-0/+4
| |\ \ \
| | * | | [ticket/9975] Moved a few E_USER_ERROR errors to /languageasperous2013-04-233-0/+5
| | |/ /
| * | | Merge branch 'develop-olympus' into developNils Adermann2013-04-241-0/+1
| |\ \ \ | | |/ / | |/| / | | |/
| | * [ticket/9975] Translate missing style error messageGaëtan Muller2013-04-211-0/+1
| * | Migration file and change board_home_text to board_index_textTabitha Backoff2013-03-281-2/+2
| * | Ticket# 11477 - Allow customisation of "Board index"Tabitha Backoff2013-03-281-0/+2
* | | [ticket/9657] Remove softdelete reason field when permanent delete is selectedJoas Schilling2013-03-111-2/+2
* | | [ticket/9657] Correctly split disapproving from perma deleting postsJoas Schilling2013-03-111-1/+1
* | | [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