Conflicts:
 	db/schema.rb

Add missing Japanese translation

Bookmarks

Conflicts:
 	Gemfile.lock
 	config/application.rb

Conflicts:
 	app/controllers/statuses_controller.rb

Place composer dropdown menus top if they are closer to the bottom of the viewport

Port various media modal improvements to glitch-soc

Update glitch-soc style to match changes to reports UI

* update gem, test pam authentication

* add description for test parameters

* fix inclusion of optional group

Unlike boosts and like, there is no confirmation dialog as misclicking
can be recovered without another user seeing it.

Bookmarks behave like favourites, except they aren't shared with other
users and do not have an associated counter.

Port style changes from d9b62e34da

This also limits the statuses returned by API, but pagination is not
implemented in Web API yet. I still expect it brings user experience
better than making a user wait to fetch all ancestor statuses and flooding
the column with them.

* Further improvements to Reports UI

- Clean up notes display
- Clean up add new note form
- Simplify controller
- Allow reopening a report with a note
- Show created at date for reports
- Fix report details table formatting

* Show history of report using Admin::ActionLog beneath the report

* Fix incorrect log message when reopening a report

* Implement fetching of all ActionLog items that could be related to the report

* Ensure adding a report_note updates the report's updated_at

* Limit Report History to actions that happened between the report being created and the report being resolved

* Fix linting issues

* Improve report history builder

Thanks @gargron for the improvements

Fix #3565 (oops)

* Admin: Show unconfirmed email address on account page

* Admin: Allow staff to change user email addresses

* ActionLog: On change_email, log current email address and new unconfirmed email address

- Explicitly specify video codec.
  When ffmpeg isn't compiled with libx264 but openh264, mpeg4 is selected as video codec.
- Swap avarage bitrate and max bitrate.

Fix #7095

Clients using the API that do not provide the sensitive flag are always
posting with false sensitive option.

* Fix: Switching between composing direct message and mention from menus

Previously clicking "direct message" followed by "mention" resulted in the composed status staying as "direct", along with weird spacing of items in the text area. This attempts to fix that.

* Fix: Add missing proptype check for onMention in Status component

* Add the ability to send a direct message to a user from the menu on Statuses

* Add space between "Embed" and "Mention" on expanded statuses menu

Signed-off-by: Marcin Mikołajczak <me@m4sk.in>

ancestor_statuses and descendant_statuses used to include the root status
itself, but the behavior is confusing because the root status is not
an ancestor nor descendant.

Conflicts:
 	app/serializers/initial_state_serializer.rb

The glitch flavour isn't yet pulling custom emoji data on its own (see
https://github.com/tootsuite/mastodon/pull/7047).  Once that gets into
the glitch flavour, we can eliminate the custom_emojis load.

Fix video playback in glitch-soc detailed statuses

Point to glitch-soc source and not tootsuite on the public page

Port 31e7b73084 to glitch-soc

Port f691afaae9 to glitch-soc

Port fa5c867e0e to glitch-soc

Port 4e929b2d17 to glitch-soc

Port bf7757cbbc to glitch-soc

* Hide search from Compose on mobile devices

We're presently seeing large numbers of users accidentally tooting what they're trying to search for. This PR hides the search form from the Compose view, now that we have a dedicated "search" tab on mobile.

* Don't "showSearch" on mobile if we're not currently searching (isSearchPage)

(hello AGPLv3)

* Add search item to tab bar for mobile devices

* Fix missing prop validation

* Enable updating additional account information from user preferences via rest api
Resolves #6553

* Pacify rubocop

* Decoerce incoming settings in UserSettingsDecorator

* Create user preferences hash directly from incoming credentials instead of going through ActionController::Parameters

* Clean up user preferences update

* Use ActiveModel::Type::Boolean instead of manually checking stringified number equivalence

* Fix follow/unfollow buttons on public profile

- Present non-logged users with web+mastodon:// URLs for remote accounts
- Present logged-in users with appropriate links (authorize_follows and
  remote_unfollows) for remote accounts

* Do not cache rendered cards if user is logged in