7867 Commits (3877be740d836314029334f9a5ed76147ed57792)

Author	SHA1	Message	Date
Thibaut Girka	af5467a0d7	Fix crash when posting with a CW but no text nor media	5 years ago
ThibG	5dbcafb998	[Glitch] Fix frontend crash when deleting announcements ... Port 15c02a7160 to glitch-soc Signed-off-by: Thibaut Girka <thib@sitedethib.com>	5 years ago
ThibG	6adb571c21	[Glitch] Change poll option hover/active styling to be less confusing ... Port 421a3a8f08 to glitch-soc Signed-off-by: Thibaut Girka <thib@sitedethib.com>	5 years ago
Thibaut Girka	3788f37c30	Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: - `app/services/post_status_service.rb`: CW/sensitive logic fixed upstream, but different in glitch-soc. Ported the changes accordingly.	5 years ago
Eugen Rochko	1cb4645638	Change `tootctl media remove-orphans` to work for all classes (#13316) ... Change `tootctl media lookup` to not use an interactive prompt	5 years ago
Eugen Rochko	ebb4869690	New Crowdin translations (#13064) ... * New translations en.yml (Russian) [ci skip] * New translations en.yml (Dutch) [ci skip] * New translations en.yml (Greek) [ci skip] * New translations en.json (Dutch) [ci skip] * New translations en.yml (German) [ci skip] * New translations en.yml (Dutch) [ci skip] * New translations en.yml (Spanish) [ci skip] * New translations en.yml (Spanish, Argentina) [ci skip] * New translations simple_form.en.yml (Dutch) [ci skip] * New translations en.yml (Persian) [ci skip] * New translations en.yml (Italian) [ci skip] * New translations en.yml (Icelandic) [ci skip] * New translations en.json (Dutch) [ci skip] * New translations en.json (Dutch) [ci skip] * New translations en.yml (Kabyle) [ci skip] * New translations en.yml (Korean) [ci skip] * New translations en.yml (Persian) [ci skip] * New translations en.yml (Catalan) [ci skip] * New translations en.yml (French) [ci skip] * New translations en.yml (Chinese Traditional) [ci skip] * New translations simple_form.en.yml (Chinese Traditional) [ci skip] * New translations en.yml (Chinese Traditional, Hong Kong) [ci skip] * New translations simple_form.en.yml (Chinese Traditional, Hong Kong) [ci skip] * New translations simple_form.en.yml (Chinese Traditional, Hong Kong) [ci skip] * New translations simple_form.en.yml (Chinese Traditional) [ci skip] * New translations en.yml (Spanish) [ci skip] * New translations simple_form.en.yml (Chinese Traditional) [ci skip] * New translations en.yml (Spanish, Argentina) [ci skip] * New translations simple_form.en.yml (Chinese Traditional, Hong Kong) [ci skip] * New translations en.yml (French) [ci skip] * New translations en.yml (German) [ci skip] * New translations en.yml (Greek) [ci skip] * New translations en.yml (Korean) [ci skip] * New translations en.yml (Swedish) [ci skip] * New translations en.yml (Russian) [ci skip] * New translations en.yml (Galician) [ci skip] * New translations en.yml (Catalan) [ci skip] * New translations en.json (Japanese) [ci skip] * New translations en.yml (Japanese) [ci skip] * New translations simple_form.en.yml (Japanese) [ci skip] * New translations en.yml (Arabic) [ci skip] * New translations en.json (Kabyle) [ci skip] * New translations en.yml (Kabyle) [ci skip] * New translations en.yml (Icelandic) [ci skip] * New translations en.yml (Corsican) [ci skip] * New translations en.yml (French) [ci skip] * New translations en.yml (Portuguese) [ci skip] * New translations en.yml (Portuguese, Brazilian) [ci skip] * New translations en.json (Japanese) [ci skip] * New translations en.yml (Japanese) [ci skip] * New translations en.yml (Hungarian) [ci skip] * New translations en.yml (Portuguese, Brazilian) [ci skip] * New translations en.yml (Persian) [ci skip] * New translations en.yml (Spanish, Argentina) [ci skip] * New translations en.json (Japanese) [ci skip] * New translations en.yml (Chinese Simplified) [ci skip] * New translations en.json (Greek) [ci skip] * New translations en.yml (Greek) [ci skip] * New translations simple_form.en.yml (Greek) [ci skip] * New translations en.json (Breton) [ci skip] * New translations en.yml (Icelandic) [ci skip] * New translations devise.en.yml (Icelandic) [ci skip] * New translations en.json (Italian) [ci skip] * New translations simple_form.en.yml (German) [ci skip] * New translations en.yml (Portuguese, Brazilian) [ci skip] * New translations en.yml (Portuguese, Brazilian) [ci skip] * New translations simple_form.en.yml (Portuguese, Brazilian) [ci skip] * New translations en.yml (Lithuanian) [ci skip] * New translations en.yml (Norwegian) [ci skip] * New translations en.yml (Norwegian Nynorsk) [ci skip] * New translations en.yml (Korean) [ci skip] * New translations en.yml (Hungarian) [ci skip] * New translations en.yml (Indonesian) [ci skip] * New translations en.yml (Japanese) [ci skip] * New translations en.yml (Kazakh) [ci skip] * New translations en.yml (Occitan) [ci skip] * New translations en.yml (Spanish) [ci skip] * New translations en.yml (Slovenian) [ci skip] * New translations en.yml (Thai) [ci skip] * New translations en.yml (Turkish) [ci skip] * New translations en.yml (Ukrainian) [ci skip] * New translations en.yml (Persian) [ci skip] * New translations en.yml (Polish) [ci skip] * New translations en.yml (Portuguese) [ci skip] * New translations en.yml (Serbian (Cyrillic)) [ci skip] * New translations en.yml (Slovak) [ci skip] * New translations en.yml (Icelandic) [ci skip] * New translations en.yml (Albanian) [ci skip] * New translations en.yml (Basque) [ci skip] * New translations en.yml (Spanish, Argentina) [ci skip] * New translations en.yml (Catalan) [ci skip] * New translations en.yml (Arabic) [ci skip] * New translations en.yml (Italian) [ci skip] * New translations en.yml (Portuguese, Brazilian) [ci skip] * New translations en.yml (Swedish) [ci skip] * New translations en.yml (Kabyle) [ci skip] * New translations en.yml (French) [ci skip] * New translations en.yml (Czech) [ci skip] * New translations en.yml (Russian) [ci skip] * New translations en.yml (Esperanto) [ci skip] * New translations en.yml (Estonian) [ci skip] * New translations en.yml (Galician) [ci skip] * New translations en.yml (German) [ci skip] * New translations en.yml (Greek) [ci skip] * New translations en.yml (Chinese Simplified) [ci skip] * New translations en.yml (Chinese Traditional) [ci skip] * New translations en.yml (Chinese Traditional, Hong Kong) [ci skip] * New translations en.yml (Corsican) [ci skip] * New translations en.yml (Dutch) [ci skip] * New translations en.yml (Danish) [ci skip] * New translations en.yml (Welsh) [ci skip] * New translations en.yml (Vietnamese) [ci skip] * New translations simple_form.en.yml (Spanish, Argentina) [ci skip] * New translations simple_form.en.yml (Corsican) [ci skip] * New translations simple_form.en.yml (Spanish) [ci skip] * New translations simple_form.en.yml (Spanish, Argentina) [ci skip] * New translations simple_form.en.yml (Icelandic) [ci skip] * New translations simple_form.en.yml (Italian) [ci skip] * New translations simple_form.en.yml (German) [ci skip] * New translations en.yml (Italian) [ci skip] * New translations simple_form.en.yml (Russian) [ci skip] * New translations simple_form.en.yml (Swedish) [ci skip] * New translations simple_form.en.yml (Portuguese, Brazilian) [ci skip] * New translations simple_form.en.yml (Catalan) [ci skip] * New translations simple_form.en.yml (Persian) [ci skip] * New translations simple_form.en.yml (Portuguese) [ci skip] * New translations simple_form.en.yml (Arabic) [ci skip] * New translations simple_form.en.yml (French) [ci skip] * New translations simple_form.en.yml (Korean) [ci skip] * New translations devise.en.yml (Kabyle) [ci skip] * New translations en.yml (Welsh) [ci skip] * New translations simple_form.en.yml (Welsh) [ci skip] * New translations en.yml (Korean) [ci skip] * New translations simple_form.en.yml (Korean) [ci skip] * New translations simple_form.en.yml (Icelandic) [ci skip] * New translations en.yml (Icelandic) [ci skip] * New translations en.yml (Spanish) [ci skip] * New translations simple_form.en.yml (Spanish) [ci skip] * New translations simple_form.en.yml (Spanish, Argentina) [ci skip] * New translations en.yml (Spanish, Argentina) [ci skip] * New translations en.yml (Persian) [ci skip] * New translations simple_form.en.yml (Persian) [ci skip] * New translations en.yml (Catalan) [ci skip] * New translations en.yml (Portuguese, Brazilian) [ci skip] * New translations simple_form.en.yml (Portuguese, Brazilian) [ci skip] * New translations simple_form.en.yml (Portuguese) [ci skip] * New translations en.yml (Portuguese) [ci skip] * New translations simple_form.en.yml (Catalan) [ci skip] * New translations simple_form.en.yml (Portuguese) [ci skip] * New translations simple_form.en.yml (Portuguese, Brazilian) [ci skip] * New translations en.yml (German) [ci skip] * New translations simple_form.en.yml (German) [ci skip] * New translations en.yml (Chinese Traditional) [ci skip] * New translations en.yml (Chinese Traditional, Hong Kong) [ci skip] * New translations en.yml (Chinese Traditional) [ci skip] * New translations en.yml (Chinese Traditional, Hong Kong) [ci skip] * New translations en.yml (Chinese Traditional) [ci skip] * New translations en.yml (Chinese Traditional, Hong Kong) [ci skip] * New translations en.yml (Korean) [ci skip] * New translations simple_form.en.yml (Korean) [ci skip] * New translations en.yml (Chinese Traditional) [ci skip] * New translations en.yml (Chinese Traditional, Hong Kong) [ci skip] * New translations simple_form.en.yml (Russian) [ci skip] * New translations en.yml (Russian) [ci skip] * New translations en.yml (Spanish, Argentina) [ci skip] * New translations simple_form.en.yml (Spanish, Argentina) [ci skip] * New translations simple_form.en.yml (Galician) [ci skip] * New translations simple_form.en.yml (Icelandic) [ci skip] * New translations en.yml (Russian) [ci skip] * New translations en.yml (Galician) [ci skip] * New translations en.yml (Corsican) [ci skip] * New translations simple_form.en.yml (Corsican) [ci skip] * New translations en.yml (Corsican) [ci skip] * New translations simple_form.en.yml (Corsican) [ci skip] * New translations en.yml (Hungarian) [ci skip] * New translations simple_form.en.yml (Hungarian) [ci skip] * New translations en.json (Kabyle) [ci skip] * New translations simple_form.en.yml (Hungarian) [ci skip] * New translations simple_form.en.yml (Portuguese, Brazilian) [ci skip] * New translations en.yml (Portuguese, Brazilian) [ci skip] * New translations en.yml (Greek) [ci skip] * New translations simple_form.en.yml (Greek) [ci skip] * New translations en.yml (French) [ci skip] * New translations simple_form.en.yml (French) [ci skip] * New translations simple_form.en.yml (Asturian) [ci skip] * New translations en.json (Breton) [ci skip] * New translations en.yml (Italian) [ci skip] * New translations simple_form.en.yml (Italian) [ci skip] * New translations devise.en.yml (Kabyle) [ci skip] * New translations en.yml (Basque) [ci skip] * New translations simple_form.en.yml (Basque) [ci skip] * New translations simple_form.en.yml (Occitan) [ci skip] * New translations en.yml (Slovak) [ci skip] * New translations simple_form.en.yml (Slovak) [ci skip] * New translations en.json (Japanese) [ci skip] * New translations en.json (Japanese) [ci skip] * New translations en.yml (Japanese) [ci skip] * New translations simple_form.en.yml (Japanese) [ci skip] * New translations en.yml (Japanese) [ci skip] * New translations simple_form.en.yml (Japanese) [ci skip] * New translations simple_form.en.yml (Chinese Simplified) [ci skip] * New translations en.yml (Chinese Simplified) [ci skip] * New translations en.json (Japanese) [ci skip] * New translations simple_form.en.yml (Chinese Simplified) [ci skip] * New translations en.yml (Polish) [ci skip] * New translations en.json (Russian) [ci skip] * New translations en.yml (Russian) [ci skip] * New translations en.json (French) [ci skip] * New translations en.yml (Slovak) [ci skip] * New translations doorkeeper.en.yml (Slovak) [ci skip] * New translations en.yml (Polish) [ci skip] * New translations simple_form.en.yml (Polish) [ci skip] * New translations simple_form.en.yml (Polish) [ci skip] * New translations en.yml (Polish) [ci skip] * New translations simple_form.en.yml (Indonesian) [ci skip] * New translations en.yml (Thai) [ci skip] * New translations simple_form.en.yml (Thai) [ci skip] * New translations simple_form.en.yml (Thai) [ci skip] * New translations en.json (Thai) [ci skip] * New translations en.json (Thai) [ci skip] * New translations en.json (Thai) [ci skip] * New translations en.yml (Thai) [ci skip] * New translations en.json (Thai) [ci skip] * New translations simple_form.en.yml (Thai) [ci skip] * New translations simple_form.en.yml (Thai) [ci skip] * New translations en.yml (Thai) [ci skip] * New translations simple_form.en.yml (Thai) [ci skip] * New translations activerecord.en.yml (Occitan) [ci skip] * New translations simple_form.en.yml (Indonesian) [ci skip] * New translations activerecord.en.yml (Kabyle) [ci skip] * New translations en.json (Breton) [ci skip] * New translations en.yml (Breton) [ci skip] * New translations en.yml (Breton) [ci skip] * New translations en.yml (Breton) [ci skip] * New translations en.yml (Breton) [ci skip] * New translations devise.en.yml (Breton) [ci skip] * New translations en.json (Breton) [ci skip] * New translations doorkeeper.en.yml (Breton) [ci skip] * New translations simple_form.en.yml (Breton) [ci skip] * New translations en.yml (Breton) [ci skip] * New translations en.yml (Russian) [ci skip] * New translations devise.en.yml (Russian) [ci skip] * New translations simple_form.en.yml (Russian) [ci skip] * New translations en.json (Russian) [ci skip] * New translations en.yml (Russian) [ci skip] * New translations en.yml (Russian) [ci skip] * New translations simple_form.en.yml (Japanese) [ci skip] * i18n-tasks normalize * yarn manage:translations	5 years ago
ThibG	54da8c4337	Fix media not being marked sensitive when client sets a CW but no text (#13277) ... Mastodon enforces the “sensitive” flag on media attachments whenever a toot is posted with a Content Warning. However, it does so *after* potentially converting the Content Warning to toot text (when there is no toot text), which leads to inconsistent and surprising behavior for API clients. This commit fixes this inconsistency.	5 years ago
ThibG	15c02a7160	Fix frontend crash when deleting announcements (#13312) ... Refactor and fix #13283, which only worked in some cases.	5 years ago
ThibG	421a3a8f08	Change poll option hover/active styling to be less confusing (#13313)	5 years ago
Thibaut Girka	6b5c7ee662	Make sanitizer *not* add no-referrer etc. in local markdown toots if the link is “safe”	5 years ago
Thibaut Girka	909b2257ab	Fix glitch-soc marking every link in toots as a tag ... Fixes #1281	5 years ago
Daniel Sockwell	5e3049158e	[Glitch] Fix frontend crash when deleting announcements ... Port 577f74ad87 to glitch-soc Signed-off-by: Thibaut Girka <thib@sitedethib.com>	5 years ago
ThibG	e9338c7640	[Glitch] Fix regression in “Edit media” modal in web UI ... Port c5731b4dc7 to glitch-soc Signed-off-by: Thibaut Girka <thib@sitedethib.com>	5 years ago
mayaeh	24e4647483	[Glitch] Change the string "hidden" to "blocked" in WebUI ... Port 4a87cebf48 to glitch-soc Signed-off-by: Thibaut Girka <thib@sitedethib.com>	5 years ago
Eugen Rochko	3e87f56ab3	[Glitch] Change local media attachments to perform heavy processing asynchronously ... Port front-end part of f459919552 to glitch-soc [API] This makes use of a new media posting API (/api/v2/media), supporting background processing of uploaded files. For Pleroma's purposes, this could be handled the same as /api/v1/media since afaik Pleroma doesn't do any transcoding. Signed-off-by: Thibaut Girka <thib@sitedethib.com>	5 years ago
Thibaut Girka	99fc46d023	Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: - `README.md`: Our README.md files are completely different. Discarded upstream changes. - `app/javascript/core/admin.js`: Updating rails-ujs, no real conflict, but a comment to close to changed code. Various glitch-soc-only files have been updated to match those changes, though. - `package.json`: No real conflict, just an additional dependency in glitch-soc that was too close to something updated upstream. Took upstream's changes.	5 years ago
Takeshi Umeda	e1c65c565b	Fix bookmarks also searchable (#13293)	5 years ago
Shlee	056f97744a	Migrate Rails ujs as required for Rails 6 Upgrade. (#13280) ... * Update yarn.lock * Update package.json * Update public.js * Update admin.js * Update log_out.js * Update common.js	5 years ago
mayaeh	826ccfa973	Add link to bookmarks in web UI dropdown (#13273)	5 years ago
Jeong Arm	3b4e54f359	Make bookmarks also searchable (#13271)	5 years ago
Daniel Sockwell	577f74ad87	Fix frontend crash when deleting announcements (#13283) ... This two-line change fixes a crash in the front end that occurred under the following circumstances: * A server had more than one announcement, * A user was displaying the announcements, and * An announcement was deleted (or unpublished, which amounts to the same thing.) As might be expected, the bug was caused by attempting to access a notification using an index value outside the bounds of the existing announcements. Specifically, in two places. First, `_markAnnouncementAsRead` attempts to modify announcements based on the current index. This is what caused the front end crash. Second, when rendering the `Announcements` component, the code paginates the announcements and displays the current one. This did not cause a crash, but caused the front end to confusingly display a blank announcement (in situations that would have caused a crash) with no way for the user to navigate back to previous announcements. This commit fixes both issues by adding a check to ensure that the code never attempts to access an announcement with an index greater than or equal to the number of announcements present.	5 years ago
ThibG	977b7ef6d0	Fix reported accounts not being whitelisted when resolving a spamcheck report (#13289)	5 years ago
ThibG	c3edb6c02a	Fix WebUI crash in single-column mode on prehistoric browsers (#13267) ... Fixes #13266	5 years ago
Thibaut Girka	e16832bc9c	Fix missing media description dialog when sending toots with keyboard shortcuts	5 years ago
Thibaut Girka	03309b0dc5	Fix posting privacy on secondary button with missing description confirmation dialog	5 years ago
ThibG	23b1a9ad55	Fix some timeouts when searching URLs by limiting some database queries (#13253) ... Only look up private toots from database if the request failed because of 401, 403 or 404 errors, as those may indicate a private toot, rather than something that isn't a toot or cannot be processed.	5 years ago
Eugen Rochko	9ced8b6dd5	Add option to include resolved DNS records when blacklisting e-mail domains in admin UI (#13254) ... * Add shortcuts to blacklist a user's e-mail domain in admin UI * Add option to blacklist resolved MX and IP records for e-mail domains	5 years ago
Eugen Rochko	da9d81c4ac	Add titles to warning presets in admin UI (#13252)	5 years ago
Thibaut Girka	9af4ed237c	Fix privacy icon being displayed twice in glitch-soc Web UI ... Fixes #1298	5 years ago
ThibG	2e3c24d1c8	Fix detailed view of direct messages displaying a 0 boost count (#13244) ... The boost count is already removed from private toots, do the same with direct messages.	5 years ago
ThibG	c5731b4dc7	Fix regression in “Edit media” modal in web UI (#13243)	5 years ago
ThibG	0701e09c85	Fix videos with unsupported colorspace not being transcoded (#13242)	5 years ago
ThibG	ccd8ceac47	Fix MP4 (H264 + AAC) video files being needlessly re-encoded (#13239)	5 years ago
mayaeh	4a87cebf48	Change the string "hidden" to "blocked" in WebUI (#13221) ... * Change the string "hidden" to "blocked" in WebUI. * update	5 years ago
Eugen Rochko	a0c60d09ff	Change video uploads to always be converted to H264/MP4 (#13220) ... Even if the container format is the same (.mp4), the codec could be different and not playable in web browsers	5 years ago
Eugen Rochko	0995464585	Change video uploads to enforce certain limits (#13218) ... - Dimensions at most 1920x1200 - Frame rate at most 60	5 years ago
dependabot-preview[bot]	b4bc2817ba	Bump cld3 from 3.2.6 to 3.3.0 (#13107) ... * Bump cld3 from 3.2.6 to 3.3.0 Bumps [cld3](https://github.com/akihikodaki/cld3-ruby) from 3.2.6 to 3.3.0. - [Release notes](https://github.com/akihikodaki/cld3-ruby/releases) - [Commits](https://github.com/akihikodaki/cld3-ruby/compare/v3.2.6...v3.3.0) Signed-off-by: dependabot-preview[bot] <support@dependabot.com> * Fix compatibility with cld3 3.3.0 Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com> Co-authored-by: Eugen Rochko <eugen@zeonfederated.com>	5 years ago
ThibG	cd7c22da32	Add federation support for the "hide network" preference (#11673) ... * Change ActivityPub follower/following collections to not link first page * Add support for hiding followers and following of remote users * Switch to using a single `hide_collections` column * Address code style remarks	5 years ago
Eugen Rochko	f459919552	Change local media attachments to perform heavy processing asynchronously (#13210) ... Fix #9106	5 years ago
ThibG	96df38d753	[Glitch] Add support for links to statuses in announcements to be opened in web UI ... Port a67fd2fbe1 to glitch-soc Signed-off-by: Thibaut Girka <thib@sitedethib.com>	5 years ago
Mélanie Chauvel (ariasuni)	8dede28b01	[Glitch] Change the tooltip "Toggle visibility" to "Hide media" in web UI ... Port 399fa48f8e to glitch-soc Signed-off-by: Thibaut Girka <thib@sitedethib.com>	5 years ago
Bèr Kessels	96b18a705f	[Glitch] Code style improvements in JavaScript ... Port b5d7ec71ef to glitch-soc * JS-linter: fix trailing comma's * Configure eslinter to ignore this onchange error. Signed-off-by: Thibaut Girka <thib@sitedethib.com>	5 years ago
Mélanie Chauvel (ariasuni)	ce8d13d2fb	[Glitch] Change description of privacy levels to be more intuitive in web UI ... Port 263bedff9e to glitch-soc Co-authored-by: Thibaut Girka <thib@sitedethib.com> Signed-off-by: Thibaut Girka <thib@sitedethib.com>	5 years ago
Mélanie Chauvel (ariasuni)	5325a14430	[Glitch] Fix text area above/right of emoji picker being accidentally clickable in web UI ... Port 38a26d5314 to glitch-soc Signed-off-by: Thibaut Girka <thib@sitedethib.com>	5 years ago
ThibG	71d28dcfb9	[Glitch] Fix too large announcements not being scrollable in web UI ... Port 1eae25af56 to glitch-soc Signed-off-by: Thibaut Girka <thib@sitedethib.com>	5 years ago
koyu	6a7c4c26f0	[Glitch] Change GIF label to be displayed even when autoplay is enabled in web UI ... Port e899e0dc98 to glitch-soc Signed-off-by: Thibaut Girka <thib@sitedethib.com>	5 years ago
ThibG	d668512e64	[Glitch] Change the string "Hide everything from …" to "Block domain …" in web UI ... Port 03d2704430 to glitch-soc Signed-off-by: Thibaut Girka <thib@sitedethib.com>	5 years ago
Mélanie Chauvel (ariasuni)	787b4748dc	[Glitch] Add tooltips to audio/video player buttons ... Port 635812f9ea to glitch-soc Signed-off-by: Thibaut Girka <thib@sitedethib.com>	5 years ago
Thibaut Girka	0fd3f87ea2	Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: - `app/controllers/api/v1/statuses_controller.rb`: Conflict due to upstream adding a new parameter (with_rate_limit), too close to glitch-soc's own additional parameter (content_type). Added upstream's parameter. - `app/services/post_status_service.rb`: Conflict due to upstream adding a new parameter (rate_limit), too close to glitch-soc's own additional parameter (content_type). Added upstream's parameter. - `app/views/settings/preferences/appearance/show.html.haml`: Conflict due to us not exposing theme settings here (as we have a different flavour/skin menu). Took upstream change, while still not exposing theme settings. - `config/webpack/shared.js`: Coding style fixes for a part we have rewritten. Discarded upstream changes.	5 years ago
ThibG	852958d725	Fix public posts from silenced accounts not being changed to unlisted visibility (#13096)	5 years ago