* 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
* 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
* 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
* 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
* 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
# 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
* 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
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/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.
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
* 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
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
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
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
* 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.
* crizz0/ticket/11336:
[ticket/11336] Adds 301 info to redirect
[ticket/11336] Adds redirect for old "leaders" mode
[ticket/11336] Changes language variabel LOGIN_EXPLAIN_LEADERS to _TEAM
[ticket/11336] Changes "leaders"-mode to "team"-mode and so in test-file
