aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/language/en/acp
Commit message (Expand)AuthorAgeFilesLines
* [ticket/11824] Add option for mod_rewriteDavid King2013-09-031-0/+4
* [ticket/11734] Readd accidently removed language strings of forum permissionsJoas Schilling2013-07-231-0/+11
* [ticket/11582] Fix documentation for adding permissionsJoas Schilling2013-07-141-27/+7
* [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-132-2/+2
|\
| * [ticket/11112] Use https for user-visible links to phpbb.comMarc Alexander2013-07-122-2/+2
* | Merge remote-tracking branch 'phpbb/develop' into ticket/9657Joas Schilling2013-07-132-2/+3
|\ \
| * \ Merge branch 'develop-olympus' into developNathaniel Guse2013-07-121-1/+1
| |\ \ | | |/
| | * [ticket/11662] Typos: occured -> occurredAndreas Fischer2013-07-121-1/+1
| | * 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
* | | | Merge remote-tracking branch 'phpbb/develop' into feature/softdelete-1-permis...Joas Schilling2013-07-113-2/+6
|\ \ \ \ | |/ / /
| * | | 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 PR #1209 branch 'dhruvgoel92/ticket/10325' into developOleg Pudeyev2013-05-081-0/+2
| |\ \
| | * | [ticket/10325] fix acp languageDhruv2013-05-041-1/+1
| | * | [ticket/10325] fix language in acp and ucpDhruv2013-04-301-1/+1
| | * | [ticket/10325] fix language in acp and ucpDhruv2013-04-251-1/+1
| | * | [ticket/10325] improve acp option languageDhruv2013-04-251-1/+1
| | * | [ticket/10325] change language varDhruv2013-04-251-2/+2
| | * | [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
| |/ /
| * | 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] Correctly split disapproving from perma deleting postsJoas Schilling2013-03-111-1/+1
* | | [ticket/9657] Fix some language problems and inconsistencesJoas Schilling2013-03-111-3/+3
* | | [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-052-0/+4
|\ \ \ | |/ /
| * | Merge remote-tracking branch 'remotes/marc/feature/avatars' into developNathaniel Guse2013-03-041-0/+1
| |\ \
| | * \ Merge branch 'develop' of https://github.com/phpbb/phpbb3 into feature/avatarsMarc Alexander2013-03-041-0/+2
| | |\ \
| | * \ \ Merge branch 'develop' of github.com:marc1706/phpbb3 into feature/avatarsMarc Alexander2012-12-241-4/+6
| | |\ \ \
| | * \ \ \ Merge branch 'develop' into feature/avatarsMarc Alexander2012-12-092-4/+5
| | |\ \ \ \
| | * | | | | [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-252-4/+7
| | |\ \ \ \ \
| | | * | | | | [ticket/11201] Revert WLM dropping because it is still used in China.Andreas Fischer2013-02-041-0/+1
| | | * | | | | [ticket/11201] Remove MSN/WLM fieldsJoas Schilling2013-01-111-1/+0
| | | | |_|/ / | | | |/| | |
| | * | | | | [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-061-4/+4
| | |\ \ \ \ \
| | * | | | | | [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-031-0/+2
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | Merge branch 'develop' of github.com:phpbb/phpbb3 into ticket/11103Nathan Guse2012-12-131-4/+6
| |\ \ \ \ \ \ | | | |_|/ / / | | |/| | | |
| * | | | | | Merge branch 'develop' of github.com:EXreaction/phpbb3 into ticket/11103Nathan Guse2012-12-072-4/+5
| |\ \ \ \ \ \ | | | |_|_|/ / | | |/| | | |