aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/language
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #2267 from prototech/ticket/10737Joas Schilling2014-05-032-0/+3
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [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
| * [ticket/10737] Enforce allow_live_searches setting in memberlist.php.Cesar G2014-04-231-0/+1
| | | | | | | | PHPBB3-10737
| * [ticket/10737] Add config setting to disable live searches.Cesar G2014-04-231-0/+2
| | | | | | | | PHPBB3-10737
* | Merge remote-tracking branch 'github-prototech/ticket/12265' into ↵Nils Adermann2014-05-022-1/+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-152-1/+1
| | | | | | | | | | | | PHPBB3-12265
* | | Merge remote-tracking branch 'github-nickvergessen/feature/sqlite3' into ↵Nils Adermann2014-05-021-1/+4
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | develop-ascraeus * github-nickvergessen/feature/sqlite3: [feature/sqlite3] Add sqlite3 database to .gitignore [feature/sqlite3] Use SQLite3 by default [feature/sqlite3] Remove invalid comment [feature/sqlite3] Remove unneeded ORDER BY type from sqlite_master queries [feature/sqlite3] Correctly recreate indexes when recreating a table [feature/sqlite3] Fix sql_index_drop() for sqlite3 [feature/sqlite3] Remove trailing comma from column list [feature/sqlite3] Update docblocks and function visibility [feature/sqlite3] Add support for SQLite 3
| * | | [feature/sqlite3] Add support for SQLite 3Patrick Webster2014-05-021-1/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Minimum version requirement is 3.6.15 as that's what ships with PHP 5.3.0 when support for SQLite 3 was added. PHPBB3-9728
* | | | Merge remote-tracking branch 'github-exreaction/ticket/8323' into ↵Nils Adermann2014-05-021-0/+1
|\ \ \ \ | |/ / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | develop-ascraeus * github-exreaction/ticket/8323: [ticket/8323] Cache auth request [ticket/8323] Combine into a single query [ticket/8323] Comments on phpbb_get_banned_user_ids input for test [ticket/8323] More readability in test case [ticket/8323] Comments [ticket/8323] dataProvider for the test; better test data [ticket/8323] Comments [ticket/8323] Unit test for phpbb_get_banned_user_ids [ticket/8323] Comments for inactive reasons in constants.php [ticket/8323] Only disable administrative deactivated accounts from receiving PMs [ticket/8323] Allow temporarily banned users to receive PMs, but not a notification [ticket/8323] Correct PM notification settings (only notify those who can receive them) [ticket/8323] Cleanup viewtopic code (not sure how this mess happened) [ticket/8323] Allow sending PMs to temporarily banned users [ticket/8323] Do not allow sending PMs to Inactive users [ticket/8323] Hide the Send PM link if users cannot receive the PM [ticket/8323] Correcting the comment [ticket/8323] Do not allow sending of Private Messages to users who are banned [ticket/8323] Remove code used for testing [ticket/8323] Do not allow sending of Private Messages to users who do not have permission to read private messages Conflicts: phpBB/language/en/ucp.php
| * | | Merge branch 'develop' of github.com:phpbb/phpbb3 into ticket/8323Nathan Guse2013-09-0549-242/+679
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | # By Joas Schilling (613) and others # Via Andreas Fischer (214) and others * 'develop' of github.com:phpbb/phpbb3: (2494 commits) [ticket/11825] Move schema_data.php into includes/ instead of phpbb/ [ticket/11215] Remove unnecessary comment [ticket/11755] MySQL upgrader out of date [prep-release-3.0.12] Update Changelog for 3.0.12-RC3 release. [prep-release-3.0.12] Bumping version number for 3.0.12-RC3. [ticket/11823] Set up nginx server to match PHP files with characters after .php [ticket/11812] Fix empty define [ticket/11818] Update Symfony dependencies to 2.3.* [ticket/11791] Load adm/ events from styles/adm/event/ [ticket/11215] Fix helper_url_test.php tests [ticket/11215] Add newline back to .htaccess, fix wording [ticket/11215] Update comment in .htaccess [ticket/11215] Uncomment rewrite rules in .htaccess [ticket/11215] Make controller helper url() method use correct format [ticket/11215] Add commented-out URL rewrite capability to .htaccess [ticket/11821] Fix comma usage next to "You are receiving this notification". [ticket/11769] Allow using 0 as poster name [ticket/11769] Allow '0' as username [ticket/11215] Use new URL structure for controllers [ticket/11215] Everything appears to be working... ... Conflicts: phpBB/includes/functions_privmsgs.php
| * \ \ \ Merge branch 'develop' of git://github.com/phpbb/phpbb3 into ticket/8323Nathan Guse2012-12-0717-142/+293
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: phpBB/viewtopic.php
| * | | | | [ticket/8323] Only disable administrative deactivated accounts from ↵Nathan2012-07-101-1/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | receiving PMs Allow other types of inactive accounts to receive PMs. Remove the banned PM error message and use the string saying they do not have permission (less translation) PHPBB3-8323
| * | | | | [ticket/8323] Do not allow sending of Private Messages to users who are bannedNathan2012-07-101-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-8323
| * | | | | [ticket/8323] Do not allow sending of Private Messages to users who do not ↵Nathan2012-07-101-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | have permission to read private messages PHPBB3-8323
* | | | | | Merge remote-tracking branch 'github-marc1706/ticket/8960' into develop-ascraeusNils Adermann2014-05-021-1/+1
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | * github-marc1706/ticket/8960: [ticket/8960] Allow changing avatar path if it's not writable
| * \ \ \ \ \ Merge branch 'ticket/8960-olympus' into ticket/8960Marc Alexander2014-04-161-1/+1
| |\ \ \ \ \ \ | | |_|_|_|/ / | |/| | | | | | | | | | | | | | | | | | | Conflicts: phpBB/includes/acp/acp_board.php
| | * | | | | [ticket/8960] Allow changing avatar path if it's not writableMarc Alexander2014-04-141-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This change will allow users to change the avatar path even if it's not writable. However, this will get rid of the error message that the path is not writable. Due to this, a minor addition to the explain message in the ACP settings has been made. PHPBB3-8960
* | | | | | | Merge remote-tracking branch 'github-elsensee/ticket/stenudd/8558-2' into ↵Nils Adermann2014-05-021-0/+2
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | develop-ascraeus * github-elsensee/ticket/stenudd/8558-2: [ticket/8558] Fix operator [ticket/8558] Fix field length in ACP [ticket/8558] Use only one variable and improve explain string [ticket/8558] Add config in migrations and schema_data [ticket/8558] Add display name in emails from board Conflicts: phpBB/includes/functions_messenger.php
| * | | | | | | [ticket/8558] Use only one variable and improve explain stringOliver Schramm2014-04-171-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-8558
| * | | | | | | [ticket/8558] Add display name in emails from boardMarkus Stenudd2014-04-171-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-8558
* | | | | | | | 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
* | | | | | | | Merge remote-tracking branch 'remotes/Nicofuma/ticket/12445' into ↵Nathaniel Guse2014-05-011-2/+2
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | develop-ascraeus # By Nicofuma # Via Nicofuma * remotes/Nicofuma/ticket/12445: [ticket/12445] Change the formulation [ticket/12445] Disapproved post: the name of the poster should be in logs
| * | | | | | | | [ticket/12445] Change the formulationNicofuma2014-04-281-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-12445
| * | | | | | | | [ticket/12445] Disapproved post: the name of the poster should be in logsNicofuma2014-04-261-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | https://tracker.phpbb.com/browse/PHPBB3-12445 PHPBB3-12445
* | | | | | | | | [ticket/12458] Apply Squiz.WhiteSpace.SuperfluousWhitespace.* to legacy code.Andreas Fischer2014-04-292-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * There MUST NOT be trailing whitespace at the end of lines. * There MUST NOT be whitespace before the first content of a file. * There MUST NOT be whitespace after the last content of a file. * Functions MUST NOT contain multiple empty lines in a row. PHPBB3-12458
* | | | | | | | | [ticket/12456] Add , after the last array elementJoas Schilling2014-04-296-9/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-12456
* | | | | | | | | [ticket/12456] Fix duplicated empty lines in language filesJoas Schilling2014-04-295-7/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-12456
* | | | | | | | | [ticket/12456] Fix missing new lines at the end of email templatesJoas Schilling2014-04-2918-21/+17
|/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-12456
* | | | | | | | Merge remote-tracking branch 'PayBas/ticket/12389' into develop-ascraeusCesar G2014-04-252-1/+2
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * PayBas/ticket/12389: [ticket/12389] Change "PM" to "Message" [ticket/12389] Moved PM tools to UCP template [ticket/12389] Replace email and print icons. [ticket/12389] Change language of email friend [ticket/12389] Move print topic & email topic icons to topic tools
| * | | | | | | [ticket/12389] Change "PM" to "Message"PayBas2014-04-241-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-12389
| * | | | | | | [ticket/12389] Moved PM tools to UCP templatePayBas2014-04-201-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-12389
| * | | | | | | [ticket/12389] Change language of email friendPayBas2014-04-111-1/+1
| | |/ / / / / | |/| | | | | | | | | | | | | | | | | | | PHPBB3-12389
* | | | | | | Merge pull request #2036 from prototech/ticket/12201Joas Schilling2014-04-222-9/+8
|\ \ \ \ \ \ \ | |_|/ / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ticket/12201] Clean up ACP attachment management page * prototech/ticket/12201: [ticket/12201] Decreased pagination font size. [ticket/12201] Update select element to follow same design as prosilver. [ticket/12201] Increase sort font size just slightly. [ticket/12201] Add link to resync file stats after error. [ticket/12201] Fix typos in language pack. [ticket/12201] Display error and sorting options when there are no attachments [ticket/12201] Only the top pagination should be floated to the right. [ticket/12201] Rearrange pagination, sorting, and submit elements. [ticket/12201] Center the file size and mark columns. [ticket/12201] Separate pagination from table.
| * | | | | | [ticket/12201] Add link to resync file stats after error.Cesar G2014-04-152-8/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-12201
| * | | | | | [ticket/12201] Fix typos in language pack.Cesar G2014-04-151-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-12201
| * | | | | | [ticket/12201] Display error and sorting options when there are no attachmentsCesar G2014-04-151-0/+1
| |/ / / / / | | | | | | | | | | | | | | | | | | PHPBB3-12201
* | | | | | [ticket/12345] Improve search flood interval message for ascraeusn-aleha2014-04-161-1/+4
|/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Show to guests and users the remaining seconds until their next allowed search, if a search flood limit is enabled for them. PHPBB3-12345
* | | | | 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 'github-nickvergessen/ticket/12113' into ↵Nils Adermann2014-04-101-1/+4
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | develop-ascraeus * github-nickvergessen/ticket/12113: [ticket/12113] Fix view_log() tests [ticket/12113] Correctly use plurals when deleting user warnings [ticket/12113] Allow log entries to use plurals
| * | | | | [ticket/12113] Correctly use plurals when deleting user warningsJoas Schilling2014-04-011-1/+4
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-12113
* | | | | | Merge remote-tracking branch 'nickvergessen/ticket/8700' into develop-ascraeusCesar G2014-04-091-285/+1
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * nickvergessen/ticket/8700: [ticket/8700] Use L_COLON instead of adding ":" manually [ticket/8700] Remove unused language strings
| * | | | | | [ticket/8700] Use L_COLON instead of adding ":" manuallyJoas Schilling2014-04-021-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-8700
| * | | | | | [ticket/8700] Remove unused language stringsJoas Schilling2014-04-021-284/+0
| |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Most of the strings were obsoleted by the removal of: * Imagesets * Themes * Templates * Editor * Exporter PHPBB3-8700
* | | | | | [ticket/12361] Replace the Google logo.Maël Soucaze2014-04-071-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Currently, a link to Google and its logo are displayed in the language/en/help_bbcode.php file to explain how to correctly format tags and to add an image to a post. However, the Google logo is outdated and Google does not allow the use of its logo on third-party websites. Plus, that overload their servers. I used the blue phpBB logo to replace it because the grey one with transparent background is hardly visible. Originally, I just refreshed the old Google logo with the new one (https://www.google.com/images/srpr/logo5w.png) but Joas proposed to use the phpBB logo, and I agree with him. PHPBB3-12361
* | | | | | [ticket/12150] Use shorter column names for prune settingsMarc Alexander2014-03-292-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | All columns were renamed from having prune_shadow_topics as namebase to just prune_shadow. A missing column was also added to the migration file's remove_schema() method. PHPBB3-12150
* | | | | | [ticket/12150] Add file and caller for pruning shadow topicsMarc Alexander2014-03-291-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-12150
* | | | | | [ticket/12150] Add options to acpMarc Alexander2014-03-291-0/+2
|/ / / / / | | | | | | | | | | | | | | | PHPBB3-12150
* | | | | 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.