aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/language/en/common.php
Commit message (Collapse)AuthorAgeFilesLines
* [ticket/12858] Remove hardcoded language entries from timezone selectsMarc Alexander2014-09-171-26/+28
| | | | PHPBB3-12858
* [ticket/12976] Correctly use plurals for attachment count in UCP navigationJoas Schilling2014-09-091-0/+4
| | | | PHPBB3-12976
* [ticket/12983] Correctly validate sorting options in the UCPJoas Schilling2014-09-051-0/+4
| | | | PHPBB3-12983
* Merge remote-tracking branch 'github-marc1706/ticket/12822' into ↵Nils Adermann2014-08-111-1/+1
|\ | | | | | | | | | | | | | | | | develop-ascraeus * github-marc1706/ticket/12822: [ticket/12822] Fix test runs of avatar manager_test [ticket/12822] Add method for deleting avatars and use confirm_box [ticket/12822] Remove "None" option from avatar select boxes
| * [ticket/12822] Add method for deleting avatars and use confirm_boxMarc Alexander2014-08-071-0/+1
| | | | | | | | | | | | | | | | The method will take care of the actual deletion process in the avatar manager. Additionally, we'll be using a confirm box while deleting the avatar to prevent users from accidentally deleting their avatars. PHPBB3-12822
| * [ticket/12822] Remove "None" option from avatar select boxesMarc Alexander2014-08-071-1/+0
| | | | | | | | | | | | | | This option is just used for deleting avatars for which we already have a checkbox. PHPBB3-12822
* | [ticket/12938] Remove the 'Download all attachments' feature.Andreas Fischer2014-08-091-2/+0
|/ | | | PHPBB3-12938
* [ticket/12837] Detect "viewing contact admin page" on viewonlinePayBas2014-07-161-0/+1
| | | | PHPBB3-12837
* [ticket/12768] More fixes in language filesn-aleha2014-07-081-1/+1
| | | | | | 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 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 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-241-0/+1
|\ \ | |/ |/| | | | | | | | | | | | | * 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-231-0/+1
| | | | | | | | PHPBB3-12755
* | 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
* | | [ticket/12730] Add a Google+ field by defaultShitiz Garg2014-06-211-0/+1
| | | | | | | | | | | | PHPBB3-12730
* | | Merge pull request #2628 from Dragooon/ticket/12731Joas Schilling2014-06-201-0/+1
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [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-201-0/+1
| |/ / | | | | | | | | | PHPBB3-12731
* | | Merge pull request #2621 from Dragooon/ticket/12732Joas Schilling2014-06-201-0/+1
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [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] Add Skype custom profile fieldShitiz Garg2014-06-201-0/+1
| |/ / | | | | | | | | | PHPBB3-12732
* | | Merge pull request #2612 from Dragooon/ticket/12733Joas Schilling2014-06-201-0/+1
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [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-201-0/+1
| |/ / | | | | | | | | | PHPBB3-12733
* | | [ticket/12729] Add Facebook custom profile fieldShitiz Garg2014-06-201-0/+1
|/ / | | | | | | PHPBB3-12729
* | Merge remote-tracking branch 'PayBas/ticket/12613' into develop-ascraeusCesar G2014-06-141-1/+2
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * PayBas/ticket/12613: (25 commits) [ticket/12613] Add distinction between top/bottom action-bar [ticket/12613] Replaced topic-actions with action-bar [ticket/12613] Remove responsive linklist from memberlist [ticket/12613] Remove unnecessary checks and clean up CSS [ticket/12613] role="navigation" not allowed on <ul> [ticket/12613] Improved screen reader functionality [ticket/12613] Removed unnecessary checks [ticket/12613] Set fixed font-size [ticket/12613] Slightly better icons [ticket/12613] Typo and L_COLON [ticket/12613] Small inconsistency fixes [ticket/12613] Don't display page-jump if all pages are visible (6) [ticket/12613] Fixes from comments (single quotes and typos) [ticket/12613] Minor $bull; and <hr> fix [ticket/12613] Pagination should never be in responsive linklist [ticket/12613] Minor CSS fixes [ticket/12613] Dropdown-visible page-jump icon, fix focus() timing [ticket/12613] Renamed jump-to to page-jump to prevent confusion [ticket/12613] Removed form in order to prevent nested forms [ticket/12613] Fix functional test and post sorting bug ...
| * | [ticket/12613] Typo and L_COLONPayBas2014-06-051-1/+1
| | | | | | | | | | | | PHPBB3-12613
| * | [ticket/12613] Renamed jump-to to page-jump to prevent confusionPayBas2014-06-051-2/+2
| | | | | | | | | | | | | | | | | | | | | Jump-to can easily be confused with forum-jump. Also switched the lang vars to reflect changes better PHPBB3-12613
| * | [ticket/12613] Improved paginationPayBas2014-06-051-0/+1
| | | | | | | | | | | | PHPBB3-12613
* | | Merge remote-tracking branch 'github-nickvergessen/ticket/10073' into ↵Nils Adermann2014-06-091-3/+4
|\ \ \ | |/ / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | develop-ascraeus * github-nickvergessen/ticket/10073: (36 commits) [ticket/10073] Fix button descriptions [ticket/10073] Do not check disable boxes by default [ticket/10073] Store values with config_text in the ACP [ticket/10073] Move config values to config_text [ticket/10073] Fix request usage [ticket/10073] Deduplicate template variable names [ticket/10073] Get service from container [ticket/10073] Fix more "Contact Us" strings [ticket/10073] Move template code into the template [ticket/10073] Make contact page available when board is disabled [ticket/10073] Change name of the ACP module [ticket/10073] Deduplicate posting buttons code in ACP [ticket/10073] Use phpbb_validate_email to verify email address [ticket/10073] Add tests for new validate_email() [ticket/10073] Split email validation from email ban and taken checks [ticket/10073] Deduplicate the if statement [ticket/10073] Fallback to board_contact when contact page is disabled [ticket/10073] Remove language string from rebase conflict [ticket/10073] Add ACP module to add bbcode text for contact admin info [ticket/10073] Add new configs to the schema ...
| * | [ticket/10073] Fix button descriptionsJoas Schilling2014-06-091-2/+2
| | | | | | | | | | | | PHPBB3-10073
| * | [ticket/10073] Add a contact administrators page and refactor email forms.Nils Adermann2014-05-291-1/+2
| | | | | | | | | | | | | | | | | | The message to be displayed on top of the email form cannot be configured yet. PHPBB3-10073
* | | [ticket/11467] Add language variables for extension exception messagesn-aleha2014-05-291-0/+2
|/ / | | | | | | | | | | | | Remove hard-coded messages and add language variables for extension exception messages. PHPBB3-11467
* | [ticket/11366] Update FILE_NOT_FOUND language stringTristan Darricau2014-05-281-1/+1
| | | | | | | | PHPBB3-11366
* | [ticket/11366] Update FILE_NOT_FOUND language stringTristan Darricau2014-05-281-1/+1
| | | | | | | | | | | | This var is always used with a colon. PHPBB3-11366
* | [ticket/12594] Remove @package tags and update file headersYuriy Rusko2014-05-271-4/+6
| | | | | | | | PHPBB3-12594
* | Merge remote-tracking branch 'n-aleha/ticket/12525' into develop-ascraeusCesar G2014-05-161-2/+3
|\ \ | | | | | | | | | | | | * n-aleha/ticket/12525: [ticket/12525] Add string argument to contact and email user language variables
| * | [ticket/12525] Add string argument to contact and email user language variablesn-aleha2014-05-171-2/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In language/en/common.php: * Introduce a new language variable 'CONTACT' => 'Contact' * Add a string argument to lang var 'CONTACT_USER' to avoid an appended '{USERNAME}' in template. * Add a string argument to lang var 'SEND_EMAIL_USER' to avoid an appended '{USERNAME}' in template. Also fix typos. PHPBB3-12525
* | | Merge branch 'develop-olympus' into develop-ascraeusAndreas Fischer2014-05-151-1/+1
|\ \ \ | |/ / |/| / | |/ | | | | | | | | | | | | * develop-olympus: [ticket/12540] Fix broken placeholders in language files Conflicts: phpBB/language/en/common.php phpBB/language/en/posting.php phpBB/language/en/ucp.php
| * [ticket/12540] Fix broken placeholders in language filesJoas Schilling2014-05-131-1/+1
| | | | | | | | PHPBB3-12540
* | Merge pull request #2340 from PayBas/ticket/12431Joas Schilling2014-05-111-0/+1
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | [ticket/12431] Add has_poll icon to topiclists * PayBas/ticket/12431: [ticket/12431] Lang full sentence [ticket/12431] Add topic poll icon. [ticket/12431] Add has_poll icon to topiclists
| * | [ticket/12431] Lang full sentencePayBas2014-05-081-1/+1
| | | | | | | | | | | | PHPBB3-12431
| * | [ticket/12431] Add has_poll icon to topiclistsPayBas2014-05-021-0/+1
| | | | | | | | | | | | PHPBB3-12431
* | | Merge pull request #2373 from Nicofuma/ticket/12459Joas Schilling2014-05-061-3/+6
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ticket/12459] Unapproved posts/topics are not correctly handled in feeds * Nicofuma/ticket/12459: [ticket/12459] Change language strings [ticket/12459] Enable related tests [ticket/12459] Fix: Differentiating unapproved and deleted posts [ticket/12459] Fix: Soft deleted topics should appear in feeds [ticket/12459] Fix: the posts were always marked as unapproved
| * | | [ticket/12459] Change language stringsTristan Darricau2014-05-051-4/+6
| | | | | | | | | | | | | | | | PHPBB3-12459
| * | | [ticket/12459] Fix: Soft deleted topics should appear in feedsTristan Darricau2014-05-041-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | As for the posts, a soft deleted topic should appear (with a corresponding message) in topic's based feeds. PHPBB3-12459
* | | | [ticket/12455] Remove unused language strings from common.php and app.phpn-aleha2014-05-041-2/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Removed the following unused language strings from common.php: EXTENSION_CONTROLLER_MISSING EXTENSION_CLASS_WRONG_TYPE Removed the following unused language strings from app.php: CONTROLLER_NOT_FOUND CONTROLLER_SERVICE_NOT_GIVEN CONTROLLER_RETURN_TYPE_INVALID PHPBB3-12455
* | | | Merge pull request #2267 from prototech/ticket/10737Joas Schilling2014-05-031-0/+1
|\ \ \ \ | |/ / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ticket/10737] Add live member search. * prototech/ticket/10737: [ticket/10737] Remove loading indicator. [ticket/10737] Enforce allow_live_searches setting in memberlist.php. [ticket/10737] Add config setting to disable live searches. [ticket/10737] Add loading indicator and alert box code to simple_footer.html. [ticket/10737] Load core.js and ajax.js in simple_footer.html. [ticket/10737] Set the username as the input value instead of redirecting. [ticket/10737] Drop subsilver2 changes. [ticket/10737] Add a more generic live search implementation. [ticket/10737] Clean up memberlist.php. [ticket/10737] Use dropdown for search results container. [ticket/10737] Adding delayed keyup and removing target_blank. [ticket/10737] Using UTF-8 aware alternatives in PHP code. [ticket/10737] Removing obsolete code. [ticket/10737] Avoid hard-coding table row and use case-insensitive search. [ticket/10737] Removing unnecessary/obsolete code. [ticket/10737] Using JQuery events and JSON response. [ticket/10737] Code fixes in AJAX search feature [ticket/10737] Improvements over last commit [ticket/10737] Adding username suggestions in "Find a member" using AJAX