aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/language/en
Commit message (Expand)AuthorAgeFilesLines
* [ticket/11582] Split permission language strings from logicJoas Schilling2013-07-141-132/+121
* [ticket/11582] Use new methods and remove duplicated entriesJoas Schilling2013-07-141-8/+0
* [ticket/11582] Use new class for categoriesJoas Schilling2013-07-141-16/+14
* [ticket/11582] Add new service for permissionsJoas Schilling2013-07-141-10/+6
* Merge branch 'develop-olympus' into developNils Adermann2013-07-135-10/+10
|\
| * Merge remote-tracking branch 'github-marc1706/ticket/11112' into prep-release...Nils Adermann2013-07-135-10/+10
| |\
| | * [ticket/11112] Do not change opensource.org link to httpsMarc Alexander2013-07-121-1/+1
| | * [ticket/11112] Use https for user-visible links to phpbb.comMarc Alexander2013-07-125-10/+10
* | | Merge branch 'develop-olympus' into developNils Adermann2013-07-131-1/+1
|\ \ \ | |/ /
| * | [ticket/11670] Consistency with logo: Replace "phpBB(tm)" with "phpBB(R)".Andreas Fischer2013-07-131-1/+1
| |/
* | Merge remote-tracking branch 'phpbb/develop' into ticket/9657Joas Schilling2013-07-135-7/+8
|\ \
| * | [ticket/11662] Typos: occured -> occurredAndreas Fischer2013-07-121-1/+1
| * | Merge branch 'develop-olympus' into developNathaniel Guse2013-07-123-5/+5
| |\ \ | | |/
| | * [ticket/11662] Typos: occured -> occurredAndreas Fischer2013-07-123-5/+5
| | * Merge remote-tracking branch 'remotes/nickv/ticket/8319' into develop-olympusNathaniel Guse2013-07-111-1/+2
| | |\
| * | \ Merge branch 'ticket/8319' into ticket/8319-develop2Joas Schilling2013-07-101-1/+2
| |\ \ \ | | | |/ | | |/|
| | * | [ticket/8319] Add explanation for RELATIVE_URL and update LOCAL_URLJoas Schilling2013-06-031-1/+2
* | | | [ticket/9657] Remove last references to m_restore permissionJoas Schilling2013-07-121-2/+1
* | | | [ticket/9657] Fix english language :(Joas Schilling2013-07-112-2/+2
* | | | 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
generated by cgit v1.2.1 (git 2.21.0) at 2024-11-13 19:33:42 +0000