aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/language/en/common.php
Commit message (Collapse)AuthorAgeFilesLines
...
| * | | [ticket/10737] Enforce allow_live_searches setting in memberlist.php.Cesar G2014-04-231-0/+1
| | | | | | | | | | | | | | | | PHPBB3-10737
* | | | Merge remote-tracking branch 'github-prototech/ticket/12265' into ↵Nils Adermann2014-05-021-0/+1
|\ \ \ \ | |_|/ / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | develop-ascraeus * github-prototech/ticket/12265: [ticket/12265] Actually use $u_pm. [ticket/12265] Ensure that dropdown is always at the very left of the container [ticket/12265] Define a loop for contact icons. [ticket/12265] Break the icons that aren't in loop in case extensions add more [ticket/12265] Fix modulo logic. [ticket/12265] Adjust alignment of AIM and Jabber icons. [ticket/12265] Ensure that there's only 4 icons per row in IE & Opera. [ticket/12265] Add contact icon and remove border from last row & cells. [ticket/12265] Fix issue with dropdown being restricted by the width of parent [ticket/12265] Remove ugly logic. [ticket/12265] Simplify contact icon design and move to dropdown. Conflicts: phpBB/viewtopic.php
| * | | [ticket/12265] Simplify contact icon design and move to dropdown.Cesar G2014-04-151-0/+1
| |/ / | | | | | | | | | PHPBB3-12265
* | | Merge remote-tracking branch 'github-nickvergessen/ticket/12371' into ↵Nils Adermann2014-05-021-2/+5
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | develop-ascraeus * github-nickvergessen/ticket/12371: [ticket/12371] Fix language string [ticket/12371] Fix typos in comment [ticket/12371] Fix redirect link for approve_post and post_in_queue [ticket/12371] Delete the approve_post notification when editing a post [ticket/12371] Fix language in comment [ticket/12371] Reapprove the post and topic again in tests [ticket/12371] Correctly set is_starter when editing first post of the topic [ticket/12371] Add functional tests for reapproving [ticket/12371] Fix query in mcp_sorting() [ticket/12371] Rename disapprove and softdelete tests [ticket/12371] We do not group quote notifications anymore [ticket/12371] Fix SQL query [ticket/11772] Do not send out new topic/post notifications when reapproving [ticket/12052] Use different visibility when post was edited [ticket/12052] Add support for ITEM_UNAPPROVED to set_post_visibility method [ticket/12371] Do not add unlimited users as responders [ticket/12371] Do not update the notification entry unneccessarily [ticket/12371] Do not delete post related notifications when a post is deleted [ticket/12371] Allow notification types to redirect to a different url [ticket/12371] Do not group "quote" notifications
| * | | [ticket/12371] Fix language stringJoas Schilling2014-05-021-2/+2
| | | | | | | | | | | | | | | | PHPBB3-12371
| * | | [ticket/12371] Do not add unlimited users as respondersJoas Schilling2014-04-251-2/+5
| |/ / | | | | | | | | | | | | | | | | | | | | | We run into the risc that the data is longer then the character limit of the table column. However as we trim the users list anyway, we can also just stop adding them and display "many others" instead of "x others" PHPBB3-12371
* | | [ticket/12456] Add , after the last array elementJoas Schilling2014-04-291-1/+1
|/ / | | | | | | PHPBB3-12456
* | Merge branch 'develop-olympus' into develop-ascraeusCesar G2014-04-101-1/+1
|\ \ | |/ | | | | | | * develop-olympus: [ticket/10687] Improve error message if unable to get image dimensions
| * [ticket/10687] Improve error message if unable to get image dimensionsMarc Alexander2014-04-091-1/+1
| | | | | | | | | | | | | | | | The error message that is presented if getimagesize() was unable to determine an image's dimensions now additionally states that this might be caused by an incorrect URL. PHPBB3-10687
* | Merge remote-tracking branch 'prototech/ticket/11959' into develop-ascraeusJoas Schilling2014-03-291-6/+23
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * prototech/ticket/11959: [ticket/11959] Move phpbb_generate_string_list() to functions_content.php. [ticket/11959] Add unit tests. [ticket/11959] Remove use of plurals and make it possible to use Oxford comma. [ticket/11959] Rename phpbb_gen_string_list() & fix incorrect var name. [ticket/11959] Simplify how the users are trimmed. [ticket/11959] Add function to create a string list. [ticket/11959] Add samples for the untrimmed strings. [ticket/11959] List the last user with "and" instead of a comma. [ticket/11959] Use the plurals system for the untrimmed language strings. [ticket/11959] Fix the NOTIFICATION_QUOTE_TRIMMED text. [ticket/11959] Use plurals for the language strings.
| * | [ticket/11959] Remove use of plurals and make it possible to use Oxford comma.Cesar G2014-03-191-5/+2
| | | | | | | | | | | | PHPBB3-11959
| * | [ticket/11959] Simplify how the users are trimmed.Cesar G2014-03-191-24/+20
| | | | | | | | | | | | PHPBB3-11959
| * | [ticket/11959] Add samples for the untrimmed strings.Cesar G2014-03-191-0/+3
| | | | | | | | | | | | PHPBB3-11959
| * | [ticket/11959] List the last user with "and" instead of a comma.Cesar G2014-03-191-6/+15
| | | | | | | | | | | | PHPBB3-11959
| * | [ticket/11959] Use the plurals system for the untrimmed language strings.Cesar G2014-03-191-3/+9
| | | | | | | | | | | | PHPBB3-11959
| * | [ticket/11959] Fix the NOTIFICATION_QUOTE_TRIMMED text.Cesar G2014-03-191-1/+1
| | | | | | | | | | | | PHPBB3-11959
| * | [ticket/11959] Use plurals for the language strings.Cesar G2014-03-191-3/+9
| | | | | | | | | | | | PHPBB3-11959
* | | [ticket/12198] Language issue in en/common.phpnetdeamon2014-03-181-2/+0
|/ / | | | | | | | | | | Deleted lines as they are not needed anymore. PHPBB3-12198
* | Merge pull request #2113 from nickvergessen/ticket/8041Andreas Fischer2014-03-131-1/+2
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | [ticket/8041] Merge item name into "Return to" string for better translations * nickvergessen/ticket/8041: [ticket/8041] Add space/tabs after => in array list [ticket/8041] Wrap forum name, topic title and pm folder name with quotes [ticket/8041] Merge item name into "Return to" string for better translations
| * | [ticket/8041] Wrap forum name, topic title and pm folder name with quotesJoas Schilling2014-03-121-1/+2
| | | | | | | | | | | | PHPBB3-8041
| * | [ticket/8041] Merge item name into "Return to" string for better translationsJoas Schilling2014-03-121-1/+1
| | | | | | | | | | | | PHPBB3-8041
* | | Merge branch 'develop-olympus' into developAndreas Fischer2014-03-121-1/+1
|\ \ \ | |/ / |/| / | |/ | | | | | | | | | | * develop-olympus: [ticket/10549] using correct variable in includes/functions_module.php too [ticket/10549] changed "right" to "incorrect" Conflicts: phpBB/includes/functions_module.php
| * [ticket/10549] changed "right" to "incorrect"Crizzo2014-03-111-1/+1
| | | | | | | | PHPBB3-10549
* | Merge branch 'develop-olympus' into developNathan Guse2014-03-101-0/+3
|\ \ | |/ | | | | | | | | | | | | * develop-olympus: [ticket/10549] Adds language variables Conflicts: phpBB/includes/functions_module.php
| * [ticket/10549] Adds language variablesCrizzo2014-03-101-0/+3
| | | | | | | | PHPBB3-10549
* | [ticket/12236] Fix language key name for Yahoo MessangerJoas Schilling2014-03-061-1/+1
| | | | | | | | PHPBB3-12236
* | [ticket/12236] Move AOL Instant Messanger field to custom profile fieldJoas Schilling2014-03-051-2/+0
| | | | | | | | PHPBB3-12236
* | [ticket/12237] Convert yahoo messanger to custom profile fieldJoas Schilling2014-03-051-3/+1
| | | | | | | | PHPBB3-12237
* | Merge remote-tracking branch 'github-nickvergessen/ticket/12235' into developNils Adermann2014-03-051-10/+1
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * github-nickvergessen/ticket/12235: [ticket/12235] Convert WLM to custom profile field [ticket/12187] Do not make clickable when using as contact field [ticket/12187] Split generate_profile_fields_template() into 2 methods [ticket/12187] Remove user_website field [ticket/12187] Remove user_website functionality [ticket/12187] Convert website field data to custom profile field [ticket/12187] Add URL type for profile fields [ticket/12234] Replace ICQ with custom profile field [ticket/12233] Update schema file [ticket/12233] Add images back to subsilver2 [ticket/12233] Allow profile fields to be contact fields Conflicts: phpBB/adm/style/acp_prune_users.html
| * | [ticket/12235] Convert WLM to custom profile fieldJoas Schilling2014-03-041-3/+1
| | | | | | | | | | | | PHPBB3-12235
| * | [ticket/12187] Remove user_website functionalityJoas Schilling2014-03-031-3/+0
| | | | | | | | | | | | PHPBB3-12187
| * | [ticket/12234] Replace ICQ with custom profile fieldJoas Schilling2014-02-281-4/+0
| | | | | | | | | | | | PHPBB3-12234
* | | [ticket/12226] Split language strings to correctly allow multiple plural rulesJoas Schilling2014-02-241-0/+4
|/ / | | | | | | PHPBB3-12226
* | [ticket/12169] Convert user_from to profile field locationJoas Schilling2014-02-101-2/+0
| | | | | | | | | | | | Missing changes on memberlist view due to missing functionality PHPBB3-12169
* | [ticket/12115] Also port user interests to profile fieldsJoas Schilling2014-02-061-2/+0
| | | | | | | | PHPBB3-12115
* | [ticket/12115] Remove old language stringsJoas Schilling2014-02-061-2/+0
| | | | | | | | PHPBB3-12115
* | [ticket/12034] AJAXify notifications popup.Cesar G2013-12-301-0/+2
| | | | | | | | PHPBB3-12034
* | Merge remote-tracking branch 'cyberalien/ticket/11969' into developJoas Schilling2013-12-031-0/+2
|\ \ | | | | | | | | | | | | | | | | | | * cyberalien/ticket/11969: [ticket/11969] Change topic link to unread post in subsilver2 [ticket/11969] Change topic link to unread post in prosilver [ticket/11969] New language strings for first and last post links
| * | [ticket/11969] New language strings for first and last post linksVjacheslav Trushkin2013-10-251-0/+2
| | | | | | | | | | | | PHPBB3-11969
* | | [ticket/12042] Replace B with a more meaningful key nameJoas Schilling2013-11-271-1/+1
| | | | | | | | | | | | PHPBB3-12042
* | | [ticket/12042] Add all language strings from PLUpload 2.0 to the language fileJoas Schilling2013-11-271-0/+1
| | | | | | | | | | | | PHPBB3-12042
* | | Merge pull request #1854 from Pico88/ticket/12005Nathan Guse2013-11-211-4/+0
|\ \ \ | | | | | | | | [ticket/12005] Remove code responsible for PM popup completely
| * | | [ticket/12005] Remove language vars used by PM popupLukasz2013-11-081-4/+0
| | | | | | | | | | | | | | | | PHPBB3-12005
* | | | [ticket/11959] Trim the list of users from post notifications.Cesar G2013-11-211-0/+3
| | | | | | | | | | | | | | | | PHPBB3-11959
* | | | [ticket/11975] Change shortened ACP/MCP label to Administer/ModerateDavid King2013-11-021-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | Also utilizing the new data-responsive-text attribute PHPBB3-11975
* | | | [ticket/11975] Make link text shorter on smaller resolutionsDavid King2013-11-021-0/+2
|/ / / | | | | | | | | | PHPBB3-11975
* | | Merge pull request #1812 from prototech/ticket/11746Nathan Guse2013-11-021-0/+1
|\ \ \ | | | | | | | | [ticket/11746] Add "admin activation required" notification.
| * | | [ticket/11746] Add "admin activation required" notification.Cesar G2013-10-241-0/+1
| |/ / | | | | | | | | | PHPBB3-11746
* | | [ticket/11974] Fix timezone names with underscoresJoas Schilling2013-10-271-59/+59
| | | | | | | | | | | | PHPBB3-11974
* | | [ticket/11974] Translate all timezonesJoas Schilling2013-10-271-0/+432
|/ / | | | | | | PHPBB3-11974