aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/language
Commit message (Expand)AuthorAgeFilesLines
* [feature/oauth] Merge branch 'develop' of git://github.com/phpbb/phpbb3 into ...Joseph Warner2013-09-067-193/+161
|\
| * Merge branch 'develop-olympus' into developAndreas Fischer2013-09-023-3/+3
| |\
| | * Merge branch 'prep-release-3.0.12' into develop-olympusAndreas Fischer2013-09-023-3/+3
| | |\
| | | * [ticket/11769] Allow '0' as username in notification mailsJoas Schilling2013-08-233-3/+3
| | * | [ticket/11821] Fix comma usage next to "You are receiving this notification".Andreas Fischer2013-09-023-3/+3
| | |/
| * | Merge remote-tracking branch 'nickvergessen/ticket/11574' into developDhruv2013-08-081-3/+5
| |\ \
| | * | [ticket/11574] Remove install/udpate/new/ fallback from database_update.phpJoas Schilling2013-07-301-1/+1
| | * | Merge remote-tracking branch 'phpbb/develop' into ticket/11574Joas Schilling2013-07-302-186/+152
| | |\ \
| | * | | [ticket/11574] Change order of files and database updateJoas Schilling2013-07-291-2/+4
| * | | | Merge branch 'develop-olympus' into developJoas Schilling2013-07-301-1/+1
| |\ \ \ \ | | |_|/ / | |/| | / | | | |/ | | |/|
| | * | [ticket/11752] HTTP -> HTTPs in email/installed.txtAndreas Fischer2013-07-301-1/+1
| * | | Merge branch 'develop-olympus' into developAndreas Fischer2013-07-251-1/+1
| |\ \ \ | | |/ /
| | * | [ticket/11740] Update FAQ to include Ideas CentreMichaelC2013-07-251-1/+1
| * | | [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
| | |/ | |/|
* | | [feature/oauth] Changes due to code reviewJoseph Warner2013-08-242-5/+6
* | | [feature/oauth] Fix indentation on new language constantsJoseph Warner2013-08-241-7/+7
* | | [feature/oauth] Finish cleaning up TODOsJoseph Warner2013-08-241-0/+2
* | | [feature/oauth] Clean up TODOsJoseph Warner2013-08-241-0/+2
* | | [feature/oauth] Update language constants for ucp_auth_linkJoseph Warner2013-08-141-1/+5
* | | [feature/oauth] Start building the templateJoseph Warner2013-08-091-0/+1
* | | [feature/oauth] Forgot to have login_link be "in login" in ucpJoseph Warner2013-08-051-1/+2
* | | [feature/oauth] Start general auth linking pageJoseph Warner2013-08-051-0/+1
* | | [feature/oauth] Reword some of the language textJoseph Warner2013-07-301-2/+2
* | | [feature/oauth] Properly check that all data needed is availableJoseph Warner2013-07-291-0/+1
* | | [feature/oauth] Basic checking for data needed in login linkingJoseph Warner2013-07-291-2/+3
* | | [feature/oauth] More work on login linking accountsJoseph Warner2013-07-251-0/+1
* | | [feature/oauth] Template for ucp_login_link startedJoseph Warner2013-07-251-0/+2
* | | [feature/oauth] Move language constants for oauth services to common.phpJoseph Warner2013-07-242-3/+3
* | | [feature/oauth] Update error message with actual errorJoseph Warner2013-07-231-0/+1
* | | [feature/oauth] OAuth init method to minimally validate entered dataJoseph Warner2013-07-231-7/+8
* | | [feature/oauth] Clean up the OAuth ACP templateJoseph Warner2013-07-231-2/+1
* | | [feature/oauth] ACP options for OAuth, needs some workJoseph Warner2013-07-231-0/+9
|/ /
* | 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
generated by cgit v1.2.1 (git 2.21.0) at 2024-11-13 14:00:39 +0000