aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/language
Commit message (Collapse)AuthorAgeFilesLines
...
| | | | * | [ticket/11769] Allow '0' as username in notification mailsJoas Schilling2013-08-233-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11769
| | | * | | [ticket/11821] Fix comma usage next to "You are receiving this notification".Andreas Fischer2013-09-023-3/+3
| | | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | This is a partial backport of 31502cdd6c3a5bac5164ec30530e5b4bf63f3196. PHPBB3-11821
| | * | | Merge remote-tracking branch 'nickvergessen/ticket/11574' into developDhruv2013-08-081-3/+5
| | |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | # By Joas Schilling (16) and Igor Wiedler (6) # Via Joas Schilling (5) and Igor Wiedler (2) * nickvergessen/ticket/11574: (22 commits) [ticket/11574] Remove install/udpate/new/ fallback from database_update.php [ticket/11574] Do not display incompatible package note after successful update [ticket/11574] Remove old "continue step"-message [ticket/11574] Change order of files and database update [ticket/11574] Fix more issues in the updater [ticket/11574] Add trailing slash for consistency [ticket/11574] Fix table prefix in database updater [ticket/11574] Fix various path issues in the updater [ticket/11574] Make install language filename less crazy [ticket/11574] Use alternate DI config file for updater [ticket/11574] Include normalizer so it loads form the correct directory [ticket/11574] Only fall back to install/update versions, when IN_INSTALL ;) [ticket/11574] Use log object instead of old function [ticket/11574] Include vendor into update packages [ticket/11574] Create phpbb_log object before using it. [ticket/11574] Add correct language parameter to return links [ticket/11574] Use request object rather then request_var function [ticket/11574] Load new language files whenever possible [ticket/11574] Require new files in install/index.php and add a class loader [ticket/11574] Require new files in database_update.php and add a class loader ...
| | | * | | [ticket/11574] Remove install/udpate/new/ fallback from database_update.phpJoas Schilling2013-07-301-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Since we switched the order, everything should be in the normal root by then. PHPBB3-11574
| | | * | | Merge remote-tracking branch 'phpbb/develop' into ticket/11574Joas Schilling2013-07-302-186/+152
| | | |\ \ \ | | | | | |/ | | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * phpbb/develop: (130 commits) [ticket/11638] Changed the layout to match the other similar commits [ticket/11640] removed the space that I wonder what it was doing there. [ticket/11749] Move event after all template data has been defined [ticket/10917] Variable used only once so delete it [ticket/10917] Revert use of phpbb wrapper [ticket/11749] Template events for topic_list_row_pre/append [ticket/11749] PHP Events for viewforum.php [ticket/11749] PHP Events for search.php [ticket/11740] Update FAQ to include Ideas Centre [ticket/11062] If user's language is english there is no further work needed [ticket/11062] Load new strings from user's language file if provided [ticket/10917] Using phpbb wrapper [ticket/10917] Fixed notice that files are out of date when updating to an unreleased version [ticket/11741] Fix empty brackets and remove bullet [ticket/11638] Removed the unneeded reset. [ticket/11638] Use the $parse_flags like the other commits [ticket/11638] Reverted to use the $parse tags way as the other ones [ticket/11638] Updated: bitwise $parse_flags use optionset() [ticket/11656] Made the check for the bitfield just like other PR's [ticket/11667] Use @inheritdoc ...
| | | * | | [ticket/11574] Change order of files and database updateJoas Schilling2013-07-291-2/+4
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11574
| | * | | | Merge branch 'develop-olympus' into developJoas Schilling2013-07-301-1/+1
| | |\ \ \ \ | | | |_|/ / | | |/| | / | | | | |/ | | | |/| * develop-olympus: [ticket/11752] HTTP -> HTTPs in email/installed.txt
| | | * | [ticket/11752] HTTP -> HTTPs in email/installed.txtAndreas Fischer2013-07-301-1/+1
| | | | | | | | | | | | | | | | | | | | PHPBB3-11752
| * | | | [feature/oauth] Changes due to code reviewJoseph Warner2013-08-242-5/+6
| | | | | | | | | | | | | | | | | | | | PHPBB3-11673
| * | | | [feature/oauth] Fix indentation on new language constantsJoseph Warner2013-08-241-7/+7
| | | | | | | | | | | | | | | | | | | | PHPBB3-11673
| * | | | [feature/oauth] Finish cleaning up TODOsJoseph Warner2013-08-241-0/+2
| | | | | | | | | | | | | | | | | | | | PHPBB3-11673
| * | | | [feature/oauth] Clean up TODOsJoseph Warner2013-08-241-0/+2
| | | | | | | | | | | | | | | | | | | | PHPBB3-11673
| * | | | [feature/oauth] Update language constants for ucp_auth_linkJoseph Warner2013-08-141-1/+5
| | | | | | | | | | | | | | | | | | | | PHPBB3-11673
| * | | | [feature/oauth] Start building the templateJoseph Warner2013-08-091-0/+1
| | | | | | | | | | | | | | | | | | | | PHPBB3-11673
| * | | | [feature/oauth] Forgot to have login_link be "in login" in ucpJoseph Warner2013-08-051-1/+2
| | | | | | | | | | | | | | | | | | | | PHPBB3-11673
| * | | | [feature/oauth] Start general auth linking pageJoseph Warner2013-08-051-0/+1
| | | | | | | | | | | | | | | | | | | | PHPBB3-11673
| * | | | [feature/oauth] Reword some of the language textJoseph Warner2013-07-301-2/+2
| | | | | | | | | | | | | | | | | | | | PHPBB3-11673
| * | | | [feature/oauth] Properly check that all data needed is availableJoseph Warner2013-07-291-0/+1
| | | | | | | | | | | | | | | | | | | | PHPBB3-11673
| * | | | [feature/oauth] Basic checking for data needed in login linkingJoseph Warner2013-07-291-2/+3
| | | | | | | | | | | | | | | | | | | | PHPBB3-11673
| * | | | [feature/oauth] More work on login linking accountsJoseph Warner2013-07-251-0/+1
| | | | | | | | | | | | | | | | | | | | PHPBB3-11673
| * | | | [feature/oauth] Template for ucp_login_link startedJoseph Warner2013-07-251-0/+2
| | | | | | | | | | | | | | | | | | | | PHPBB3-11673
| * | | | [feature/oauth] Move language constants for oauth services to common.phpJoseph Warner2013-07-242-3/+3
| | | | | | | | | | | | | | | | | | | | PHPBB3-11673
| * | | | [feature/oauth] Update error message with actual errorJoseph Warner2013-07-231-0/+1
| | | | | | | | | | | | | | | | | | | | PHPBB3-11673
| * | | | [feature/oauth] OAuth init method to minimally validate entered dataJoseph Warner2013-07-231-7/+8
| | | | | | | | | | | | | | | | | | | | PHPBB3-11673
| * | | | [feature/oauth] Clean up the OAuth ACP templateJoseph Warner2013-07-231-2/+1
| | | | | | | | | | | | | | | | | | | | PHPBB3-11673
| * | | | [feature/oauth] ACP options for OAuth, needs some workJoseph Warner2013-07-231-0/+9
| | |_|/ | |/| | | | | | | | | | PHPBB3-11673
* | | | [ticket/11373] Prune old read notifications with cronNathan Guse2013-07-271-0/+2
| |/ / |/| | | | | | | | PHPBB3-11373
* | | Merge branch 'develop-olympus' into developAndreas Fischer2013-07-251-1/+1
|\ \ \ | | |/ | |/| | | | | | | * develop-olympus: [ticket/11740] Update FAQ to include Ideas Centre
| * | [ticket/11740] Update FAQ to include Ideas CentreMichaelC2013-07-251-1/+1
| | | | | | | | | | | | PHPBB3-11740
* | | [ticket/11734] Readd accidently removed language strings of forum permissionsJoas Schilling2013-07-231-0/+11
| | | | | | | | | | | | PHPBB3-11734
* | | [ticket/11582] Fix documentation for adding permissionsJoas Schilling2013-07-141-27/+7
| | | | | | | | | | | | PHPBB3-11582
* | | [ticket/11582] Split permission language strings from logicJoas Schilling2013-07-141-132/+121
| | | | | | | | | | | | PHPBB3-11582
* | | [ticket/11582] Use new methods and remove duplicated entriesJoas Schilling2013-07-141-8/+0
| | | | | | | | | | | | PHPBB3-11582
* | | [ticket/11582] Use new class for categoriesJoas Schilling2013-07-141-16/+14
| | | | | | | | | | | | PHPBB3-11582
* | | [ticket/11582] Add new service for permissionsJoas Schilling2013-07-141-10/+6
| |/ |/| | | | | | | | | Replace calls to the language-array type with a call to get_types() PHPBB3-11582
* | Merge branch 'develop-olympus' into developNils Adermann2013-07-135-10/+10
|\ \ | |/ | | | | | | | | | | | | | | | | * develop-olympus: [ticket/11112] Do not change opensource.org link to https [ticket/11112] Use https for user-visible links to phpbb.com Conflicts: phpBB/language/en/install.php phpBB/language/en/ucp.php
| * Merge remote-tracking branch 'github-marc1706/ticket/11112' into ↵Nils Adermann2013-07-135-10/+10
| |\ | | | | | | | | | | | | | | | | | | | | | prep-release-3.0.12 * github-marc1706/ticket/11112: [ticket/11112] Do not change opensource.org link to https [ticket/11112] Use https for user-visible links to phpbb.com
| | * [ticket/11112] Do not change opensource.org link to httpsMarc Alexander2013-07-121-1/+1
| | | | | | | | | | | | PHPBB3-11112
| | * [ticket/11112] Use https for user-visible links to phpbb.comMarc Alexander2013-07-125-10/+10
| | | | | | | | | | | | PHPBB3-11112
* | | Merge branch 'develop-olympus' into developNils Adermann2013-07-131-1/+1
|\ \ \ | |/ / | | | | | | | | | * develop-olympus: [ticket/11670] Consistency with logo: Replace "phpBB(tm)" with "phpBB(R)".
| * | [ticket/11670] Consistency with logo: Replace "phpBB(tm)" with "phpBB(R)".Andreas Fischer2013-07-131-1/+1
| |/ | | | | | | PHPBB3-11670
* | Merge remote-tracking branch 'phpbb/develop' into ticket/9657Joas Schilling2013-07-135-7/+8
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * phpbb/develop: (216 commits) [ticket/11626] Remove last reference to template in ldap [ticket/11626] Remove LDAP dependency on template [develop-olympus] Increment version number to 3.0.13-dev. [develop-olympus] Add changelog for 3.0.12 release. [develop-olympus] Bump version numbers for 3.0.12-RC1 release. [develop-olympus] Bumping version numbers to final for 3.0.12 releases. [ticket/11669] Fix PHP bug #55124 (recursive mkdir on /./) [ticket/11668] Run lint test at the end of the test suite [ticket/11548] Fix test errors in groups test on develop [ticket/11548] Check upload avatar URL the same way as in phpBB 3.0 [ticket/11548] Fix incorrect usage of array_map on acp groups page [ticket/11665] Fix test class name [ticket/11664] Stop creating php.html file in root path in tests [ticket/11665] Can't change file names already sent to set_filenames [ticket/11662] Typos: occured -> occurred [ticket/11662] Typos: occured -> occurred [ticket/11660] Fix bugs from bugs in #11651 (missing vars, db->sql_connect) [feature/auth-refactor] Add parent::setUp() in setUp() [feature/auth-refactor] Changes [feature/auth-refactor] DataProvider for acp_board test ...
| * | [ticket/11662] Typos: occured -> occurredAndreas Fischer2013-07-121-1/+1
| | | | | | | | | | | | PHPBB3-11662
| * | Merge branch 'develop-olympus' into developNathaniel Guse2013-07-123-5/+5
| |\ \ | | |/ | | | | | | | | | | | | | | | | | | | | | | | | # By Andreas Fischer # Via Andreas Fischer (1) and Nathaniel Guse (1) * develop-olympus: [ticket/11662] Typos: occured -> occurred Conflicts: tests/template/template_test.php
| | * [ticket/11662] Typos: occured -> occurredAndreas Fischer2013-07-123-5/+5
| | | | | | | | | | | | PHPBB3-11662
| | * Merge remote-tracking branch 'remotes/nickv/ticket/8319' into develop-olympusNathaniel Guse2013-07-111-1/+2
| | |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | # By Joas Schilling # Via Joas Schilling * remotes/nickv/ticket/8319: [ticket/8319] Do not repeat the replacement [ticket/8319] Add explanation for RELATIVE_URL and update LOCAL_URL [ticket/8319] Update BBCodes that currently use the LOCAL_URL tag on update [ticket/8319] Add new token RELATIVE_URL to allow foreign relative URL parts [ticket/8319] Prepend Board URL to LOCAL_URL links to prevent abuse
| * | \ Merge branch 'ticket/8319' into ticket/8319-develop2Joas Schilling2013-07-101-1/+2
| |\ \ \ | | | |/ | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * ticket/8319: [ticket/8319] Do not repeat the replacement [ticket/8319] Add explanation for RELATIVE_URL and update LOCAL_URL [ticket/8319] Update BBCodes that currently use the LOCAL_URL tag on update [ticket/8319] Add new token RELATIVE_URL to allow foreign relative URL parts [ticket/8319] Prepend Board URL to LOCAL_URL links to prevent abuse Conflicts: phpBB/install/database_update.php
| | * | [ticket/8319] Add explanation for RELATIVE_URL and update LOCAL_URLJoas Schilling2013-06-031-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | The explanation now states that links are prefixed with the board URL. PHPBB3-8319
* | | | [ticket/9657] Remove last references to m_restore permissionJoas Schilling2013-07-121-2/+1
| | | | | | | | | | | | | | | | PHPBB3-9657
* | | | [ticket/9657] Fix english language :(Joas Schilling2013-07-112-2/+2
| | | | | | | | | | | | | | | | PHPBB3-9657
generated by cgit v1.2.1 (git 2.21.0) at 2025-04-22 05:33:03 +0000