aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/language/en
Commit message (Collapse)AuthorAgeFilesLines
...
* | | [ticket/12837] Detect "viewing contact admin page" on viewonlinePayBas2014-07-161-0/+1
|/ / | | | | | | PHPBB3-12837
* | [ticket/12768] More fixes in language filesn-aleha2014-07-085-8/+8
| | | | | | | | | | | | More spaces converted to tabs for identation in language files. PHPBB3-12768
* | [ticket/12768] 'NOTIFICATION_REPORT_CLOSED' entry has wrong indentationn-aleha2014-07-081-1/+1
| | | | | | | | | | | | | | 'NOTIFICATION_REPORT_CLOSED' has 3 spaces before the first tab indentation in language/en/common.php. PHPBB3-12768
* | Merge pull request #2656 from nickvergessen/ticket/12197Tristan Darricau2014-07-071-3/+3
|\ \ | | | | | | | | | | | | | | | | | | [ticket/12197] Fix several misleading FAQ entries * nickvergessen/ticket/12197: [ticket/12197] Fix several misleading FAQ entries
| * | [ticket/12197] Fix several misleading FAQ entriesJoas Schilling2014-06-251-3/+3
| | | | | | | | | | | | PHPBB3-12197
* | | [ticket/12515] Remove check for PostgreSQL 8.3+Joas Schilling2014-07-061-1/+0
| | | | | | | | | | | | PHPBB3-12515
* | | [ticket/12807] New variables for _EXPLAINCrizzo2014-07-061-0/+2
| | | | | | | | | | | | PHPBB3-12807
* | | [ticket/12807] Adds missing language variables language/en/acp/forums.phpCrizzo2014-07-051-0/+2
| | | | | | | | | | | | PHPBB3-12807
* | | Merge remote-tracking branch 'PayBas/ticket/12662' into develop-ascraeusCesar G2014-07-031-7/+9
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * PayBas/ticket/12662: (29 commits) [ticket/12662] Hide quick-links when empty [ticket/12662] Fix white-space issue to make dropdowns uniform [ticket/12662] Remove last remaining linklist outside navbars [ticket/12662] Use data-last-responsive attr instead of hardcoded list [ticket/12662] Remove <li> container from logged_out_content event [ticket/12662] Username <span> fix for list columns [ticket/12662] Fix notifications dropdown positioning for RTL [ticket/12662] Update tests that utilize get_username_string [ticket/12662] Update subsilver2 index template event names [ticket/12662] Update events docs from b5 to rc1/rc2 [ticket/12662] Move dropdown container from <li> to new inner div [ticket/12662] Remove linklist container and update template events [ticket/12662] Add span containers to all usernames for consistency [ticket/12662] IE8 fixes [ticket/12662] Fix responsive positioning of notifications dropdown [ticket/12662] Remove inherited props from ddown-extendended [ticket/12662] Change CSS selectors to direct descendants for linklist [ticket/12662] Reorder icon CSS rules alphabetically [ticket/12662] Use slack variable to determine line-break sensitivity [ticket/12662] Change new event names and fix events.md ...
| * | | [ticket/12662] Initial setupPayBas2014-06-251-7/+9
| | | | | | | | | | | | | | | | PHPBB3-12662
* | | | Merge remote-tracking branch 'nickvergessen/ticket/12645' into develop-ascraeusCesar G2014-07-021-1/+1
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | * nickvergessen/ticket/12645: [ticket/12645] Replace support links in SUPPORT_BODY with 3.1 links
| * | | | [ticket/12645] Replace support links in SUPPORT_BODY with 3.1 linksJoas Schilling2014-06-271-1/+1
| | | | | | | | | | | | | | | | | | | | PHPBB3-12645
* | | | | Merge pull request #2493 from Nicofuma/ticket/12325Joas Schilling2014-06-271-0/+4
|\ \ \ \ \ | |/ / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ticket/12325] Automatic update should notify about outdated files * Nicofuma/ticket/12325: [ticket/12325] Fix the language var name [ticket/12325] Update coding style in template [ticket/12325] Fix: add a missing colon [ticket/12325] Don't use L_COLON [ticket/12325] Fix: it's not stuck in an inifinite loop anymore [ticket/12325] Automatic update should notify about outdated files
| * | | | [ticket/12325] Fix the language var nameTristan Darricau2014-05-301-1/+1
| | | | | | | | | | | | | | | | | | | | PHPBB3-12325
| * | | | [ticket/12325] Automatic update should notify about outdated filesTristan Darricau2014-05-231-0/+4
| | | | | | | | | | | | | | | | | | | | PHPBB3-12325
* | | | | [ticket/12196] Fix typo in "referrer"Joas Schilling2014-06-262-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Referer is a typo in the HTTP RFC and should not be used in the UI PHPBB3-12196
* | | | | Merge branch 'develop-olympus' into develop-ascraeusAndreas Fischer2014-06-261-2/+2
|\ \ \ \ \ | | |_|_|/ | |/| | | | | | | | | | | | | * develop-olympus: [ticket/12196] Revert Fix typo "referer" in acp/attachments
| * | | | [ticket/12196] Revert Fix typo "referer" in acp/attachmentsDhruv2014-06-271-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit 9bc1f7924d5ef00fb988b81347d4c5c730b25eb2. https://tracker.phpbb.com/browse/PHPBB3-12196 PHPBB3-12196
* | | | | Merge branch 'develop-olympus' into develop-ascraeusDhruv2014-06-261-2/+2
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | # By Joas Schilling # Via Dhruv (1) and Joas Schilling (1) * develop-olympus: [ticket/12196] Fix typo "referer" in acp/attachments
| * | | | [ticket/12196] Fix typo "referer" in acp/attachmentsJoas Schilling2014-06-251-2/+2
| | | | | | | | | | | | | | | | | | | | PHPBB3-12196
* | | | | [ticket/12462] Do not use string "None" for different optionsJoas Schilling2014-06-251-0/+1
| |_|_|/ |/| | | | | | | | | | | | | | | | | | | ... it limits translations. PHPBB3-12462
* | | | Merge pull request #2567 from Crizz0/ticket/12680Joas Schilling2014-06-251-1/+0
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [Ticket/12680] - Adds alternative text to contact icon in viewtopic.php * Crizz0/ticket/12680: [ticket/12680] Adds variable for guest user [ticket/12680] Brings back get_username_string() [ticket/12680] Solves last bugs. viewprofile: contact --> contact nickname [ticket/12680] Still some problems with displaying the nickname in ucp [ticket/12680] Little changes, but some issues are still there [ticket/12680] Removes unnessesary $user->lang from CONTACT_USER [ticket/12680] Adds alternativ text with new variable to contact: [ticket/12680] Adds second alternativ text and font-size: 0 to remove text [ticket/12680] Adds alternative text to contact icon in viewtopic.php
| * | | | [ticket/12680] Solves last bugs. viewprofile: contact --> contact nicknameCrizzo2014-06-231-1/+0
| | | | | | | | | | | | | | | | | | | | PHPBB3-12680
* | | | | Merge pull request #2649 from VSEphpbb/ticket/12760Joas Schilling2014-06-251-0/+1
|\ \ \ \ \ | |_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | [ticket/12760] Fix wording for unapproved posts icon... * VSEphpbb/ticket/12760: [ticket/12760] Fix wording for unapproved posts icon...
| * | | | [ticket/12760] Fix wording for unapproved posts icon...Matt Friedman2014-06-241-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | in last post column of forum lists. https://tracker.phpbb.com/browse/PHPBB3-12760 PHPBB3-12760
* | | | | Merge branch 'develop-olympus' into develop-ascraeusAndreas Fischer2014-06-242-0/+2
|\ \ \ \ \ | |/ / / / |/| | / / | | |/ / | |/| | | | | | | | | | | | | | | | | | * develop-olympus: [ticket/12755] Apply de morgan to conditional [ticket/12755] Terminate upload loop if upload reaches filesize [ticket/12755] Change upload in remote_upload() method to fit get_remote_file [ticket/12755] Add language string for timed out remote upload [ticket/12755] Add timeout to remote upload to prevent infinite loop
| * | | [ticket/12755] Add language string for timed out remote uploadMarc Alexander2014-06-232-0/+2
| | | | | | | | | | | | | | | | PHPBB3-12755
* | | | Merge pull request #2571 from Crizz0/ticket/12563Dhruv Goel2014-06-231-2/+2
|\ \ \ \ | | | | | | | | | | [ticket/12563] Changes 2 style specific language variables for better understanding
| * | | | [ticket/12563] Adds &laquo; and &raquo; to the links in acp_styles.phpCrizzo2014-06-221-2/+2
| | | | | | | | | | | | | | | | | | | | PHPBB3-12563
| * | | | [ticket/12563] Removes ending . from <a>Crizzo2014-06-141-2/+2
| | | | | | | | | | | | | | | | | | | | PHPBB3-12563
| * | | | [ticket/12563] Removes strintf in acp_styles.php and shorts up <a>Crizzo2014-06-121-2/+2
| | | | | | | | | | | | | | | | | | | | PHPBB3-12563
| * | | | [ticket/12563] Changes 2 language variables to better understandable namesCrizzo2014-06-101-2/+2
| | |/ / | |/| | | | | | | | | | PHPBB3-12563
* | | | Merge remote-tracking branch 'PayBas/ticket/12608' into develop-ascraeusCesar G2014-06-221-17/+20
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * PayBas/ticket/12608: [ticket/12608] Change CSS classes to prevent styling conflicts [ticket/12608] Add subSilver [ticket/12608] Changed get_styling() to get_style_class() [ticket/12608] Remove somewhat redundant reported color style [ticket/12608] Improved LTR and various bugfixes [ticket/12608] Clean up whitespace [ticket/12608] Add styling (CSS class) options to notifications [ticket/12608] Updated tests [ticket/12608] Improve notifications drop-down menu styling in header
| * | | | [ticket/12608] Add styling (CSS class) options to notificationsPayBas2014-06-151-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This will allow different notifications to have different styles PHPBB3-12608
| * | | | [ticket/12608] Improve notifications drop-down menu styling in headerPayBas2014-06-151-17/+20
| | | | | | | | | | | | | | | | | | | | PHPBB3-12608
* | | | | Merge pull request #2629 from nickvergessen/ticket/12747Andreas Fischer2014-06-221-6/+0
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ticket/12747] Drop support for Firebird * nickvergessen/ticket/12747: [ticket/12747] Remove some methods which are not used anymore [ticket/12747] Drop support for Firebird Conflicts: phpBB/phpbb/db/driver/firebird.php
| * | | | | [ticket/12747] Drop support for FirebirdJoas Schilling2014-06-201-6/+0
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-12747
* | | | | | Merge pull request #2632 from Dragooon/ticket/12753Joas Schilling2014-06-221-0/+2
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ticket/12753] Add invalid chars string for ALPHA_DOTS and ALPHA_PUNCTUAION * Dragooon/ticket/12753: [ticket/12753] Add invalid chars string for ALPHA_DOTS and ALPHA_PUNCTUATION
| * | | | | | [ticket/12753] Add invalid chars string for ALPHA_DOTS and ALPHA_PUNCTUATIONShitiz Garg2014-06-211-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-12753
* | | | | | | Merge pull request #2615 from Dragooon/ticket/12730Joas Schilling2014-06-223-0/+3
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ticket/12730] Add Google+ profile field * Dragooon/ticket/12730: [ticket/12730] Update Google+ button class to use proper identification [ticket/12730] Update maxlen for type_googleplus to 255 [ticket/12730] Fix type_googleplus_test to use same validation rule as the field [ticket/12730] Update field_length to be 20 by default for Google+ [ticket/12730] Google+ field_order should be 13 [ticket/12730] Switch service name to googleplus for type_googleplus [ticket/12730] Restore field_length to 10 for type_googleplus [ticket/12730] Add functional test for Google+ field [ticket/12730] Value shouldn't be escaped for schema_data.sql [ticket/12730] Missing newline at type_googleplus_test.php [ticket/12730] Set field_active to 1 for Google+ field [ticket/12730] Add unit test for type_googleplus [ticket/12730] Add missing brackets to type_googleplus.php [ticket/12730] Update field_order for Google+ CPF [ticket/12730] Use string template for Google+ CPF instead of a new one [ticket/12730] Minor formatting fixes [ticket/12730] Incorrect indentation for type_googleplus [ticket/12730] Spaces in block header [ticket/12730] Add a Google+ field by default [ticket/12730] Add Google+ profile field type
| * | | | | | | [ticket/12730] Add a Google+ field by defaultShitiz Garg2014-06-213-0/+3
| |/ / / / / / | | | | | | | | | | | | | | | | | | | | | PHPBB3-12730
* | | | | | | Merge pull request #2630 from Nicofuma/ticket/12723Andreas Fischer2014-06-221-1/+1
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ticket/12723] Add Sniff ensuring PHP files use the correct file header * Nicofuma/ticket/12723: [ticket/12723] Do not mention too many details on documentation. [ticket/12723] Do not reference the coding guidelines section. [ticket/12757] Add a Code Sniffer ruleset for PHP files of phpBB extensions [ticket/12723] Properly describe new Code Sniffer rulsets. [ticket/12723] Use core suffix in filename instead of phpbb in the middle. [ticket/12723] Add Sniff ensuring PHP files use the correct file header
| * | | | | | [ticket/12723] Add Sniff ensuring PHP files use the correct file headerTristan Darricau2014-06-221-1/+1
| |/ / / / / | | | | | | | | | | | | | | | | | | PHPBB3-12723
* | | | | | Merge pull request #2628 from Dragooon/ticket/12731Joas Schilling2014-06-202-0/+2
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ticket/12731] Add YouTube custom profile field * Dragooon/ticket/12731: [ticket/12731] Add functional test for youtube field [ticket/12731] Set field_active to 1 for YouTube field [ticket/12731] Add YouTube custom profile field Conflicts: phpBB/install/schemas/schema.json phpBB/install/schemas/schema_data.sql phpBB/language/en/memberlist.php tests/functional/ucp_profile_test.php
| * | | | | | [ticket/12731] Add YouTube custom profile fieldShitiz Garg2014-06-202-0/+2
| |/ / / / / | | | | | | | | | | | | | | | | | | PHPBB3-12731
* | | | | | Merge pull request #2621 from Dragooon/ticket/12732Joas Schilling2014-06-203-2/+5
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ticket/12732] Add Skype custom profile field * Dragooon/ticket/12732: [ticket/12732] Update schema.json for Skype [ticket/12732] Add functional test for Skype profile field [ticket/12732] Values shouldn't be escaped for schema_data.sql [ticket/12732] Set field_active to 1 for Skype's field [ticket/12732] Add unit tests for ALPHA_PUNCTUATION [ticket/12732] Missing comma after validation definition [ticket/12732] Improve ALPHA_PUNCTUATION description [ticket/12732] Use user info instead of chat as default Skype action [ticket/12732] Add Skype custom profile field Conflicts: phpBB/install/schemas/schema.json phpBB/install/schemas/schema_data.sql phpBB/language/en/memberlist.php tests/functional/ucp_profile_test.php tests/profilefields/type_string_test.php
| * | | | | | [ticket/12732] Improve ALPHA_PUNCTUATION descriptionShitiz Garg2014-06-201-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-12732
| * | | | | | [ticket/12732] Add Skype custom profile fieldShitiz Garg2014-06-203-0/+3
| |/ / / / / | | | | | | | | | | | | | | | | | | PHPBB3-12732
* | | | | | Merge pull request #2612 from Dragooon/ticket/12733Joas Schilling2014-06-202-0/+2
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ticket/12733] Add Twitter custom profile field * Dragooon/ticket/12733: [ticket/12733] Add functional test for twitter profile field [ticket/12733] Values needn't be escaped for schema_data.sql [ticket/12733] Set field_active to 1 for Twitter [ticket/12733] Convert spaces to tabs [ticket/12733] Fix spacing for block header in profilefield_twitter.php [ticket/12733] Update schema.json [ticket/12733] Add Twitter custom profile field Conflicts: phpBB/install/schemas/schema.json phpBB/install/schemas/schema_data.sql phpBB/language/en/memberlist.php tests/functional/ucp_profile_test.php
| * | | | | | [ticket/12733] Add Twitter custom profile fieldShitiz Garg2014-06-202-0/+2
| |/ / / / / | | | | | | | | | | | | | | | | | | PHPBB3-12733