aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/language
Commit message (Expand)AuthorAgeFilesLines
* 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
* | 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
| |\ \ \ \ \ \ \ \