monorail
/
mastodon
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
20,607 Commits 1 Branch 0 Tags 261 MiB
Commit Graph

12493 Commits

Author SHA1 Message Date
Claire 9d1c3d0678
Fix scroll position in thread view reseting when closing a modal (#27350) 2023-10-10 11:35:32 +02:00
github-actions[bot] 1a2a4c389f
New Crowdin Translations (automated) (#27347) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2023-10-10 10:06:37 +02:00
Claire 05159d2f94 [Glitch] Fix clicking on already-loaded thread scrolling to the top of the thread 
Port 4c2aca777f to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2023-10-09 21:15:59 +02:00
Claire 8ef1a95b1c Merge commit '4c2aca777f6ae6942d0cf11aee56a925694ccdef' into glitch-soc/merge-upstream 2023-10-09 21:14:57 +02:00
Renaud Chaput 7b325aa81b [Glitch] Autofix missing comma and indentation in JS files 
Port 774e1189d2 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2023-10-09 21:14:25 +02:00
Claire 4a9cdfb928 Merge commit '774e1189d26fffd914107a4236f6287043c988f8' into glitch-soc/merge-upstream 2023-10-09 21:12:28 +02:00
Claire b63d526590 [Glitch] Fix clicking on already-opened thread post scrolling to the top of the thread 
Port c310374a2f to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2023-10-09 21:11:44 +02:00
Claire 3da7afdeed Merge commit 'c310374a2f83a890520ace50e41c1e3d046e15e1' into glitch-soc/merge-upstream 2023-10-09 21:10:47 +02:00
Claire 4c2aca777f
Fix clicking on already-loaded thread scrolling to the top of the thread (#27338) 2023-10-09 16:46:09 +02:00
Renaud Chaput 774e1189d2
Change `eslint` config to autofix missing comma and indentation in JS files (#26711) 2023-10-09 13:38:29 +02:00
Claire c310374a2f
Fix clicking on already-opened thread post scrolling to the top of the thread (#27331) 2023-10-09 12:21:02 +02:00
github-actions[bot] 89b48681cf
New Crowdin Translations (automated) (#27321) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2023-10-09 10:32:06 +02:00
Claire 967bd543bb [Glitch] Fix auto-loading-more when not scrolled 
Port 2b98e2ecd6 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2023-10-08 17:34:10 +02:00
Claire 53f5b27bd1 Merge commit '640421f661ee4d7e76a2aab607e7b15687940b6f' into glitch-soc/merge-upstream 2023-10-08 17:30:48 +02:00
Claire 86c9c5afa0 Merge commit '40ba6e119b7457161fd43b449875d0fb9d473c1a' into glitch-soc/merge-upstream 
Conflicts:
- `app/controllers/concerns/web_app_controller_concern.rb`:
  Upstream changed the order of Action Controller filters for web app
  controllers.
  Glitch-soc has an extra filter due to its theming system.
  Changed the order accordingly.
- `app/views/settings/preferences/appearance/show.html.haml`:
  Conflict due to an extra newline in glitch-soc.
  Removed that newline and applied upstream's changes.
 2023-10-08 17:26:43 +02:00
Claire ac2370778a Merge commit 'c676bc91e9c3aa81eb7cfbce3c5c5e80b84d3d02' into glitch-soc/merge-upstream 
Conflicts:
- `config/environments/production.rb`:
  Upstream enforced a code style change and glitch-soc had a few different lines.
  Applied upstream's code style to glitch-soc's changes.
 2023-10-08 17:21:12 +02:00
Claire 74c27e33e3 Merge commit '37bbd3c1064380a756b4e821655d7697105f99f5' into glitch-soc/merge-upstream 2023-10-08 17:10:39 +02:00
Michael Stanclift 8eb09c6f72 [Glitch] Keep version string displayed without breakpoints in UI 
Port 5a437edc7f to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2023-10-08 17:09:02 +02:00
Claire a5dbb1ee5a Merge commit '5a437edc7f22d5797e5af29d9b450a03eccec304' into glitch-soc/merge-upstream 2023-10-08 17:05:40 +02:00
Claire e83059fd9d [Glitch] Fix explore prompt appearing because of posts being received out of order 
Port d80a819fc6 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2023-10-08 17:03:40 +02:00
Claire e9a181c52c Merge commit 'e95d25e1013b6328457b81bd98e8d6a841d45ec2' into glitch-soc/merge-upstream 2023-10-08 16:53:05 +02:00
Claire 702d162998 Merge commit '5393be7a21331c8615ffb79c2271db92f6959458' into glitch-soc/merge-upstream 
Conflicts:
- `app/controllers/auth/registrations_controller.rb`:
  Not a real conflict. Upstream removed the `set_instance_presenter` private
  method from this class, and glitch-soc has an extra private method right
  besides it for the theming system.
  Removed `set_instance_presenter` as upstream did.
- `app/controllers/auth/sessions_controller.rb`:
  Not a real conflict. Upstream removed the `set_instance_presenter` private
  method from this class, and glitch-soc has an extra private method right
  besides it for the theming system.
  Removed `set_instance_presenter` as upstream did.
 2023-10-08 16:48:19 +02:00
Claire d7fcd70023 Merge commit '2016c5d912f400ae98ee03ce269112de2f9ec62d' into glitch-soc/merge-upstream 
Conflicts:
- `config/initializers/cors.rb`:
  Upstream refactored this file, and glitch-soc had local changes.
  I could not find the rationale for the glitch-soc changes, so I
  used upstream's version.
 2023-10-08 16:41:56 +02:00
Michael Stanclift cfc0da77ac [Glitch] Fix retention dashboard not displaying correct month 
Port 7fddeca190 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2023-10-08 16:33:37 +02:00
Claire 19ebf7797e Merge commit 'e6b903b21e0682c1156ffec583ac2836fda7d657' into glitch-soc/merge-upstream 2023-10-08 16:30:00 +02:00
Claire 3262d1f1b6
Fix incorrect serialization of regional languages in `contentMap` (#27207) 2023-10-06 17:46:04 +02:00
Michael Stanclift 3171afc36a
Add Elasticsearch index size to Admin dashboard (#27301) 
Co-authored-by: Claire <claire.github-309c@sitedethib.com>
 2023-10-06 17:02:55 +02:00
Claire 340c390849
Fix crash when filtering for “dormant” relationships (#27306) 2023-10-06 12:58:16 +02:00
Claire 4d59dfb1c6
Fix some remote posts getting truncated (#27307) 2023-10-06 12:58:02 +02:00
github-actions[bot] e0b54ed3e1
New Crowdin Translations (automated) (#27304) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2023-10-06 11:49:09 +02:00
Claire 2b98e2ecd6
Fix auto-loading-more when not scrolled (#27286) 2023-10-05 16:33:54 +02:00
github-actions[bot] 32ab474472
New Crowdin Translations (automated) (#27277) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2023-10-05 13:13:14 +02:00
Claire 3c13d70600
Add mention of YJIT in admin dashboard if enabled (#27283) 2023-10-05 13:10:17 +02:00
Claire 40ba6e119b
Fix Vary headers not being set on some redirects (#27272) 2023-10-05 09:50:08 +02:00
github-actions[bot] 8e4251f9e7
New Crowdin Translations (automated) (#27270) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2023-10-04 10:53:04 +02:00
gunchleoc 68ec1d180a
Fix language sorting in settings (#27158) 2023-10-04 09:23:50 +02:00
Matt Jankowski c676bc91e9
Dont match mention in url query string (#25656) 
Co-authored-by: Claire <claire.github-309c@sitedethib.com>
 2023-10-03 17:01:45 +02:00
Matt Jankowski 2f8f92df48
Fix Elastic check deprecation warning about gem version (#27262) 2023-10-03 15:52:47 +02:00
Matt Jankowski e715da6d25
Fix haml-lint Rubocop `Rails/*` cops (#26042) 2023-10-03 15:00:40 +02:00
Claire 37bbd3c106
Fix double scroll bars in some columns in advanced interface (#27187) 2023-10-03 13:12:39 +02:00
Claire ceb365c419
Fix boosts of local users being filtered in account timelines (#27204) 2023-10-03 12:21:42 +02:00
Claire 4e55001e65
Add a short-lived lock to trend refresh scheduler (#27253) 2023-10-03 12:21:32 +02:00
Michael Stanclift 5a437edc7f
Keep version string displayed without breakpoints in UI (#26986) 2023-10-03 11:52:21 +02:00
David Aaron 6320c52630
Change min age of backup policy from 1 week to 6 days (#27200) 2023-10-03 11:48:57 +02:00
Jakob Gillich 770fd993ec
Fix importer returning negative row estimates (#27258) 2023-10-03 10:47:50 +02:00
github-actions[bot] e95d25e101
New Crowdin Translations (automated) (#27260) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2023-10-03 10:47:28 +02:00
Claire 5e56f3db65
Change some worker lock TTLs (#27246) 2023-10-03 10:09:00 +02:00
Claire 7e7d6e695b
Fix incorrectly keeping outdated update notices absent from the API endpoint (#27021) 2023-10-02 16:42:52 +02:00
Claire 1e2d4975cf
Fix import progress not updating on certain failures (#27247) 2023-10-02 16:20:04 +02:00
github-actions[bot] ee866ec0e0
New Crowdin Translations (automated) (#27220) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2023-10-02 13:35:29 +02:00
Jake Anto c2f13769cd
Add PWA shortcut to `/explore` page (#27235) 2023-10-02 13:18:16 +02:00
Claire d80a819fc6
Fix explore prompt appearing because of posts being received out of order (#27211) 2023-09-29 15:51:36 +02:00
github-actions[bot] 695e42de0d
New Crowdin Translations (automated) (#27202) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2023-09-29 10:04:18 +02:00
Matt Jankowski 340f1a68be
Simplify instance presenter view access (#26046) 2023-09-28 16:52:37 +02:00
Matt Jankowski 2016c5d912
Fix deprecation warning about `rewhere: true` being default behavior (Rails 7.1 prep) (#27190) 2023-09-28 16:52:23 +02:00
Matt Jankowski 99e289f03f
Fix include `Rails.application.routes.url_helpers` (Rails 7.1 prep) (#27189) 2023-09-28 16:52:11 +02:00
Matt Jankowski 89a17878ef
Fix haml-lint `InstanceVariables` rule for admin/roles/_form (#26063) 2023-09-28 16:36:24 +02:00
Matt Jankowski 9d56c1949b
Fix haml-lint `InstanceVariables` rule for admin/webhooks/_form (#26062) 2023-09-28 16:23:35 +02:00
Matt Jankowski 3060bfa4bd
Extract filename and csv helper methods from `Form::Import` (#26129) 2023-09-28 16:22:05 +02:00
Matt Jankowski e6b903b21e
Fix haml-lint `InstanceVariables` rule for invites/_form (#26064) 2023-09-28 15:40:28 +02:00
Claire 1da3c588ca
Fix link handling of mentions in user profiles when logged out (#27185) 2023-09-28 15:29:07 +02:00
Claire 686406cc2d
Fix filtering audit log for entries about disabling 2FA (#27186) 2023-09-28 13:41:24 +02:00
github-actions[bot] b93ce7d8b3
New Crowdin Translations (automated) (#27168) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2023-09-28 10:44:16 +02:00
Christian Schmidt 6d0767558a
Make notification respect reduce-motion (#27178) 2023-09-28 10:39:38 +02:00
Michael Stanclift 7fddeca190
Fix retention dashboard not displaying correct month (#27180) 2023-09-28 10:16:15 +02:00
gunchleoc ce79caca4e
Only strip country code when language not listed in SUPPORTED_LOCALES (#27099) 2023-09-28 10:13:44 +02:00
Claire 1eeaa0d84f [Glitch] Fix width of large text icon buttons 
Port 38753acaa5 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2023-09-26 13:25:01 +02:00
gunchleoc ca7d16912e [Glitch] Fix line wrapping of language selection button with long locale codes 
Port 88fa8e710a to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2023-09-26 13:24:29 +02:00
Claire 02e6d9f8f9 [Glitch] Fix explore prompt sometimes showing up when the home TL is loading 
Port a001ae2f39 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2023-09-26 13:20:18 +02:00
Renaud Chaput 919ed0e469 [Glitch] Convert `dropdown_menu` state to Typescript 
Port 4b7bc1f07c to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2023-09-26 13:19:27 +02:00
Renaud Chaput b2d67fbe33 [Glitch] Improve modals reducer types 
Port b93ffb74bb to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2023-09-26 13:17:08 +02:00
Claire abdb58840a Merge commit '57f592fed50747f3c97718a2761e17bafe6c8698' into glitch-soc/merge-upstream 2023-09-26 13:13:27 +02:00
Renaud Chaput 57f592fed5
Add Typescript types for some API objects (#26602) 2023-09-26 11:25:01 +02:00
github-actions[bot] 5ea3e8e765
New Crowdin Translations (automated) (#27144) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2023-09-26 10:47:16 +02:00
Essem bd810391d6
Properly remove tIME chunk from PNG uploads (#27111) 2023-09-25 19:21:07 +02:00
Claire a001ae2f39
Fix explore prompt sometimes showing up when the home TL is loading (#27062) 2023-09-25 17:07:01 +02:00
Claire 3de6dcf634
Add redirection on `/deck` URLs for logged-out users (#27128) 2023-09-25 15:07:10 +02:00
Claire 38753acaa5
Fix width of large text icon buttons (#27127) 2023-09-25 15:06:57 +02:00
Claire 1bd7455d81
Fix inefficient queries in “Follows and followers” as well as several admin pages (#27116) 2023-09-25 15:06:43 +02:00
gunchleoc 88fa8e710a
Fix line wrapping of language selection button with long locale codes (#27100) 2023-09-25 12:59:37 +02:00
github-actions[bot] 736fe75346
New Crowdin Translations (automated) (#27080) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2023-09-25 10:50:09 +02:00
Renaud Chaput 4b7bc1f07c
Convert `dropdown_menu` state to Typescript (#25585) 2023-09-22 18:18:46 +02:00
Renaud Chaput b93ffb74bb
Improve modals reducer types (#26610) 2023-09-22 16:41:50 +02:00
Claire 39da3d86f8
Fix ActiveRecord using two connection pools when no replica is defined (#27061) 2023-09-22 16:01:59 +02:00
github-actions[bot] e824585523
New Crowdin Translations (automated) (#27052) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2023-09-22 11:06:48 +02:00
Renaud Chaput 4aaaf0dde3
Fix the search documentation URL in system checks (#27036) 2023-09-22 10:13:53 +02:00
Claire 6760e67c64 [Glitch] Fix search results temporarily disappearing while scrolling and loading more results 
Port 5356ddbcca to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2023-09-21 15:14:38 +02:00
Claire f05985f8ec Merge branch 'main' into glitch-soc/merge-upstream 
Conflicts:
- `README.md`:
  Upstream changed their README, we have a completely different one.
  Kept our version.
 2023-09-21 15:12:00 +02:00
Claire 5356ddbcca
Fix search results temporarily disappearing while scrolling and loading more results (#27014) 2023-09-21 13:51:21 +02:00
github-actions[bot] effe4728cf
New Crowdin Translations (automated) (#27005) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2023-09-21 11:06:04 +02:00
Claire 828eebad48
Add `hide_collections`, `discoverable` and `indexable` attributes to credentials API (#26998) 2023-09-20 18:25:16 +02:00
github-actions[bot] 61fe25fe74
New Crowdin Translations (automated) (#26988) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2023-09-20 13:05:56 +02:00
Claire f546b0c999 Merge branch 'main' into glitch-soc/merge-upstream 2023-09-19 17:07:29 +02:00
Claire eeab3560fc
Merge pull request from GHSA-v3xf-c9qf-j667 2023-09-19 16:53:58 +02:00
Claire ff32475f5f
Merge pull request from GHSA-2693-xr3m-jhqr 2023-09-19 16:53:21 +02:00
Claire 94893cf24f
Merge pull request from GHSA-hcqf-fw2r-52g4 
* Revert "Fix request URL normalisation for bare domain and 8-bit characters (#26285)"

This reverts commit 8891d8945d.

* Revert "Do not normalize URL before fetching it (#26219)"

This reverts commit fd284311e7.
 2023-09-19 16:52:52 +02:00
github-actions[bot] 73ecc4de6e
New Crowdin Translations (automated) (#26978) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2023-09-19 16:26:51 +02:00
Claire 22ee4e057d Merge commit 'a83615edc9fc1ce3363ddcf1fc676806421a5f65' into glitch-soc/merge-upstream 
Conflicts:
- `streaming/index.js`:
  Upstream has added a parameter to `streamFrom`, while glitch-soc had an
  extra parameter.
  Ported upstream changes.
 2023-09-19 12:59:23 +02:00
Claire 1e87575b70 Merge commit '6eb6209d02514c5271238a23601be643c7b9f52d' into glitch-soc/merge-upstream 2023-09-19 12:53:32 +02:00
Claire 70cae19b6b
Fix hashtag bar being sometimes incorrectly hidden (#26960) 2023-09-19 12:25:39 +02:00
github-actions[bot] 67eaaa4b90
New Crowdin Translations (automated) (#26966) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2023-09-19 10:41:48 +02:00
Rob Thomas 200312e8be
Fix crash when viewing a moderation appeal and the moderator account has been deleted (#25900) 
Co-authored-by: Claire <claire.github-309c@sitedethib.com>
 2023-09-18 17:41:32 +02:00
github-actions[bot] 1b4902fabf
New Crowdin Translations (automated) (#26913) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2023-09-18 13:46:07 +02:00
Claire 31dedf4697 [Glitch] Fix Web UI making duplicate search queries when scrolling 
Port 4c1518a6f3 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2023-09-18 12:12:55 +02:00
Claire f61e29cc7e [Glitch] Fix error in Web UI when server rules cannot be fetched 
Port 893755f4cb to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2023-09-18 12:11:09 +02:00
Claire 9688c5fcc4 Merge branch 'main' into glitch-soc/merge-upstream 2023-09-18 12:09:37 +02:00
Claire 4c1518a6f3
Fix Web UI making duplicate search queries when scrolling (#26959) 2023-09-18 11:20:09 +02:00
Claire 893755f4cb
Fix error in Web UI when server rules cannot be fetched (#26957) 2023-09-18 09:51:52 +02:00
Claire 392c07f2bf
Fix `Setting.authorized_fetch` not being properly taken into consideration (#26958) 2023-09-18 09:37:29 +02:00
Claire 60ecca6acb Revert tabs background color so they are easier to visually distinguish from contents 2023-09-16 09:50:00 +02:00
Claire d3f14dd7d4 [Glitch] Fix dismiss button overlapping with text in dismissable banners 
Port 2a4fcc51fd to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2023-09-15 21:48:36 +02:00
Claire dfc05ec8df Merge commit '6273416292090b2f6bfda33f070cea325a1759df' into glitch-soc/merge-upstream 
Conflicts:
- `.github/workflows/build-nightly.yml`:
  Upstream modified this file close to a line modified by glitch-soc to
  disable the ARMv64 builder (as glitch-soc doesn't have one).
  Ported upstream's changes.
- `.github/workflows/build-releases.yml`:
  Upstream modified this file close to lines changed by glitch-soc to
  change the Docker image repositories used (only ghcr, and based on the
  organization's name).
  Ported upstream's changes.
 2023-09-15 21:43:49 +02:00
Claire 5ed72f668f Merge commit 'b90383d07388fe8513e59a6deb1a2391146c6561' into glitch-soc/merge-upstream 2023-09-15 21:39:21 +02:00
Claire cf8b242c4c [Glitch] Fix notification permissions being requested immediately after login 
Port 520b570474 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2023-09-15 21:33:28 +02:00
Santiago Kozak 0b5903af7c [Glitch] Fix recent search items not handling overflows correctly 
Port d2cfcdd09e to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2023-09-15 21:31:46 +02:00
Claire e193c848fe Merge commit '97e4011c3ce31c6d492d5f103e95a35b6ebdc9bd' into glitch-soc/merge-upstream 
Conflicts:
- `config/initializers/content_security_policy.rb`:
  Upstream added some code to add the Identity Provider's sign-in endpoint to
  the `form-action` Content Security Policy directive but our version of the
  file is pretty different.
  Ported the change.
 2023-09-15 21:25:05 +02:00
Eugen Rochko 7384015505 [Glitch] Add recent searches in web UI 
Port 9b2bc3d1de to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2023-09-15 21:15:41 +02:00
Claire 263d601c25 [Glitch] Fix confusing behavior of mute button and volume slider in web UI 
Port 91040da871 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2023-09-15 21:12:53 +02:00
Eugen Rochko 58514651c3 [Glitch] Fix mute button and volume slider feeling disconnected in web UI 
Port f3a2e15f8e to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2023-09-15 21:12:13 +02:00
Eugen Rochko 15c865808a [Glitch] Change onboarding prompt to use full width of banner in web UI 
Port 1f141f656d to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2023-09-15 21:09:28 +02:00
Claire 08b495d95c Merge commit 'b1d89071384ef028c97a3d28cf8cf6bc0ca6c4ce' into glitch-soc/merge-upstream 2023-09-15 21:06:45 +02:00
Claire 9f3df3edee [Glitch] Add some information about Full-text search being disabled in search popout 
Port 9c1ef8302a to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2023-09-15 21:01:40 +02:00
Claire 5d8c65f2a7 Merge commit '398635c0c4987ec44d937e98431ff5dee331ea94' into glitch-soc/merge-upstream 2023-09-15 20:57:40 +02:00
Eugen Rochko 526f457ebc [Glitch] Add infinite scrolling for search results in web UI 
Port 5d20733d8d to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2023-09-15 20:54:20 +02:00
Eugen Rochko f7a4d77d90 [Glitch] Add `in:` to search popout in web UI 
Port d8bdba2f9f to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2023-09-15 20:33:51 +02:00
Claire 3ca94f6d4a Merge commit '93d051e47d27b5bd10be922a81d4d4eb6c306330' into glitch-soc/merge-upstream 2023-09-15 20:21:40 +02:00
Claire e5269c6a65 [Glitch] Improve interaction modal error handling 
Port 548c032dbb to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2023-09-15 20:11:18 +02:00
Claire e14372c2d1 Merge commit '548c032dbb90ae9c06b05fc05724c49d0b552fd9' into glitch-soc/merge-upstream 2023-09-15 20:08:09 +02:00
Claire 6273416292
Fix post edits not being forwarded as expected (#26936) 2023-09-15 19:54:32 +02:00
Claire 2a4fcc51fd
Fix dismiss button overlapping with text in dismissable banners (#26935) 2023-09-15 19:53:28 +02:00
Claire e4f5114aaf
Fix obsolete cache key in status cache invalidation logic (#26934) 2023-09-15 19:52:28 +02:00
Claire 9693c271f1
Fix processing of `min_id` and `max_id` parameters in `/api/v2/search` (#26927) 2023-09-15 10:23:24 +02:00
Eugen Rochko fc6825055b
Change score half-life for trending posts from 2 hours to 1 hour (#26915) 2023-09-14 09:20:14 +02:00
github-actions[bot] 921c6fe654
New Crowdin Translations (automated) (#26498) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2023-09-13 15:10:41 +02:00
Robert R George 20666482ef
Added admin api for managing tags (#26872) 2023-09-13 11:22:53 +02:00
Plastikmensch 075ee0b2d4
Fix wrong gradient color on collapsed private mentions (#2402) 
Upstream changed the background color of private mentions, but the gradient used for collapsed toots still used the old color.

Signed-off-by: Plastikmensch <plastikmensch@users.noreply.github.com>
 2023-09-13 08:44:40 +02:00
Claire 520b570474
Fix notification permissions being requested immediately after login (#26472) 2023-09-12 18:27:01 +02:00
Claire 287520453c
Fix front-end bug when processing relationship-related account actions (#26902) 2023-09-12 16:30:03 +02:00
CSDUMMI 9a70cac9de
Fix #26849 by adding the domain of the current SSO provider to the form-action CSP (#26857) 2023-09-12 13:04:51 +02:00
Renaud Chaput 0712cc2b99
Fix Redux types (#26899) 2023-09-12 12:18:19 +02:00
Santiago Kozak d2cfcdd09e
Fix recent search items not handling overflows correctly (#26893) 2023-09-12 04:20:57 +02:00
Claire 20ac5be1c1
Fix error on `status` type notification (bell icon) (#26884) 2023-09-11 20:23:13 +02:00
Renaud Chaput bd06c13204
Convert `actions/account_notes` into Typescript (#26601) 2023-09-11 16:09:22 +02:00
Claire 91040da871
Fix confusing behavior of mute button and volume slider in web UI (#26860) 2023-09-08 20:39:29 +02:00
Claire 33c8708a1a
Change `GET /api/v1/directory` to use database replica rather than primary (#26856) 2023-09-08 17:01:02 +02:00
Eugen Rochko 3a679844e4
Fix `account_id`, `max_id` and `min_id` params not working in search (#26847) 2023-09-08 14:25:00 +02:00
Claire 81caafbe84
Fix performances of profile directory (#26842) 2023-09-07 18:55:25 +02:00
Claire 355e3fb529
Simplify `Account.by_recent_status` and `Account.by_recent_sign_in` scopes (#26840) 2023-09-07 15:38:11 +02:00
Eugen Rochko 9b2bc3d1de
Add recent searches in web UI (#26834) 2023-09-07 14:56:19 +02:00
Eugen Rochko a90b0056cc
Fix `#hashtag` matching on individual components in search (#26835) 2023-09-07 12:53:41 +02:00
Colette Kerr 8a9d7aeb1e
Change DCT method used for JPEG encoding to float (#26675) 2023-09-07 05:26:25 +02:00
Eugen Rochko f3a2e15f8e
Fix mute button and volume slider feeling disconnected in web UI (#26827) 2023-09-07 04:24:24 +02:00
Eugen Rochko 1f141f656d
Change onboarding prompt to use full width of banner in web UI (#26829) 2023-09-07 04:24:11 +02:00
Eugen Rochko 398635c0c4
Fix paragraph margins resulting in irregular read-more cut-off in web UI (#26828) 2023-09-07 04:24:01 +02:00
Claire 1f99d86287
Fix blocked domain appears from account feed (#26823) 
Co-authored-by: Jeong Arm <kjwonmail@gmail.com>
Co-authored-by: Eugen Rochko <eugen@zeonfederated.com>
 2023-09-06 21:04:48 +02:00
gunchleoc 14f6798836
Link to hashtag timelines from the Trending hashtags moderation interface (#26724) 
Co-authored-by: Claire <claire.github-309c@sitedethib.com>
 2023-09-06 17:49:52 +02:00
Claire 475783d567
Add timezone to datetimes in e-mails (#26822) 2023-09-06 17:25:39 +02:00
Claire 9c1ef8302a
Add some information about Full-text search being disabled in search popout (#26756) 2023-09-06 17:23:58 +02:00
Claire b83e487502
Fix moderator rights inconsistencies (#26729) 2023-09-06 16:40:19 +02:00
Claire 223f9ca665
Fix crash when encountering invalid URL (#26814) 2023-09-06 12:17:51 +02:00
Claire 09ec9c6aa5
Downgrade signature verification debug logging from `warn` to `debug` (#26812) 2023-09-06 12:17:22 +02:00
Eugen Rochko d8bdba2f9f
Add `in:` to search popout in web UI (#26807) 2023-09-06 06:46:26 +02:00
Eugen Rochko 9d290c23d2
Remove obfuscation of reply count in web UI (#26768) 2023-09-05 23:57:03 +02:00
Eugen Rochko 5d20733d8d
Add infinite scrolling for search results in web UI (#26784) 2023-09-05 23:54:24 +02:00
Claire 548c032dbb
Improve interaction modal error handling (#26795) 2023-09-05 23:49:48 +02:00
Claire 77caba3789 Merge branch 'main' into glitch-soc/merge-upstream 2023-09-05 20:34:17 +02:00
Claire ea7de25de0
Fix video player not being displayed in reports interface (#26801) 2023-09-05 20:05:58 +02:00
Claire cab4cbfa5c
Fix “Scoped order is ignored, it's forced to be batch order.” warnings (#26793) 2023-09-05 15:37:23 +02:00
Stanislas Signoud d6f5c27fa9 [Glitch] Fix light mode colors for advanced interface banner 
Port a106c46478 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2023-09-04 18:31:00 +02:00
Claire e66f961e05 Merge branch 'main' into glitch-soc/merge-upstream 2023-09-04 18:27:46 +02:00
Eugen Rochko ece1ff77d6
Add `in:library` syntax to search (#26760) 
Co-authored-by: Claire <claire.github-309c@sitedethib.com>
 2023-09-04 17:20:35 +02:00
gunchleoc ac3f310f4b
Remove kmr from language selection (#26014) 2023-09-04 13:21:43 +02:00
Eugen Rochko 68b4e36c82
Fix `#hashtag` matching non-hashtagged posts in search (#26781) 2023-09-04 10:18:45 +02:00
Stanislas Signoud a106c46478
Fix light mode colors for advanced interface banner (#26759) 2023-09-04 10:14:01 +02:00
Eugen Rochko e52d0494ee
Fix `before:`, `after:` and `during:` failing when time zone not set (#26782) 2023-09-04 09:09:25 +02:00
Plastikmensch 6b0702a3b5
Add `recent` to search props (#2394) 
The new search popout requires the `recent` prop to be set, otherwise onboarding crashes with "recent is undefined"

Signed-off-by: Plastikmensch <plastikmensch@users.noreply.github.com>
 2023-09-03 08:46:30 +02:00
Claire 5c7df20c13 [Glitch] Add admin notifications for new Mastodon versions 
Port front-end changes from 16681e0f20 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2023-09-02 15:20:06 +02:00
Claire c107512fa6 Merge commit '05093266e6e3c54f9096da9cdcdafdc83703c578' into glitch-soc/merge-upstream 2023-09-02 15:02:29 +02:00
Claire 4371df7fbe [Glitch] Add `authorized_fetch` server setting in addition to env var 
Port SCSS changes from 9e26cd5503 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2023-09-02 15:01:37 +02:00
Eugen Rochko 728eb6a153
Fix wrong color on active icons with counters in web UI (#26767) 2023-09-02 14:46:26 +02:00
Claire 4ed629cd7e Merge commit 'be991f1d18006a4820c1e9ca6625bf2bd2bfedac' into glitch-soc/merge-upstream 
Conflicts:
- `app/models/form/admin_settings.rb`:
  Upstream added the notion of overriden settings, while we had extra code for
  pseudo-settings (only used to combine flavour and skin in a single select
  field).
  Ported upstream changes.
- `config/i18n-tasks.yml`:
  Upstream added `simple_form.overridden` to `ignore_unused`,
  we had `simple_form.glitch_only`.
  Added `simple_form.glitch_only` as well.
 2023-09-02 14:44:47 +02:00
Claire 807c0591e1 [Glitch] Fix search popout including full-text search instructions when full-text search is disabled 
Port 6c4c72497a to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2023-09-02 13:56:20 +02:00
Santiago Kozak 64e661b930 [Glitch] Allow filter form in profiles directory to wrap 
Port f1d250135c to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2023-09-02 13:55:53 +02:00
Stanislas Signoud 6c05ac4068 [Glitch] Add an explanation banner on switching to single column mode 
Port 40b69cc1cd to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2023-09-02 13:54:33 +02:00
Claire ac2dae0d11 Merge commit '6c4c72497a5722870e4432ef41dd4c9ec36a8928' into glitch-soc/merge-upstream 
Conflicts:
- `.github/workflows/build-releases.yml`:
  Upstream changed comments close to a line we modified to account for
  different container image repositories.
  Updated the comments as upstream did.
 2023-09-02 13:50:16 +02:00
Claire f5bd2014e2 [Glitch] Fix sign up steps progress layout in right-to-left locales 
Port 21ec596dab to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2023-09-02 13:42:50 +02:00
Tim Rogers beb5fcd0dc [Glitch] Fix bug with reblogged view on Toots only showing latest reblogging accounts 
Port 74eb7dbf2d to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2023-09-02 13:42:15 +02:00
Tim Rogers 871ab84854 [Glitch] Fix bug with favourited view on Toots only showing latest favouriting accounts 
Port ae6cf33321 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2023-09-02 13:39:02 +02:00
Claire ffb486648c Merge commit 'cb9f96036cf78835e22aafb30b80717b5a8b7394' into glitch-soc/merge-upstream 2023-09-02 13:34:54 +02:00
Claire afc3b12217 Merge commit '4ad1c5aa7174e5cef4ba9608a44429916a119bee' into glitch-soc/merge-upstream 
Conflicts:
- `README.md`:
  Upstream has updated their README, we have a completely different one.
  Kept ours.
- `config/initializers/content_security_policy.rb`:
  Upstream has updated their development CSPs, while we disable CSPs in
  the development environment.
  Kept our version.
 2023-09-02 13:31:15 +02:00
Claire 6ee3e382df Merge commit '0719216368bf3a90fdb7ab27201a0607b63ea203' into glitch-soc/merge-upstream 
Conflicts:
- `app/javascript/packs/public.jsx`:
  Some of the removed dead code was split from this code in
  `app/javascript/core/public.js` and `app/javascript/core/settings.js`.
  Removed this dead code, and removed `app/javascript/core/public.js`
  altogether.
 2023-09-02 13:18:16 +02:00
Claire fbbe9f1c12 Merge commit 'a7d96e6affd4a2da65f09f3f4ffa1b9350bb9a42' into glitch-soc/merge-upstream 2023-09-02 12:20:33 +02:00
Eugen Rochko cb50d95c06 [Glitch] Add search options to search popout in web UI 
Port bceb893159 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2023-09-02 12:09:07 +02:00
Claire c8aa3d6d06 Merge commit 'dd72a8d28b4479afdc19ac73cac83609d85b5f9e' into glitch-soc/merge-upstream 2023-09-02 12:02:23 +02:00
Claire 3c7dbf3a16 Merge commit '5694e24bbf9afccbbf1b44d3a405a4e2bc0ff08d' into glitch-soc/merge-upstream 
Conflicts:
- `.github/workflows/build-nightly.yml`:
  Upstream changed the environment variables used for defining the version
  number. This change occurs close to lines that were modified in glitch-soc
  to account for the different repositories to push to.
  Ported upstream changes.
- `.github/workflows/build-push-pr.yml`:
  Upstream changed the environment variables used for defining the version
  number. This change occurs close to lines that were modified in glitch-soc
  to account for the different repositories to push to.
  Ported upstream changes.
- `lib/mastodon/version.rb`:
  Upstream changed how the version string is built from environment variables.
  Adapted the logic to account for the `+glitch` in glitch-soc.
 2023-09-02 11:56:09 +02:00
Claire 023673c0d9 [Glitch] Add `data-nosnippet` attribute to remote posts and local posts with `noindex` 
Port c3a42e1280 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2023-09-02 11:49:35 +02:00
Claire 6b7c47311d Merge commit '072112867b9a3ec090ad2c92d6363b47b2265d74' into glitch-soc/merge-upstream 2023-09-02 11:41:40 +02:00
Eugen Rochko 05093266e6
Fix some video encoding failing due to uneven dimensions (#26766) 2023-09-02 09:02:44 +02:00
Claire 16681e0f20
Add admin notifications for new Mastodon versions (#26582) 2023-09-01 17:47:07 +02:00
Claire 9e26cd5503
Add `authorized_fetch` server setting in addition to env var (#25798) 2023-09-01 15:41:10 +02:00
Claire 6c4c72497a
Fix search popout including full-text search instructions when full-text search is disabled (#26755) 2023-09-01 15:13:27 +02:00
Claire 5c0a9aac3b
Revert to using primary database in IndexingScheduler (#26754) 2023-09-01 15:09:44 +02:00
Eugen Rochko e754083e8a
Fix unmatched quotes and prefixes causing search to fail (#26701) 2023-09-01 09:43:12 +02:00
Eugen Rochko 872145d1c2
Fix not being able to invoke phrase search using unicode quotation marks (#26687) 2023-09-01 09:27:03 +02:00
Eugen Rochko 0008458128
Fix search queries with slash causing or-condition (#26699) 2023-08-31 19:04:44 +02:00
Claire 9bb2fb6b14
Change importers to avoid a few inefficiencies (#26721) 2023-08-31 19:04:27 +02:00
Eugen Rochko ecd76fa413
Fix videos not playing in some browsers due to unsupported color space (#26745) 2023-08-31 17:21:06 +02:00
Claire 6b58cfd8dd
Fix searching by username by reverting account verbatim tokenizer to `standard` (#26739) 2023-08-31 15:35:58 +02:00
Santiago Kozak f1d250135c
Allow filter form in profiles directory to wrap (#26682) 2023-08-31 14:15:58 +02:00
Daniel M Brasil ccca542db1
Fix `/api/v1/timelines/tag/:hashtag` allowing for unauthenticated access when public preview is disabled (#26237) 2023-08-31 13:53:24 +02:00
Tyler Deitz 336ec503c2
Add avatar image to webfinger responses (#26558) 2023-08-31 13:46:27 +02:00
Stanislas Signoud 40b69cc1cd
Add an explanation banner on switching to single column mode (#26019) 2023-08-31 12:18:46 +02:00
Claire 5c38c3a9a1
Change text extraction in `PlainTextFormatter` to be faster (#26727) 2023-08-30 17:36:16 +02:00
Claire 21ec596dab
Fix sign up steps progress layout in right-to-left locales (#26728) 2023-08-30 16:29:52 +02:00
Eugen Rochko bba76e7267
Change `language:` to attempt to match to a known value in search (#26663) 2023-08-30 16:07:26 +02:00
Claire 9e77ab7db2
Change private statuses index to index without crutches (#26713) 2023-08-29 17:51:13 +02:00
Tim Rogers 74eb7dbf2d
Fix bug with reblogged view on Toots only showing latest reblogging accounts (#26574) 2023-08-29 14:42:20 +02:00
Claire c0605747ad
Fix N+1 in `tootctl search deploy` (#26710) 2023-08-29 14:06:22 +02:00
Tim Rogers ae6cf33321
Fix bug with favourited view on Toots only showing latest favouriting accounts (#26577) 2023-08-29 10:56:19 +02:00
Claire 25bf640629
Add debug logging on signature verification failure (#26637) 2023-08-29 10:29:07 +02:00
Christian Schmidt 0719216368
Remove dead code from public.jsx (#26547) 2023-08-29 10:16:18 +02:00
Lukas Martini a7d96e6aff
Improve error messages when DeepL quota is exceeded (#26704) 2023-08-29 09:14:44 +02:00
github-actions[bot] 786e586686
New Crowdin translations (#2388) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2023-08-29 08:28:45 +02:00
Eugen Rochko 10b06436d1
Fix colors and typography on hashtag bar in web UI (#26666) 2023-08-28 19:49:38 +02:00
Eugen Rochko 01b87a1632
Change video compression parameters (#26631) 2023-08-28 19:40:08 +02:00
Eugen Rochko 2304cc6456
Fix bad search type heuristic (#26673) 2023-08-28 17:08:37 +02:00
Claire 0cce7fb617
Fix incorrect call to `PublicStatusesIndex.import` (#26697) 2023-08-28 15:04:57 +02:00
Eugen Rochko bceb893159
Add search options to search popout in web UI (#26662) 2023-08-28 13:18:39 +02:00
Eugen Rochko 67166de865
Add `from:me` syntax to search (#26660) 2023-08-28 12:43:00 +02:00
renovate[bot] 9d9de8d219
Update dependency @testing-library/jest-dom to v6 (#26479) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
Co-authored-by: Renaud Chaput <renchap@gmail.com>
 2023-08-28 12:19:42 +02:00
Eugen Rochko 7bd5ebb0c5
Fix multiple issues with status index mappings (#26686) 2023-08-28 11:36:17 +02:00
Eugen Rochko 822a35b9d5
Fix not being able to negate prefix clauses in search (#26672) 2023-08-28 10:31:51 +02:00
Eugen Rochko e263db276f
Change indexing jobs to use database replica (#26692) 2023-08-27 22:38:01 +02:00
Eugen Rochko 5694e24bbf
Fix unnecessary condition causing seqscan when indexing (#26689) 2023-08-27 22:37:35 +02:00
Eugen Rochko f8d2fea2e6
Change queue of job when opting into search from `default` to `pull` (#26688) 2023-08-27 18:58:20 +02:00
github-actions[bot] efb1888320
New Crowdin translations (#2376) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2023-08-26 22:53:46 +02:00
Eugen Rochko 71641766f2
Fix toast saying "published" instead of "saved" after editing post in web UI (#26664) 2023-08-25 22:03:04 +02:00
Claire 072112867b
Fix dashboard check for Elasticsearch suggested command including incorrect names (#26658) 2023-08-25 18:17:22 +02:00
jsgoldstein 8e8747c564
Update ordering to use `id` from body of document instead of deprecated `_id` (#26659) 2023-08-25 18:16:08 +02:00
Claire 82ec6f162b
Fix statuses search Elasticsearch query (#26657) 2023-08-25 17:01:56 +02:00
Claire f2ec2876a4
Add Elasticsearch/OpenSearch version to “Software” in admin dashboard (#26652) 2023-08-25 12:02:09 +02:00
Claire e3825a13c1
Add PublicStatusesCheck to Elasticsearch index check on admin dashboard (#26650) 2023-08-25 12:01:55 +02:00
Claire c3a42e1280
Add `data-nosnippet` attribute to remote posts and local posts with `noindex` (#26648) 2023-08-25 11:31:20 +02:00
Claire 685270f3f7 [Glitch] Fix clicking “Explore” or “Live feeds” column headers to scroll in advanced mode 
Port e90649b064 to glitch-soc

Co-authored-by: Plastikmensch <Plastikmensch@users.noreply.github.com>
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2023-08-24 22:00:27 +02:00
Claire 66e82cb8e1 [Glitch] Fix selecting domains to forward reports to not passing the information correctly 
Port b2ac93dd73 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2023-08-24 22:00:00 +02:00
Claire 941a9df28a Merge commit '96bcee66fba582666259d1d7785c3a7f2a72b8aa' into glitch-soc/merge-upstream 
Conflicts:
- `.github/workflows/build-nightly.yml`:
  Upstream changed how the nightly builds are versioned, the conflict
  is because glitch-soc modified adjacent lines relative to the docker
  repositories the images are pushed to.
  Applied upstream's changes.
- `app/views/settings/preferences/notifications/show.html.haml`:
  Upstream moved some settings around. Glitch-soc had more settings.
  Applied upstream's changes, moving glitch-soc's extra settings
  accordingly.
 2023-08-24 21:56:00 +02:00
Antonin Del Fabbro 406f3942a9 [Glitch] Change opacity of the delete icon in the search field to be more visible 
Port 9a8190da4a to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2023-08-24 21:51:13 +02:00
Claire 32e67e78a3 Merge commit 'e3fd07197379f1ac7fd4a761b3ff55effa1a2a6c' into glitch-soc/merge-upstream 2023-08-24 21:50:14 +02:00
Christian Schmidt def58f8ac3 [Glitch] Fix some React warnings 
Port 152b10b624 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2023-08-24 21:49:26 +02:00
Claire b6b68b44a1 Merge commit 'b91724fb9d0839365391310e20c2589ff6062d4f' into glitch-soc/merge-upstream 
Conflicts:
- `Vagrantfile`:
  Upstream bumped a bunch of values, including one that was already bumped by
  glitch-soc.
  Took upstream's version.
- `lib/paperclip/transcoder.rb`:
  glitch-soc already had a partial fix for this.
  Took upstream's version.
 2023-08-24 21:46:17 +02:00
Claire d65aa507ca Merge commit 'bd023a2637ce4df2102c4f760ca1d05ff2302d9f' into glitch-soc/merge-upstream 2023-08-24 21:38:59 +02:00
Claire bdce78187c [Glitch] Fix layout of the closed registrations modal 
Port fe31571965 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2023-08-24 21:38:08 +02:00
Christian Schmidt 9b094f3653 [Glitch] Fix profile picture preview 
Port SCSS changes from bb23116e8d to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2023-08-24 21:36:42 +02:00
Claire 296b3d1560 Merge commit 'dc09c10fa8cc9230bf14e48d790c8f0c26043f8f' into glitch-soc/merge-upstream 
Conflicts:
- `.rubocop_todo.yml`:
  Upstream re-generated the file, while glitch-soc has a specific ignore
  for some file.
  Updated the file as upstream did and kept our extra ignore.
- `config/webpack/shared.js`:
  Upstream added a plugin, but our files are pretty different.
  Added the plugin as well.
- `spec/helpers/application_helper_spec.rb`:
  Upstream refactored tests, but part of them were different because
  of glitch-soc's theming system.
  Applied the refactoring to glitch-soc's change.
 2023-08-24 21:26:27 +02:00
Claire 88ff45a3b2 Merge commit 'facfec1ba36cee27f232ebff90b990933719235a' into glitch-soc/merge-upstream 2023-08-24 21:03:56 +02:00
Claire fbfc4145fd Merge commit '1cdcd9dc08c91321f80ffe4822f6a3da15abeb2c' into glitch-soc/merge-upstream 
Conflicts:
- `app/javascript/packs/public.jsx`:
  Upstream updated code that we actually moved to `app/javascript/core/settings.js`.
  Applied the changes there.
 2023-08-24 21:01:19 +02:00
Claire 1b5d3fdc5e Merge commit 'ee702e36e58d638bcf75b2eae2ca86499693465e' into glitch-soc/merge-upstream 2023-08-24 20:55:28 +02:00
Christian Schmidt e67c28a5fe [Glitch] Remove redundant ready() wrapper 
Port bb51c0676d to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2023-08-24 20:35:22 +02:00
Claire 7b09f585fa Merge commit 'bb51c0676d0cf27babc2c01ee337ca5fd24ae37c' into glitch-soc/merge-upstream 
Conflicts:
- `app/javascript/packs/public.jsx`:
  Upstream refactored slightly (but touching almost all the lines in the code),
  glitch-soc had moved a few of the code to another file.
  Refactored as upstream did.
 2023-08-24 20:34:14 +02:00
jsgoldstein 30c191aaa0
Add new public status index (#26344) 
Co-authored-by: Eugen Rochko <eugen@zeonfederated.com>
Co-authored-by: Claire <claire.github-309c@sitedethib.com>
 2023-08-24 16:40:04 +02:00
Claire 163b004bb1
Change admin e-mail notification settins to be their own settings group (#26596) 2023-08-24 14:43:00 +02:00
Claire e90649b064
Fix clicking “Explore” or “Live feeds” column headers to scroll in advanced mode (#26633) 
Co-authored-by: Plastikmensch <Plastikmensch@users.noreply.github.com>
 2023-08-24 14:10:48 +02:00
Claire b2ac93dd73
Fix selecting domains to forward reports to not passing the information correctly (#26636) 2023-08-24 14:06:27 +02:00
Matt Jankowski 9974163776
Consolidate inclusion of `admin` js pack link (#26628) 2023-08-24 09:56:23 +02:00
Antonin Del Fabbro 9a8190da4a
Change opacity of the delete icon in the search field to be more visible (#26449) 2023-08-23 15:51:07 +02:00
Daniel M Brasil f337008819
Fix timeout on invalid set of exclusionary parameters in `/api/v1/timelines/public` (#26239) 2023-08-23 15:50:23 +02:00
Claire 613cfd625c
Change hashtag bar tags to be de-emphasized (#26606) 2023-08-23 15:44:52 +02:00
Christian Schmidt 152b10b624
Fix some React warnings (#26609) 2023-08-23 15:43:41 +02:00
Renaud Chaput 44ba785242
Change the hashtag bar to be hidden when there is a CW and the post is not expanded (#26615) 2023-08-23 15:40:31 +02:00
jsgoldstein 85057865b4
Update Account Search to prioritize username over display name (#26623) 2023-08-23 15:40:09 +02:00
Robert R George cf6f70799b
Add support for federating `memorial` attribute (#26583) 2023-08-23 08:27:24 +02:00
Renaud Chaput 58acaa9ae6
Better hashtag normalization when processing a post (#26614) 2023-08-23 08:18:07 +02:00
Claire 452f15be78 Move glitch-soc's “Hide followers count” setting to “Show followers count” under “Privacy and reach” tab 2023-08-22 19:50:37 +02:00
Claire c053bfc45a [Glitch] Fix “legal” report category not showing up in moderation interface 
Port 0446394465 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2023-08-22 18:54:22 +02:00
Claire bd023a2637
Fix admin dashboard check when using Elasticsearch with `ES_PREFIX` (#26605) 2023-08-22 18:51:32 +02:00
Claire 10404aece8 Merge commit '1cb978bcc3d291a045f367e072ca0af1a1c4dbbc' into glitch-soc/merge-upstream 2023-08-22 18:50:14 +02:00
Claire 245fe855be [Glitch] Fix unfollow icon styling in advanced column 
Port d9c21293aa to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2023-08-22 18:48:23 +02:00
Claire 2126812f65 Merge commit 'd9c21293aa6e105cedeff6b5e469af40a20909d9' into glitch-soc/merge-upstream 
Conflicts:
- `app/views/settings/preferences/other/show.html.haml`:
  Upstream moved some settings, where glitch-soc has an extra setting.
  Ported upstream changes, moving the same settings as them.
 2023-08-22 18:31:28 +02:00
Claire 128daefc7a
Remove leftover `.orig` files that were mistakenly included (#2379) 2023-08-22 18:24:03 +02:00
gunchleoc 25dc01660d
Add Kalmyk to languages dropdown (#26013) 2023-08-22 17:50:04 +02:00
gunchleoc c01ecd0879
Add cherokee to languages dropdown (#26012) 2023-08-22 16:53:27 +02:00
Nick Schonning b970ed6098
Update rubocop and rubocop-rspec (#26329) 2023-08-22 09:31:40 +02:00
Claire fe31571965
Fix layout of the closed registrations modal (#26593) 2023-08-22 09:11:59 +02:00
mogaminsk 724d773844 [Glitch] Fix "Create Account" button in interaction modal 
Port a664e15702 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2023-08-21 21:08:56 +02:00
Claire 7e25e311d5 Merge commit '3a8370e1f459f5cf9695a610102ae6e53df36714' into glitch-soc/merge-upstream 2023-08-21 21:07:39 +02:00
Renaud Chaput 061fd66ee6
Remove hashtags from the last line of a status if it only contains hashtags (#26499) 2023-08-21 19:39:01 +02:00
Claire ac0eb0533e
Add Elasticsearch cluster health check and indexes mismatch check to dashboard (#26448) 2023-08-21 16:50:22 +02:00
Claire 9ed0c91a37
Add auto-refresh of accounts we get new messages/edits of (#26510) 2023-08-21 16:09:26 +02:00
Claire 191d302b7f
Refactor `Api::V1::ProfilesController` into two separate controllers (#26573) 2023-08-21 15:47:09 +02:00
Daniel M Brasil d24a87ce4f
Add ability to delete avatar or header picture via the API (#25124) 
Co-authored-by: Claire <claire.github-309c@sitedethib.com>
 2023-08-21 08:44:35 +02:00
Christian Schmidt bb23116e8d
Fix profile picture preview (#26538) 2023-08-18 18:24:32 +02:00
Claire ee702e36e5
Change follow recommendation materialized view to be faster in most cases (#26545) 
Co-authored-by: Renaud Chaput <renchap@gmail.com>
 2023-08-18 18:20:55 +02:00
Christian Schmidt bb51c0676d
Remove redundant ready() wrapper (#26533) 2023-08-18 12:06:08 +02:00
Nicolai Søborg 13ffe91c81
Fix `frame_rate` for videos where `ffprobe` reports 0/0 (#26500) 2023-08-18 08:32:47 +02:00
Renaud Chaput b95867ad1f
Allow setting a custom HTTP method in CacheBuster (#26528) 
Co-authored-by: Jorijn Schrijvershof <jorijn@jorijn.com>
 2023-08-18 08:18:40 +02:00
Claire 60b9fa641d
Fix cached posts including stale stats (#26409) 2023-08-17 16:11:48 +02:00
Claire 3ed2bf92d0
Fix case-insensitive comparison of hashtags to do case-folding (#26525) 2023-08-17 12:49:52 +02:00
Claire cc4560d95b
Change “privacy and reach” settings so that unchecking boxes always increase privacy and checking them always increase reach (#26508) 2023-08-17 09:13:26 +02:00
Claire 0446394465
Fix “legal” report category not showing up in moderation interface (#26509) 2023-08-16 16:38:33 +02:00
Claire f0862bcf98
Fix hashtag bar sometimes including tags that appear in the post's body (#26506) 2023-08-16 11:47:59 +02:00
Santiago Kozak 85ecadb630
Fix hashtag bar display when status is in a thread (#26497) 2023-08-16 09:06:04 +02:00
Claire df6e719898
Add display of out-of-band hashtags in the web interface (#26492) 
Co-authored-by: Eugen Rochko <eugen@zeonfederated.com>
 2023-08-14 23:42:30 +02:00
Claire d9c21293aa
Fix unfollow icon styling in advanced column (#26482) 2023-08-14 19:02:47 +02:00
Claire 90ec88d58b
Add support for `indexable` attribute on remote actors (#26485) 
Co-authored-by: Eugen Rochko <eugen@zeonfederated.com>
 2023-08-14 18:54:51 +02:00
Claire fc5ab2dc83
Add privacy tab in profile settings (#26484) 
Co-authored-by: Eugen Rochko <eugen@zeonfederated.com>
 2023-08-14 18:52:45 +02:00
Claire f5778caa3a
Add `ES_PRESET` option to customize numbers of shards and replicas (#26483) 
Co-authored-by: Eugen Rochko <eugen@zeonfederated.com>
 2023-08-14 17:46:16 +02:00
github-actions[bot] c452ccd913
New Crowdin Translations (automated) (#26444) 
Co-authored-by: GitHub Actions <noreply@github.com>
Co-authored-by: Claire <claire.github-309c@sitedethib.com>
 2023-08-14 14:54:31 +02:00
mogaminsk a664e15702
Fix "Create Account" button in interaction modal (#26459) 2023-08-14 12:04:04 +02:00
Claire 987f190839 [Glitch] Fix reply not preserving the language from the replied-to post 
Port 34f3001278 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2023-08-13 19:24:50 +02:00
Claire 92df185be7 Merge commit '496eb6f7a4fa7de54f26da9642a76e6884648102' into glitch-soc/merge-upstream 2023-08-13 19:23:22 +02:00
Claire e28727aab3 [Glitch] Change the hashtag column to not display the hashtag header on pinned columns 
Port 4caa9f0e69 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2023-08-13 19:13:11 +02:00
Claire 7c4b115e7d [Glitch] Fix interaction modal layout 
Port cd6f2b3cbc to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2023-08-13 19:12:42 +02:00
Eugen Rochko 0f8ddf367c [Glitch] Change header of hashtag timelines in web UI 
Port e325443b02 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2023-08-13 19:11:52 +02:00
Claire d9451feef0 [Glitch] Fix report modal secondary buttons style 
Port 79936c584f to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2023-08-13 19:08:08 +02:00
Claire 2f50b77ae8 [Glitch] Fix confirmation when closing media edition modal with unsaved changes 
Port b59053ff8c to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2023-08-13 19:06:02 +02:00
Trevor Wolf f0ad745506 [Glitch] Fix light theme select option for hashtags 
Port 93372fee1e to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2023-08-13 19:05:24 +02:00
Eugen Rochko 03ae73bdc5 [Glitch] Change design of hidden media overlay (again) in web UI 
Port 04e7efac3f to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2023-08-13 19:04:07 +02:00
Eugen Rochko 8247df3a8d [Glitch] Change reblogs to be excluded from "Posts and replies" tab in web UI 
Port 9d719bcd85 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2023-08-13 19:02:17 +02:00
CSDUMMI 64fc66d3db [Glitch] Add direct link to the Single-Sign On provider if there is only one sign up method available (#26083) 
Port 120f5802c0 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2023-08-13 19:00:25 +02:00
Christian Schmidt 1461cc53ed [Glitch] Add alt text for preview card thumbnails 
Port 8da99ffb0d to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2023-08-13 18:56:58 +02:00
Claire 6530f9709c Merge commit '121443c0fca383268b8022c048dd137994785aff' into glitch-soc/main 
Conflicts:
- `.rubocop_todo.yml`:
  Upstream regenerated this file, glitch-soc had a specific ignore.
 2023-08-13 18:47:15 +02:00
Eugen Rochko 57a4e7927a [Glitch] Add client-side timeout on resend confirmation button 
Port 2f932cb2bb to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2023-08-12 09:38:57 +02:00
Claire ea8802a05a Merge commit '3a4d3e9d4b573c400eec1743471d54cdccae50a5' into glitch-soc/merge-upstream 2023-08-12 09:36:38 +02:00
Claire 150cfcf3ae
Fix border-radius on “sensitive media” overlay for full-width media (#2364) 2023-08-12 09:30:27 +02:00
Claire 34f3001278
Fix reply not preserving the language from the replied-to post (#26452) 2023-08-12 00:06:37 +02:00
Claire 882e770400 [Glitch] Change interaction modal input to disable browser spell-checking, capitalization and autocomplete 
Port 71fd70335a to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2023-08-11 22:26:27 +02:00
Claire 44a5f1b64a Merge commit '425d77f8124a50fc033e8fb3bdf7b89a6a25f4fa' into glitch-soc/merge-upstream 
Conflicts:
- `.rubocop_todo.yml`:
  Upstream regenerated this file, glitch-soc had a specific ignore.
- `README.md`:
  Upstream updated its README, but glitch-soc has a completely different one.
  Kept glitch-soc's README
 2023-08-11 22:15:41 +02:00
github-actions[bot] 3378bdb01f
New Crowdin translations (#2354) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2023-08-11 22:03:11 +02:00
github-actions[bot] 8cbf4a5296
New Crowdin Translations (automated) (#26373) 
Co-authored-by: GitHub Actions <noreply@github.com>
Co-authored-by: Claire <claire.github-309c@sitedethib.com>
 2023-08-10 09:47:42 +02:00
Claire 4caa9f0e69
Change the hashtag column to not display the hashtag header on pinned columns (#26416) 2023-08-09 16:32:40 +02:00
Claire b12d75ef4f
Fix blocking subdomains of an already-blocked domain (#26392) 2023-08-09 09:39:36 +02:00
Claire 8b37dd2c86
Fix Content Security Policy sometimes unnecessarily allowing hCaptcha scripts (#26388) 2023-08-08 15:41:38 +02:00
Claire 2c204d904b
Change `DB_REPLICA_*` environment variables to `REPLICA_DB_*` (#26386) 2023-08-08 13:59:40 +02:00
Eugen Rochko 72423bc8f6
Change account search tokenizer and queries (#26378) 2023-08-08 09:09:14 +02:00
Claire 30c64bf616
Fix list import concurrently creating lists of the same name (#26372) 2023-08-07 17:59:20 +02:00
Claire cd6f2b3cbc
Fix interaction modal layout (#26368) 2023-08-07 17:58:29 +02:00
github-actions[bot] d2dbaba407
New Crowdin Translations (automated) (#26209) 
Co-authored-by: GitHub Actions <noreply@github.com>
Co-authored-by: Claire <claire.github-309c@sitedethib.com>
 2023-08-07 13:37:54 +02:00
Eugen Rochko e325443b02
Change header of hashtag timelines in web UI (#26362) 2023-08-07 09:46:11 +02:00
Claire 79936c584f
Fix report modal secondary buttons style (#26341) 2023-08-04 16:25:44 +02:00
Claire d5bee37c57
Fix missing cached preview cards attributes (#26343) 2023-08-04 16:13:47 +02:00
Claire b59053ff8c
Fix confirmation when closing media edition modal with unsaved changes (#26342) 2023-08-04 15:48:29 +02:00
Trevor Wolf 93372fee1e
Fix light theme select option for hashtags (#26311) 2023-08-04 09:41:17 +02:00
Claire 9405e9af58
Fix incorrect model annotation for List#exclusive (#26313) 2023-08-04 09:00:31 +02:00
Eugen Rochko 04e7efac3f
Change design of hidden media overlay (again) in web UI (#26330) 2023-08-03 20:39:45 +02:00
Eugen Rochko 9d719bcd85
Change reblogs to be excluded from "Posts and replies" tab in web UI (#26302) 2023-08-03 20:39:33 +02:00
CSDUMMI 120f5802c0
Add direct link to the Single-Sign On provider if there is only one sign up method available (#26083) 2023-08-03 16:43:15 +02:00
Claire 3105fef21a
Rename “read” database to “replica” for consistency (#26326) 2023-08-03 16:17:09 +02:00
Christian Schmidt 8da99ffb0d
Add alt text for preview card thumbnails (#26184) 2023-08-03 15:41:51 +02:00
Daniel M Brasil 3a4d3e9d4b
Add `GET /api/v1/instance/languages` to REST API (#24443) 
Co-authored-by: Eugen Rochko <eugen@zeonfederated.com>
Co-authored-by: Claire <claire.github-309c@sitedethib.com>
 2023-08-03 11:25:47 +02:00
Claire 6b896b20cc
Add primary key to preview_cards_statuses join table (includes deduplication migration) (#25243) 2023-08-03 11:12:52 +02:00
Eugen Rochko a0fad5c8bb
Change indexing frequency from 5 minutes to 1 minute, add locks to schedulers (#26304) 2023-08-03 11:04:05 +02:00
Val Lorentz f55f0ab0c3
Allow spaces around commas in ALLOWED_PRIVATE_ADDRESSES (#26297) 2023-08-03 10:05:35 +02:00
Eugen Rochko 2f932cb2bb
Add client-side timeout on resend confirmation button (#26300) 2023-08-03 01:51:10 +02:00
Trevor Wolf 6308dca76a
change column link to add a better keyboard focus indicator (#26278) 2023-08-02 19:33:41 +02:00
Emelia Smith e258b4cb64
Refactor: replace whitelist_mode mentions with limited_federation_mode (#26252) 2023-08-02 19:32:48 +02:00
Christian Schmidt 8891d8945d
Fix request URL normalisation for bare domain and 8-bit characters (#26285) 2023-08-02 19:32:29 +02:00
Eugen Rochko 2cbdff97ce
Change design of role badges in web UI (#26281) 
Co-authored-by: Claire <claire.github-309c@sitedethib.com>
 2023-08-02 17:24:32 +02:00
Eugen Rochko 01f0cffc2c
Fix line clamp for link previews in web UI (#26286) 2023-08-02 04:17:23 +02:00
Eugen Rochko 4c999a736c
Fix wrong border radius on link cards in web UI (#26287) 2023-08-02 01:57:31 +02:00
Christian Schmidt ca342d4838
Add List-Unsubscribe email header (#26085) 2023-08-01 19:34:40 +02:00
Christian Schmidt f2257069b2
Fix AVIF attachments (#26264) 2023-08-01 19:34:11 +02:00
Claire 71fd70335a
Change interaction modal input to disable browser spell-checking, capitalization and autocomplete (#26267) 2023-08-01 17:11:30 +02:00
Claire 6c39125761
Change /api/v1/peers/search to be case-insensitive when using Elasticsearch (#26268) 2023-08-01 14:52:32 +02:00
Christian Schmidt fd284311e7
Do not normalize URL before fetching it (#26219) 2023-07-31 23:17:37 +02:00
Claire d82abc877a
Fix `Importer::BaseImporter#clean_up!` not using proper primary key (#26269) 2023-07-31 11:17:41 +02:00
github-actions[bot] 3b49b5a880
New Crowdin translations (#2348) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2023-07-31 07:44:04 +02:00
Plastikmensch e02510c428
Remove .orig files (#2347) 
Signed-off-by: Plastikmensch <plastikmensch@users.noreply.github.com>
 2023-07-31 07:43:46 +02:00
Claire e96a90480b
Merge pull request #2339 from ClearlyClaire/glitch-soc/merge-upstream 
* Cleanup unused portions of statuses/status partial (#26045)

* Wrong count in response when removing favourite/reblog (#24365)

Co-authored-by: Claire <claire.github-309c@sitedethib.com>

* Paperclip: add support for Azure blob storage (#23607)

* Fix a missing redirection on getting-started in multi column mode (#26070)

* Fix haml-lint Rubocop `Style/NumericPredicate` cop (#26040)

* Change casing for 'Server Settings' string (#26011)

* Move localized subject mailer shared example to separate file (#25889)

* Fix haml-lint Rubocop `Lint/UnusedBlockArguments` cop (#26039)

* Fix `Lint/Void` cop (#25922)

* Add stricter protocol fields validation for accounts (#25937)

* Improve the bug report templates (#25621)

* Fix the crossorigin attribute (#26096)

* Fix replica being used even if not explicitly defined (#26074)

* Clean up unused application records (#24871)

* Change thread view to scroll to the selected post rather than the post being replied to (#24685)

* Change default KeyGenerator digest to SHA1 to fix cookies in rolling upgrades (#26023)

* change focus ui for keyboard only input (#25935)

* Use username as display name for suspended users or users with blank display names (#25276)

* Fix CSP headers being unintendedly wide (#26105)

* Fix linting issue (#26106)

* Replace 'favourite' by 'favorite' for American English (#26009)

* Override default Action Mailer `preview_path` (#26110)

* Favourits -> Favorites (#26109)

* Bump version to v4.1.5 (#26108)

* Fix incorrect connect timeout in outgoing requests (#26116)

* Fix missing translation strings for importing lists (#26120)

* Use valid email address for first account (#26114)

* Update haml-lint 0.49.1 (#26118)

* Fix focus and hover styles in web UI (#26125)

* Remove back button from bookmarks, favourites and lists screens in web UI (#26126)

* Remove 16:9 cropping from web UI (#26132)

* Change design of link previews in web UI (#26136)

* change poll form element colors to fit with the rest of the ui (#26139)

* Add `lang` attribute to trending links (#26111)

* Update dependency rdf-normalize to v0.6.1 (#26130)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>

* Update dependency brakeman to v6.0.1 (#26141)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>

* Update dependency postcss to v8.4.27 (#26144)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>

* Fix unexpected redirection to /explore after sign-in (#26143)

* Update dependency aws-sdk-s3 to v1.131.0 (#26145)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>

* Add report.updated webhook (#24211)

* Fix LinkCrawlWorker crashing on `null` `created_at` (#26151)

* Fix UI Overlap with the loupe icon in the Explore Tab (#26113)

* Fix missing border on error screen in light theme in web UI (#26152)

* Fix missing action label on sensitive videos and embeds in web UI (#26135)

* Fix `lang` for UI texts in link preview (#26149)

* Add published date and author to news on the explore screen in web UI (#26155)

* Coverage for `Auth::OmniauthCallbacks` controller (#26147)

* fix poll input active style (#26162)

* Add `published_at` attribute to preview cards (#26153)

* Update dependency sass to v1.64.1 (#26146)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>

* Revert poll colors to green outside of compose form (#26164)

* Preserve translation on status re-import (#26168)

* Fix missing GIF badge in account gallery (#26166)

* Reformat large text arg in `FetchLinkCardService` spec (#26183)

* Ignore long line in regex initializer (#26182)

* Reformat large key values in service specs (#26181)

* Reformat large hash in `ContextHelper` module (#26180)

* Use heredoc SQL blocks in `AddFromAccountIdToNotifications` migration (#26178)

* Extract private methods in `StatusCacheHydrator` (#26177)

* New Crowdin Translations (automated) (#26072)

Co-authored-by: GitHub Actions <noreply@github.com>
Co-authored-by: Claire <claire.github-309c@sitedethib.com>

* Remove the `sr` locale override .rb files (#25927)

* Use correct naming on controller concern specs (#26197)

* Migrate to request specs in `/api/v2/filters` (#25721)

* Fix wrong filters sometimes applying in streaming (#26159)

* Refactor streaming's filtering logic & improve documentation (#26213)

* Add role badges to the WebUI (#25649)

* Change interaction modal in web UI (#26075)

Co-authored-by: Eugen Rochko <eugen@zeonfederated.com>

* Fix crash when processing Flag activity with no status (#26189)

* Storage: add :azure to remaining callers (#26080)

* Remove queued_at value from pubsub payloads (#26173)

* Fix emoji picker button scrolling with textarea content in single-column view (#25304)

* Change the wording of the dismissable explore prompt (#25917)

* Update dependency haml_lint to v0.49.2 (#26222)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>

* Fix: Streaming server memory leak in HTTP EventSource cleanup (#26228)

* Swap debug statements in streaming server (#26231)

* Fix missing return values in streaming (#26233)

* [Glitch] Wrong count in response when removing favourite/reblog

Port 4c18928a93 to glitch-soc

Co-authored-by: Claire <claire.github-309c@sitedethib.com>
Signed-off-by: Claire <claire.github-309c@sitedethib.com>

* [Glitch] Fix a missing redirection on getting-started in multi column mode

Port 586b1c9dca to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>

* [Glitch] Change thread view to scroll to the selected post rather than the post being replied to

Port e4ea80d808 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>

* [Glitch] Replace 'favourite' by 'favorite' for American English

Port 217ef7f2af to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>

* [Glitch] change poll form element colors to fit with the rest of the ui

Port 80809ef33e to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>

* [Glitch] Add `lang` attribute to trending links

Port 76fce34ebb to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>

* [Glitch] Fix UI Overlap with the loupe icon in the Explore Tab

Port 9a567ec1d1 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>

* [Glitch] Fix missing border on error screen in light theme in web UI

Port d1a9f601c7 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>

* [Glitch] Fix missing action label on sensitive videos and embeds in web UI

Port 714a20697f to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>

* [Glitch] fix poll input active style

Port 49d2e8979f to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>

* [Glitch] Revert poll colors to green outside of compose form

Port ce1f35d7e2 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>

* [Glitch] Add published date and author to news on the explore screen in web UI

Port f826a95f6e to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>

* [Glitch] Preserve translation on status re-import

Port 6781dc6462 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>

* [Glitch] Fix missing GIF badge in account gallery

Port a4b69bec2e to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>

* Fix interaction modal being broken because of glitch-soc's theming system

* [Glitch] Change interaction modal in web UI

Port b4e739ff0f to glitch-soc

Co-authored-by: Eugen Rochko <eugen@zeonfederated.com>
Signed-off-by: Claire <claire.github-309c@sitedethib.com>

* [Glitch] Change the wording of the dismissable explore prompt

Port a4ec187a20 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>

* Fix CSP tests in glitch-soc

---------

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
Co-authored-by: Matt Jankowski <matt@jankowski.online>
Co-authored-by: Christian Schmidt <github@chsc.dk>
Co-authored-by: Misty De Méo <mistydemeo@gmail.com>
Co-authored-by: Stanislas Signoud <signez@stanisoft.net>
Co-authored-by: gunchleoc <fios@foramnagaidhlig.net>
Co-authored-by: Renaud Chaput <renchap@gmail.com>
Co-authored-by: Trevor Wolf <teeerevor@gmail.com>
Co-authored-by: наб <nabijaczleweli@nabijaczleweli.xyz>
Co-authored-by: mogaminsk <mgmnjp@icloud.com>
Co-authored-by: Nick Schonning <nschonni@gmail.com>
Co-authored-by: Eugen Rochko <eugen@zeonfederated.com>
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
Co-authored-by: Vyr Cossont <VyrCossont@users.noreply.github.com>
Co-authored-by: gol-cha <info@mevo.xyz>
Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
Co-authored-by: GitHub Actions <noreply@github.com>
Co-authored-by: Daniel M Brasil <danielmbrasil@protonmail.com>
Co-authored-by: Emelia Smith <ThisIsMissEm@users.noreply.github.com>
 2023-07-30 21:35:47 +02:00
Plastikmensch ebfa184e74
Port search popout changes from upstream (#2333) 
* [Glitch] Change search pop-out in web UI

Port 2b11376411 to glitch-soc

Signed-off-by: Plastikmensch <plastikmensch@users.noreply.github.com>

* [Glitch] Change logo version in header based on screen size in web UI

Port remaining change from 6028d047b9 to glitch-soc

Signed-off-by: Plastikmensch <plastikmensch@users.noreply.github.com>

* Rename `hashtags.js` to `hashtags.ts` and apply code style changes

Apply changes from e38b391940 (rename to ts), 51b83ed195 (code style change), 73b64b8917 (additional code style change)

Signed-off-by: Plastikmensch <plastikmensch@users.noreply.github.com>

* Remove strings for old search

Signed-off-by: Plastikmensch <plastikmensch@users.noreply.github.com>

---------

Signed-off-by: Plastikmensch <plastikmensch@users.noreply.github.com>
 2023-07-30 18:42:35 +02:00
Claire 403a5c0f3f [Glitch] Change the wording of the dismissable explore prompt 
Port a4ec187a20 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2023-07-30 17:01:29 +02:00
Claire aa1789f0dd [Glitch] Change interaction modal in web UI 
Port b4e739ff0f to glitch-soc

Co-authored-by: Eugen Rochko <eugen@zeonfederated.com>
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2023-07-30 16:59:32 +02:00
Claire a1f1424e76 Fix interaction modal being broken because of glitch-soc's theming system 2023-07-30 16:45:50 +02:00
Claire 92fa9d34b0 Merge commit '3554c527954441fd924586a49c7d99a89101ac7e' into glitch-soc/merge-upstream 
Conflicts:
- `app/controllers/authorize_interactions_controller.rb`:
  Small conflict due to our theming system.
- `streaming/index.js`:
  Upstream refactored part of the streaming server.
  We had some extra logic for handling local-only posts.
  Applied the refactor.
 2023-07-30 16:11:55 +02:00
Christian Schmidt 879c7ed2d3 [Glitch] Fix missing GIF badge in account gallery 
Port a4b69bec2e to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2023-07-30 15:58:20 +02:00
Christian Schmidt 88ba538aad [Glitch] Preserve translation on status re-import 
Port 6781dc6462 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2023-07-30 15:57:45 +02:00
Claire 454d8567d4 Merge commit '1814990a3d117555153321216fa593e4d9e84de3' into glitch-soc/merge-upstream 2023-07-30 15:54:34 +02:00
Eugen Rochko 450f75b6f7 [Glitch] Add published date and author to news on the explore screen in web UI 
Port f826a95f6e to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2023-07-30 15:50:53 +02:00
Claire 887a17bb83 [Glitch] Revert poll colors to green outside of compose form 
Port ce1f35d7e2 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2023-07-30 15:50:53 +02:00
Trevor Wolf e92dde0b16 [Glitch] fix poll input active style 
Port 49d2e8979f to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2023-07-30 15:50:53 +02:00
Eugen Rochko e48a6a5f2c [Glitch] Fix missing action label on sensitive videos and embeds in web UI 
Port 714a20697f to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2023-07-30 15:50:53 +02:00
Eugen Rochko 4b26e44ef4 [Glitch] Fix missing border on error screen in light theme in web UI 
Port d1a9f601c7 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2023-07-30 15:23:08 +02:00
gol-cha 168fadb6b9 [Glitch] Fix UI Overlap with the loupe icon in the Explore Tab 
Port 9a567ec1d1 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2023-07-30 15:22:28 +02:00
Christian Schmidt 1d4df97049 [Glitch] Add `lang` attribute to trending links 
Port 76fce34ebb to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2023-07-30 15:18:40 +02:00
Trevor Wolf f3bd96c91c [Glitch] change poll form element colors to fit with the rest of the ui 
Port 80809ef33e to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2023-07-30 15:18:07 +02:00
Claire bd349cb850 Merge commit 'ce1f35d7e213327549b960bb64f63c67a141ea40' into glitch-soc/merge-upstream 
Conflicts:
- `db/schema.rb`:
  Upstream regenerated the schema file using Rails 7, the conflicts are
  caused by our extra columns.
  Applied upstream's changes, but keeping our extra columns.
 2023-07-30 14:58:56 +02:00
gunchleoc 09ebf7e37c [Glitch] Replace 'favourite' by 'favorite' for American English 
Port 217ef7f2af to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2023-07-30 14:44:36 +02:00
Claire b2515feb29 Merge commit 'cfd50f30bb5dda4dd90e1ad01f3e62c99135c36f' into glitch-soc/merge-upstream 2023-07-30 14:33:28 +02:00
Claire 5914dfdd69 [Glitch] Change thread view to scroll to the selected post rather than the post being replied to 
Port e4ea80d808 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2023-07-30 14:26:52 +02:00
Claire 42f36aa55a Merge commit '5b457961fc1189a71599dc6c06b3f159b195a455' into glitch-soc/merge-upstream 
Conflicts:
- `config/initializers/content_security_policy.rb`:
  Upstream fixed an issue that was not present in glitch-soc.
  Kept our version.
 2023-07-30 13:49:35 +02:00
Claire 7635c67450 Merge commit '144a406d332b034caa812ade2629df03ed4898d7' into glitch-soc/merge-upstream 
Conflicts:
- `app/views/layouts/application.html.haml`:
  Upstream removed the `crossorigin` attribute from `preload_pack_asset`.
  Glitch-soc had different calls to `preload_pack_asset` because of the
  different theming system.
  Ported the change.
- `app/views/layouts/embedded.html.haml`:
  Upstream removed the `crossorigin` attribute from `preload_pack_asset`.
  Glitch-soc had different calls to `preload_pack_asset` because of the
  different theming system.
  Ported the change.
 2023-07-30 13:42:06 +02:00
Stanislas Signoud f05effeb8f [Glitch] Fix a missing redirection on getting-started in multi column mode 
Port 586b1c9dca to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2023-07-30 13:32:16 +02:00
Christian Schmidt d3d6147286 [Glitch] Wrong count in response when removing favourite/reblog 
Port 4c18928a93 to glitch-soc

Co-authored-by: Claire <claire.github-309c@sitedethib.com>
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2023-07-30 13:31:41 +02:00
Claire 993d0a9950 Merge commit '1e3b19230a48174acf524cf1a9f5a498e220ea7d' into glitch-soc/merge-upstream 
Conflicts:
- `app/models/account.rb`:
  Upstream added new validations close to lines on which glitch-soc had
  modified validations to handle custom limits set through environment
  variables.
  Ported upstream changes.
- `config/initializers/content_security_policy.rb`:
  Upstream added `AZURE_ALIAS_HOST`. Glitch-soc's version of the file is
  completely different.
  Added `AZURE_ALIAS_HOST` to our version of the file.
 2023-07-30 13:15:01 +02:00
github-actions[bot] 3a14104411
New Crowdin translations (#2338) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2023-07-30 13:09:02 +02:00
Eugen Rochko d4807a5e64
Change aspect ratios on link previews in web UI (#26250) 2023-07-30 03:35:17 +02:00
Plastikmensch 4d3a129212
Fix public TL not indicating new toots when `onlyRemote` is enabled (#26247) 
Signed-off-by: Plastikmensch <plastikmensch@users.noreply.github.com>
 2023-07-29 20:18:38 +02:00
Plastikmensch 1cc3fcf7d0
Fix Public TL not indicating new toots when `onlyRemote` or `allowLocalOnly` is enabled (#2336) 
Signed-off-by: Plastikmensch <plastikmensch@users.noreply.github.com>
 2023-07-29 16:45:37 +02:00
Plastikmensch feaf3cf780
Fix firehose not indicating new toots in "All" (#2335) 
When "Show local-only toots in All" is enabled, the column never indicated there are new toots, since `hasUnread` was always false.

Signed-off-by: Plastikmensch <plastikmensch@users.noreply.github.com>
 2023-07-29 08:37:29 +02:00
Matt Jankowski 660993b415
Add coverage for `URLValidator` (#25591) 2023-07-28 23:12:25 +02:00
Matt Jankowski 6602edf064
Add coverage for `LanguageValidator` (#25593) 2023-07-28 23:12:09 +02:00
Matt Jankowski 30f5ec7303
Rubocop fix: `Perfomance/UnfreezeString` (#26217) 2023-07-28 23:11:05 +02:00
gunchleoc b0134db6ff
Allow filtering for Chinese languages (#26066) 2023-07-28 23:07:22 +02:00
Christian Schmidt f96e4b3047
Use original URL in preview if it redirects to 4xx page (#26200) 2023-07-28 23:02:08 +02:00
Plastikmensch e69fe94669
Fix "All" live feed not loading automatically. (#2332) 
The dispatch to expand the timeline was missing the `allowLocalOnly` param.

Signed-off-by: Plastikmensch <plastikmensch@users.noreply.github.com>
 2023-07-27 19:25:55 +02:00
github-actions[bot] 8864d5b580
New Crowdin translations (#2327) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2023-07-27 19:25:29 +02:00
Claire 6256cee034
Change error boundary to upstream's (#2323) 2023-07-27 19:25:07 +02:00
Claire a4ec187a20
Change the wording of the dismissable explore prompt (#25917) 2023-07-27 16:51:02 +02:00
Claire bbea052935
Fix emoji picker button scrolling with textarea content in single-column view (#25304) 2023-07-27 16:20:33 +02:00
Emelia Smith 317cd26fba
Remove queued_at value from pubsub payloads (#26173) 2023-07-27 16:19:33 +02:00
Misty De Méo 12a6cf569e
Storage: add :azure to remaining callers (#26080) 2023-07-27 16:13:45 +02:00
Claire 6c3c5bbbc3
Fix crash when processing Flag activity with no status (#26189) 2023-07-27 16:11:56 +02:00
Claire b4e739ff0f
Change interaction modal in web UI (#26075) 
Co-authored-by: Eugen Rochko <eugen@zeonfederated.com>
 2023-07-27 16:11:17 +02:00
Claire 1e4ccc655a
Add role badges to the WebUI (#25649) 2023-07-27 16:05:24 +02:00
github-actions[bot] b9adea9695
New Crowdin Translations (automated) (#26072) 
Co-authored-by: GitHub Actions <noreply@github.com>
Co-authored-by: Claire <claire.github-309c@sitedethib.com>
 2023-07-26 13:46:16 +02:00
Matt Jankowski 84d520ee80
Extract private methods in `StatusCacheHydrator` (#26177) 2023-07-26 09:50:48 +02:00
Matt Jankowski 8ac5a93a7d
Reformat large hash in `ContextHelper` module (#26180) 2023-07-26 09:46:11 +02:00
Christian Schmidt a4b69bec2e
Fix missing GIF badge in account gallery (#26166) 2023-07-26 03:33:31 +02:00
Christian Schmidt 6781dc6462
Preserve translation on status re-import (#26168) 2023-07-25 20:29:31 +02:00
Claire ce1f35d7e2
Revert poll colors to green outside of compose form (#26164) 2023-07-25 15:32:59 +02:00
Eugen Rochko 7bd8ef355c
Add `published_at` attribute to preview cards (#26153) 2023-07-25 13:40:35 +02:00
Trevor Wolf 49d2e8979f
fix poll input active style (#26162) 2023-07-25 13:39:15 +02:00
Matt Jankowski 50ff3d3342
Coverage for `Auth::OmniauthCallbacks` controller (#26147) 2023-07-25 09:46:57 +02:00
Eugen Rochko f826a95f6e
Add published date and author to news on the explore screen in web UI (#26155) 2023-07-25 00:57:15 +02:00
Christian Schmidt 4299208487
Fix `lang` for UI texts in link preview (#26149) 2023-07-24 23:01:31 +02:00
Eugen Rochko 714a20697f
Fix missing action label on sensitive videos and embeds in web UI (#26135) 2023-07-24 22:04:38 +02:00
Eugen Rochko d1a9f601c7
Fix missing border on error screen in light theme in web UI (#26152) 2023-07-24 19:53:33 +02:00
gol-cha 9a567ec1d1
Fix UI Overlap with the loupe icon in the Explore Tab (#26113) 2023-07-24 17:56:20 +02:00
Claire 2dfa8f797a
Fix LinkCrawlWorker crashing on `null` `created_at` (#26151) 2023-07-24 17:55:36 +02:00
Vyr Cossont 394d1f19b1
Add report.updated webhook (#24211) 2023-07-24 17:37:38 +02:00
Claire b629e21515
Fix unexpected redirection to /explore after sign-in (#26143) 2023-07-24 16:06:32 +02:00
Christian Schmidt 76fce34ebb
Add `lang` attribute to trending links (#26111) 2023-07-24 13:48:23 +02:00
Trevor Wolf 80809ef33e
change poll form element colors to fit with the rest of the ui (#26139) 2023-07-24 13:48:09 +02:00
Eugen Rochko 6b2952d1dd
Change design of link previews in web UI (#26136) 2023-07-24 13:47:28 +02:00
Eugen Rochko 4d01d1a1ee
Remove 16:9 cropping from web UI (#26132) 2023-07-24 13:46:55 +02:00
Plastikmensch cf9affdeac
Apply padding to all notifications in notif-cleaning mode (#2325) 
* Add missing padding to notif-cleaning for admin-sign-up

Signed-off-by: Plastikmensch <plastikmensch@users.noreply.github.com>

* Apply padding to all notification types instead

Signed-off-by: Plastikmensch <plastikmensch@users.noreply.github.com>

---------

Signed-off-by: Plastikmensch <plastikmensch@users.noreply.github.com>
 2023-07-23 18:50:24 +02:00
Eugen Rochko 5e8cbb5f82
Remove back button from bookmarks, favourites and lists screens in web UI (#26126) 2023-07-23 17:55:20 +02:00
Eugen Rochko cfd50f30bb
Fix focus and hover styles in web UI (#26125) 2023-07-23 17:55:13 +02:00
Nick Schonning 67016dd29d
Update haml-lint 0.49.1 (#26118) 2023-07-23 17:48:16 +02:00
Plastikmensch 51311c1978
Fix CW icon being on wrong side in app settings in RTL languages (#2324) 
Signed-off-by: Plastikmensch <plastikmensch@users.noreply.github.com>
 2023-07-23 17:19:09 +02:00
Jeong Arm 944c29033d
Fix relationship-tag background color (#2322) 2023-07-23 14:40:37 +02:00
github-actions[bot] 9ec43107f2
New Crowdin translations (#2319) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2023-07-23 14:31:38 +02:00
Claire 49767d20bd
Fix glitch local settings navigation items not being proper buttons (#2320) 2023-07-23 14:31:16 +02:00
Claire dd09535bda
Annotate doodle parameters to please eslint (#2321) 2023-07-23 14:31:05 +02:00
Claire 0078e7e760
Fix incorrect connect timeout in outgoing requests (#26116) 2023-07-22 20:42:31 +02:00
Claire 52500965cc
Fix “Open in advanced web interface” being shown on mobile view (#2318) 
Fixes #2307
 2023-07-22 17:22:04 +02:00
github-actions[bot] 9a45198ab0
New Crowdin translations (#2317) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2023-07-22 09:53:26 +02:00
наб 1b4cf0eba0
Favourits -> Favorites (#26109) 2023-07-21 21:13:20 +02:00
gunchleoc 217ef7f2af
Replace 'favourite' by 'favorite' for American English (#26009) 2023-07-21 19:09:13 +02:00
Claire 14fad60384
Use username as display name for suspended users or users with blank display names (#25276) 2023-07-21 13:20:53 +02:00
Trevor Wolf 59478a1b46
change focus ui for keyboard only input (#25935) 2023-07-21 13:20:14 +02:00
Claire e4ea80d808
Change thread view to scroll to the selected post rather than the post being replied to (#24685) 2023-07-21 13:14:30 +02:00
Claire 144a406d33
Clean up unused application records (#24871) 2023-07-21 13:13:16 +02:00
Claire 5cbc402687
Fix replica being used even if not explicitly defined (#26074) 2023-07-21 11:30:53 +02:00
Renaud Chaput 42698b4c5c
Fix the crossorigin attribute (#26096) 2023-07-21 11:14:26 +02:00
github-actions[bot] e7cb6c6c44
New Crowdin translations (#2314) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2023-07-21 09:26:08 +02:00
Claire 1e3b19230a
Add stricter protocol fields validation for accounts (#25937) 2023-07-20 18:23:48 +02:00
Matt Jankowski a5842df123
Fix haml-lint Rubocop `Lint/UnusedBlockArguments` cop (#26039) 2023-07-20 17:03:39 +02:00
Matt Jankowski df05ece265
Fix haml-lint Rubocop `Style/NumericPredicate` cop (#26040) 2023-07-20 15:13:06 +02:00
Stanislas Signoud 586b1c9dca
Fix a missing redirection on getting-started in multi column mode (#26070) 2023-07-20 14:46:02 +02:00
Misty De Méo b848ba3867
Paperclip: add support for Azure blob storage (#23607) 2023-07-19 09:02:49 +02:00
Christian Schmidt 4c18928a93
Wrong count in response when removing favourite/reblog (#24365) 
Co-authored-by: Claire <claire.github-309c@sitedethib.com>
 2023-07-19 09:02:30 +02:00
Matt Jankowski 6edd404482
Cleanup unused portions of statuses/status partial (#26045) 2023-07-19 08:44:16 +02:00
Claire 0092fe50ac Merge branch 'main' into glitch-soc/merge-upstream 
Conflicts:
- `.github/workflows/build-image.yml`:
  Upstream entirely refactored this, while we changed the docker repository
  to upload to and disabled the “latest” tag.
  Applied the repository change to `.github/workflows/build-*.yml`, as well
  as disabling native ARMv64 builds.
- `README.md`:
  We have a completely different README.
  Kept ours.
- `app/views/admin/settings/shared/_links.html.haml`:
  Upstream refactored, we had an extra item.
  Refactored as upstream did.
- `spec/controllers/api/v1/timelines/public_controller_spec.rb`:
  Upstream deleted this file, to be replaced by a request spec at
  `spec/requests/api/v1/timelines/public_spec.rb`.
  We had an extra bit about enabling the public timelines because we have
  different defaults than upstream.
  Moved that bit to `spec/requests/api/v1/timelines/public_spec.rb`
 2023-07-19 07:35:51 +02:00
Claire 111686c38b
New Crowdin updates (#2306) 
* New translations en.json (French)
[ci skip]

* New translations en.json (Spanish)
[ci skip]

* New translations en.json (Afrikaans)
[ci skip]

* New translations en.json (Arabic)
[ci skip]

* New translations en.json (Czech)
[ci skip]

* New translations en.json (German)
[ci skip]

* New translations en.json (Irish)
[ci skip]

* New translations en.json (Japanese)
[ci skip]

* New translations en.json (Georgian)
[ci skip]

* New translations en.json (Korean)
[ci skip]

* New translations en.json (Lithuanian)
[ci skip]

* New translations en.json (Macedonian)
[ci skip]

* New translations en.json (Punjabi)
[ci skip]

* New translations en.json (Polish)
[ci skip]

* New translations en.json (Turkish)
[ci skip]

* New translations en.json (Ukrainian)
[ci skip]

* New translations en.json (Chinese Simplified)
[ci skip]

* New translations en.json (Chinese Traditional)
[ci skip]

* New translations en.json (Urdu (Pakistan))
[ci skip]

* New translations en.json (Portuguese, Brazilian)
[ci skip]

* New translations en.json (Persian)
[ci skip]

* New translations en.json (Tamil)
[ci skip]

* New translations en.json (Spanish, Argentina)
[ci skip]

* New translations en.json (Spanish, Mexico)
[ci skip]

* New translations en.json (Bengali)
[ci skip]

* New translations en.json (Marathi)
[ci skip]

* New translations en.json (Croatian)
[ci skip]

* New translations en.json (Kazakh)
[ci skip]

* New translations en.json (Telugu)
[ci skip]

* New translations en.json (English, United Kingdom)
[ci skip]

* New translations en.json (Esperanto)
[ci skip]

* New translations en.json (Uyghur)
[ci skip]

* New translations en.json (Tatar)
[ci skip]

* New translations en.json (Malayalam)
[ci skip]

* New translations en.json (Latin)
[ci skip]

* New translations en.json (Bosnian)
[ci skip]

* New translations en.json (French, Quebec)
[ci skip]

* New translations en.json (Cornish)
[ci skip]

* New translations en.json (Kannada)
[ci skip]

* New translations en.json (Occitan)
[ci skip]

* New translations en.json (Igbo)
[ci skip]

* New translations en.json (Sardinian)
[ci skip]

* New translations en.json (Kabyle)
[ci skip]

* New translations en.yml (Spanish)
[ci skip]

* New translations en.yml (Italian)
[ci skip]

* New translations en.yml (Norwegian)
[ci skip]

* New translations en.yml (Ukrainian)
[ci skip]

* New translations en.yml (Chinese Simplified)
[ci skip]

* New translations en.yml (Spanish, Argentina)
[ci skip]

* New translations en.yml (Spanish, Mexico)
[ci skip]

* New translations en.yml (Esperanto)
[ci skip]

* New translations simple_form.en.yml (French)
[ci skip]

* New translations simple_form.en.yml (Spanish)
[ci skip]

* New translations simple_form.en.yml (Czech)
[ci skip]

* New translations simple_form.en.yml (German)
[ci skip]

* New translations simple_form.en.yml (Italian)
[ci skip]

* New translations simple_form.en.yml (Korean)
[ci skip]

* New translations simple_form.en.yml (Norwegian)
[ci skip]

* New translations simple_form.en.yml (Polish)
[ci skip]

* New translations simple_form.en.yml (Ukrainian)
[ci skip]

* New translations simple_form.en.yml (Chinese Simplified)
[ci skip]

* New translations simple_form.en.yml (Portuguese, Brazilian)
[ci skip]

* New translations simple_form.en.yml (Spanish, Argentina)
[ci skip]

* New translations simple_form.en.yml (Spanish, Mexico)
[ci skip]

* New translations simple_form.en.yml (French, Quebec)
[ci skip]

* New translations en.json (Polish)
[ci skip]

* New translations en.json (Spanish, Argentina)
[ci skip]

* New translations en.yml (Spanish, Argentina)
[ci skip]
 2023-07-19 07:05:33 +02:00
github-actions[bot] 47832a1ac0
New Crowdin Translations (automated) (#26054) 
Co-authored-by: renchap <renchap@users.noreply.github.com>
Co-authored-by: Claire <claire.github-309c@sitedethib.com>
 2023-07-18 21:13:25 +02:00
Claire ff41e5426a
Change request timeout handling to use a longer deadline (#26055) 2023-07-18 20:51:20 +02:00
Matt Jankowski 6657695ec6
Fix haml-lint `InstanceVariables` rule for auth/registrations/edit (#26061) 2023-07-18 18:10:52 +02:00
Matt Jankowski f6dda59e5d
Fix haml-lint Rubocop `Style/SymbolProc` cop (#26059) 2023-07-18 17:43:04 +02:00
Matt Jankowski 39d9804119
Fix haml-lint Rubocop `Style/WordArray` cop (#26058) 2023-07-18 17:25:41 +02:00
Matt Jankowski b3f48089e6
Fix haml-lint rubocop style negation cops (#26057) 2023-07-18 17:02:02 +02:00
Matt Jankowski e663e6d2c2
Fix haml-lint `ConsecutiveSilentScripts` rule (#26043) 2023-07-18 09:25:37 +02:00
Claire 0c45bed333 [Glitch] Fix “Back” button sometimes redirecting out of Mastodon 
Port a442a1d1c6 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2023-07-17 19:12:09 +02:00
Claire c04f2d0cf7 Merge branch 'main' into glitch-soc/merge-upstream 
Conflicts:
- `app/views/admin/settings/appearance/show.html.haml`:
  Upstream enforced an uniform code style around lambdas, and glitch-soc
  had a different lambda due to its theming system.
  Applied the same code style changes.
- `app/views/settings/preferences/appearance/show.html.haml`:
  Upstream enforced an uniform code style around lambdas, and glitch-soc
  removed some code just after the lambda.
  Applied the same code style changes.
 2023-07-17 19:02:23 +02:00
Matt Jankowski 4207c95d4f
Fix haml-lint Rubocop `Style/SlicingWithRange` cop (#25947) 2023-07-17 18:18:13 +02:00
Claire a442a1d1c6
Fix “Back” button sometimes redirecting out of Mastodon (#25281) 2023-07-17 17:32:46 +02:00
Matt Jankowski d0f00206dc
Fix haml-lint Rubocop `Style/StringLiterals` cop (#25948) 2023-07-17 16:57:18 +02:00
Jeong Arm 664b0ca8cb
Check if json body is null on Activitipub::ProcessingWorker (#26021) 2023-07-17 15:51:30 +02:00
Matt Jankowski bd33efdf16
Fix haml-lint Rubocop `Style/MinMaxComparison` cop (#25974) 2023-07-17 15:38:04 +02:00
Matt Jankowski 361dd43235
Fix haml-lint Rubocop `lambda` cop (#25946) 2023-07-17 15:07:29 +02:00
Matt Jankowski 5096deb818
Fix haml lint Rubocop `Style/RedundantStringCoercion` cop (#25975) 2023-07-17 14:08:56 +02:00
Claire 943f27f437
Remove unfollowed hashtag posts from home feed (#26028) 2023-07-17 13:56:28 +02:00
Michael Stanclift 12e7f5fabd [Glitch] Fix for "follows you" indicator in light web UI not readable 
Port 97ce47e451 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2023-07-17 13:01:47 +02:00
Terence Eden 27f7e5b0f3 [Glitch] Prevent split line between icon and number on reposts & favourites 
Port b923a4c755 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2023-07-17 13:01:07 +02:00
Claire c943f17b1b Merge branch 'main' into glitch-soc/merge-upstream 2023-07-17 12:52:15 +02:00
Claire c667fc5a4a
Fix ArgumentError in mailers when a user's timezone is blank (#26025) 2023-07-17 12:10:50 +02:00
Michael Stanclift 97ce47e451
Fix for "follows you" indicator in light web UI not readable (#25993) 2023-07-17 11:51:00 +02:00
Eugen Rochko 26e522ac55
Fix not actually connecting to the configured replica (#25977) 2023-07-17 08:26:52 +02:00
Claire 23197cebce
Reduce dropdown menu margin and padding (#2301) 
* Reduce dropdown menu margin and padding

* Change horizontal padding back to what it was

* Reduce separator vertical margins for consistency
 2023-07-16 18:23:07 +02:00
Terence Eden b923a4c755
Prevent split line between icon and number on reposts & favourites (#26004) 2023-07-16 10:06:33 +02:00
Claire c45a965bf7 [Glitch] Change “About” and “Privacy policy” links to open in a new tab in advanced interface 
Port 71db616fed to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2023-07-14 13:01:31 +02:00
Stanislas Signoud 9bd012b7cb [Glitch] Change links in multi-column mode so tabs are open in single-column mode 
Port 5fad7bd58a to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2023-07-14 13:01:31 +02:00
Claire 0d61985713 Remove layout glitch-soc settings 2023-07-14 13:01:31 +02:00
Eugen Rochko f0d3267fbf [Glitch] Fix dropdowns being disabled for logged out users in web UI 
Port a8edbcf963 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2023-07-14 13:01:31 +02:00
Claire a98b5c2246 [Glitch] Fix embed dropdown menu item for unauthenticated users 
Port 41f65edb21 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2023-07-13 22:42:15 +02:00
Claire d9adda1a99 Merge commit '71db616fed817893d0efa363f0e7dbfcf23866a0' into glitch-soc/merge-upstream 2023-07-13 22:40:15 +02:00
Plastikmensch 470ded3687
Fix notifications not loading when slow mode active (#2292) 
When slow mode is enabled, clicking a notification filter when a new notification was received will render an empty column.

This change has been missed in e91bf82083

Signed-off-by: Plastikmensch <plastikmensch@users.noreply.github.com>
 2023-07-13 21:36:15 +02:00
Claire e271d018b7 Fix home timeline's regexp field 2023-07-13 19:33:58 +02:00
Claire 71db616fed
Change “About” and “Privacy policy” links to open in a new tab in advanced interface (#25973) 2023-07-13 17:59:15 +02:00
Stanislas Signoud 5fad7bd58a
Change links in multi-column mode so tabs are open in single-column mode (#25893) 2023-07-13 17:18:09 +02:00
Claire 41f65edb21
Fix embed dropdown menu item for unauthenticated users (#25964) 2023-07-13 15:53:03 +02:00
Matt Jankowski 644c5fddd8
Refactor `Status.tagged_with_all` for brakeman SQL injection warning (#25941) 2023-07-13 15:52:37 +02:00
Claire 98e5589ed4 [Glitch] Fix follow link style in embeds 
Port 5a3f174d56 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2023-07-13 14:52:36 +02:00
Renaud Chaput 18f55567b0 [Glitch] Upgrade to `typescript-eslint` v6 
Port a7253075d1 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2023-07-13 14:51:24 +02:00
Claire 3be4f4266d Fix incorrect types in DisplayName 2023-07-13 14:51:24 +02:00
Claire 25571b18ed Merge commit '5a3f174d561cbdc79a597cd2b9502ed058d372da' into glitch-soc/merge-upstream 2023-07-13 14:22:20 +02:00
Renaud Chaput 447ab7ab24 [Glitch] Convert Home timeline components to Typescript 
Port a75138d073 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2023-07-13 14:21:08 +02:00
Claire 177497b367 Merge commit '3ed9b55cb3987e3d32c56f857cb6903ca8bec3d4' into glitch-soc/merge-upstream 2023-07-13 14:02:28 +02:00
Claire 0870c7c95e [Glitch] Upgrade to Prettier 3 
Port 73b64b8917 to glitch-soc
 2023-07-13 14:01:40 +02:00
Claire 95a1fde6b6 Merge commit '73b64b89170cb72854a1709186c62ce31f476889' into glitch-soc/merge-upstream 
Conflicts:
- `app/javascript/styles/fonts/roboto-mono.scss`:
  Upstream updated the linter, which changed a few linter rules.
  Some of those changed lines are different in glitch-soc because we use
  different paths for the assets.
  Applied the same style rules on our version of the file.
- `app/javascript/styles/fonts/roboto.scss`:
  Upstream updated the linter, which changed a few linter rules.
  Some of those changed lines are different in glitch-soc because we use
  different paths for the assets.
  Applied the same style rules on our version of the file.
 2023-07-13 13:49:58 +02:00
Claire 2d09653d50 Merge commit '0d7340380cf3094335d8bc67f7c465e2b154566a' into glitch-soc/merge-upstream 
Conflicts:
- app/controllers/application_controller.rb:
  Upstream added an `include` where we had an extra `include` due to
  glitch-soc's theming system.
  Added upstream's new `include`.
 2023-07-13 13:35:15 +02:00
Claire 5a3f174d56
Fix follow link style in embeds (#25965) 2023-07-13 12:58:56 +02:00
Renaud Chaput a7253075d1
Upgrade to `typescript-eslint` v6 (#25904) 2023-07-13 11:49:16 +02:00
renovate[bot] 3ed9b55cb3
Update dependency rubocop-rails to v2.20.1 (#25493) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
Co-authored-by: Renaud Chaput <renchap@gmail.com>
 2023-07-13 11:44:02 +02:00
Renaud Chaput a75138d073
Convert Home timeline components to Typescript (#25583) 2023-07-13 11:28:55 +02:00
Renaud Chaput 73b64b8917
Upgrade to Prettier 3 (#25902) 2023-07-13 11:26:45 +02:00
Michael Stanclift 063482a63f
Fix trending publishers table not rendering correctly on narrow screens (#25945) 2023-07-13 11:12:51 +02:00
Nick Schonning 1a6c2e450a
Update rubocop to v1.54.1 (#25627) 2023-07-13 11:11:55 +02:00
Matt Jankowski ce43ed144c
Rails 7.0 update (#25668) 2023-07-13 09:36:07 +02:00
Claire c2bfbf53a1 Fix various CSS issues 2023-07-12 19:13:31 +02:00
Eugen Rochko 8d0c69529a
Change markers API to use a replica (#25851) 2023-07-12 18:57:40 +02:00
Eugen Rochko fdc3ff7c2d
Change notifications API to use a replica (#25874) 2023-07-12 17:06:00 +02:00
Claire 9ae60f8738 Merge commit '82e477b184b5666fff7fb55933dce22ca2925db8' into glitch-soc/merge-upstream 
Conflicts:
- `db/migrate/20180831171112_create_bookmarks.rb`:
  Upstream ran a lint fix on this file, but this file is different in
  glitch-soc because the feature was added much earlier.
  Ran the lint fix on our own version of the file.
 2023-07-12 16:03:05 +02:00
Stanislas Signoud ec95f62cb4 [Glitch] Fix sounds not being loaded from assets host 
Port 1392f31ed8 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2023-07-12 16:00:20 +02:00
Claire 2aadebc769 Merge commit '8e0fd2d619dac93c193da6a762564244e5622498' into glitch-soc/merge-upstream 
Conflicts:
- `.github/workflows/build-image.yml`:
  Upstream changed how releases are tagged, we don't have releases.
  Ignored the changes
 2023-07-12 15:54:58 +02:00
Trevor Wolf 15f6fa8d47 [Glitch] fix buttons showing inconsistent styles 
Port ea10febd25 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2023-07-12 15:50:56 +02:00
Claire c3af91ce48 [Glitch] Fix filters not applying to explore tab 
Port af54bf52c8 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2023-07-12 15:48:13 +02:00
Claire c699dc0908 [Glitch] Add `forward_to_domains` parameter to `POST /api/v1/reports` 
Port c27b82a437 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2023-07-12 15:47:43 +02:00
Claire 075887e1d6 Merge commit 'ea10febd257b5b729a50aeb3218389763f5f4b97' into glitch-soc/merge-upstream 2023-07-12 15:44:33 +02:00
Eugen Rochko 71f8c45c18 [Glitch] Change label and design of sensitive and unavailable media in web UI 
Port 338a0e70cc to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2023-07-12 15:43:10 +02:00
Claire dd0002e1fe Merge commit '610cf6c3713e414995ea1a57110db400ccb88dd2' into glitch-soc/merge-upstream 
Conflicts:
- `app/models/trends.rb`:
  Conflict due to glitch-soc's code splitting trends mailing depending on type.
  Ported upstream's changes.
 2023-07-12 15:38:35 +02:00
Eugen Rochko c250b37f0a [Glitch] Fix explore page being inaccessible when opted-out of trends in web UI 
Port ceeb2b8c41 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2023-07-12 15:34:12 +02:00
Claire 82eebd0482 Merge commit '41a505513fb36f7c28c8d8a4270d5ee192169462' into glitch-soc/merge-upstream 
Conflicts:
- `app/serializers/initial_state_serializer.rb`:
  Upstream renamed an initial state parameter, where we had extra ones.
  Renamed as upstream did.
- `app/workers/feed_insert_worker.rb`:
  Upstream wrapped database query in a block, we had extra database
  queries because of the DM timeline.
  Moved everything in the block.
 2023-07-12 15:27:32 +02:00
fusagiko / takayamaki 9e311f95aa [Glitch] simplify counters 
Port e0d230fb37 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2023-07-12 15:18:41 +02:00
alfe 5b9e43187c [Glitch] Rewrite `<ShortNumber />` as FC and TS 
Port 20e85c0e83 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2023-07-12 15:17:18 +02:00
Renaud Chaput 55ea79165a [Glitch] Convert `<DismissableBanner>` to Typescript 
Port 4534498a8e to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2023-07-12 15:09:14 +02:00
Renaud Chaput 0bfa4a990f [Glitch] Fix translate button position 
Port 9f078e238d to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2023-07-12 15:05:24 +02:00
Claire 7e54a30f06 Merge commit '4534498a8e43f59980ee56e9938efab8580c78c8' into glitch-soc/merge-upstream 2023-07-12 15:00:41 +02:00
Claire 67055b0343
Fix import order inconsistencies (#2289) 2023-07-12 15:00:10 +02:00
Matt Jankowski 1ef014802b
Refactor `Trends::Query` to avoid brakeman sql injection warnings (#25881) 2023-07-12 14:19:20 +02:00
Renaud Chaput ecd8e0d612
Update Stylelint (#25819) 2023-07-12 12:31:23 +02:00
Matt Jankowski 2e1391fdd2
Fix `Naming/MemoizedInstanceVariableName` cop (#25928) 2023-07-12 10:08:51 +02:00
Matt Jankowski 5134fc65e2
Fix `Naming/AccessorMethodName` cop (#25924) 2023-07-12 10:03:19 +02:00
Matt Jankowski b8b2470cf8
Fix `Style/SlicingWithRange` cop (#25923) 2023-07-12 10:03:06 +02:00
Nick Schonning 1d557305d2
Enable Rubocop Style/FrozenStringLiteralComment (#23793) 2023-07-12 09:47:08 +02:00
Stanislas Signoud 1392f31ed8
Fix sounds not being loaded from assets host (#25931) 2023-07-12 03:02:32 +02:00
Stanislas Signoud ca955ada0b
Use invariant colors on notification toasts (#25919) 2023-07-11 23:30:21 +02:00
Trevor Wolf ea10febd25
fix buttons showing inconsistent styles (#25903) 2023-07-11 12:26:09 +02:00
jsgoldstein 99be47f8b9
Change searching with # to include account index (#25638) 2023-07-10 20:58:13 +02:00
Claire af54bf52c8
Fix filters not applying to explore tab (#25887) 2023-07-10 19:33:07 +02:00
Claire 999c343946
Fix remote accounts being possibly persisted to database with incomplete protocol values (#25886) 2023-07-10 18:42:19 +02:00
Claire c27b82a437
Add `forward_to_domains` parameter to `POST /api/v1/reports` (#25866) 2023-07-10 18:26:56 +02:00
Matt Jankowski f3fca78756
Refactor `NotificationMailer` to use parameterization (#25718) 2023-07-10 03:06:22 +02:00
Eugen Rochko a1f5188c8c
Change feed merge, unmerge and regeneration workers to use a replica (#25849) 2023-07-10 03:06:09 +02:00
Eugen Rochko 610cf6c371
Fix trend calculation working on too many items at a time (#25835) 2023-07-08 20:16:48 +02:00
Eugen Rochko 338a0e70cc
Change label and design of sensitive and unavailable media in web UI (#25712) 2023-07-08 20:05:33 +02:00
Matt Jankowski cf33028f35
Admin mailer parameterization (#25759) 2023-07-08 20:03:38 +02:00
Renaud Chaput 41a505513f
Remove unused `missed_update` state (#25832) 2023-07-08 20:02:14 +02:00
Eugen Rochko a7ca33ad96
Add toast with option to open post after publishing in web UI (#25564) 2023-07-08 20:01:08 +02:00
Eugen Rochko a8edbcf963
Fix dropdowns being disabled for logged out users in web UI (#25714) 2023-07-08 20:00:52 +02:00
Eugen Rochko ceeb2b8c41
Fix explore page being inaccessible when opted-out of trends in web UI (#25716) 2023-07-08 20:00:12 +02:00
Eugen Rochko 93e8a15415
Add forwarding of reported replies to servers being replied to (#25341) 2023-07-08 20:00:02 +02:00
Kurtis Rainbolt-Greene e4cfe4b3db
First pass at multi-database for read replica using Rails native adapter (#25693) 
Co-authored-by: emilweth <7402764+emilweth@users.noreply.github.com>
 2023-07-08 19:45:36 +02:00
Renaud Chaput 4534498a8e
Convert `<DismissableBanner>` to Typescript (#25582) 2023-07-08 11:12:20 +02:00
alfe 20e85c0e83
Rewrite `<ShortNumber />` as FC and TS (#25492) 2023-07-08 11:11:58 +02:00
fusagiko / takayamaki e0d230fb37
simplify counters (#25541) 2023-07-08 11:11:22 +02:00
Renaud Chaput 9f078e238d
Fix translate button position (#25807) 2023-07-08 00:12:31 +02:00
Claire b9aa228c54 Merge branch 'main' into glitch-soc/merge-upstream 
Conflicts:
- `.github/workflows/build-image.yml`:
  Upstream attempted something with tags.
  Kept our version.
 2023-07-07 19:59:43 +02:00
Claire b6d173b459
Fix crash in admin interface when viewing a remote user with verified links (#25796) 2023-07-07 18:10:17 +02:00
Claire 94fbac77e7
Fix processing of media files with unusual names (#25788) 2023-07-07 13:35:22 +02:00
Claire 513078de7a
Fix incorrect secondary button size (#2276) 2023-07-07 09:50:06 +02:00
Claire ff7aae3037 Merge branch 'main' into glitch-soc/merge-upstream 2023-07-06 15:16:34 +02:00
Claire 610731b03d
Merge pull request from GHSA-55j9-c3mp-6fcq 2023-07-06 15:06:49 +02:00
Claire c5929798bf
Merge pull request from GHSA-9pxv-6qvf-pjwc 
* Fix timeout handling of outbound HTTP requests

* Use CLOCK_MONOTONIC instead of Time.now
 2023-07-06 15:06:23 +02:00
Claire dc8f1fbd97
Merge pull request from GHSA-9928-3cp5-93fm 
* Fix attachments getting processed despite failing content-type validation

* Add a restrictive ImageMagick security policy tailored for Mastodon

* Fix misdetection of MP3 files with large cover art

* Reject unprocessable audio/video files instead of keeping them unchanged
 2023-07-06 15:05:05 +02:00
Claire 6d8e0fae3e
Merge pull request from GHSA-ccm4-vgcc-73hp 
* Tighten allowed HTML in oEmbed-based preview cards

* Sanitize preview cards at render time

* Add `sandbox` attribute to preview card iframes
 2023-07-06 15:03:33 +02:00
Eugen Rochko c0fa85b8dd [Glitch] Fix regression of icon button colors in web UI 
Port 69e124e2ed to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2023-07-05 13:31:26 +02:00
Trevor Wolf 4719d88117 [Glitch] Change button colors to increase hover/focus contrast and consistency 
Port 54cb679c19 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2023-07-05 13:30:52 +02:00
Eugen Rochko a117c953d0 [Glitch] Add button to see results for polls in web UI 
Port b7910bc751 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2023-07-05 12:42:24 +02:00
Eugen Rochko b3f209370b [Glitch] Add canonical link tags in web UI 
Port 000b835803 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2023-07-05 12:41:52 +02:00
mogaminsk c6246807f5 [Glitch] Fix local live feeds does not expand 
Port 6268188543 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2023-07-05 12:39:46 +02:00
forsamori ac74374311 [Glitch] Add at-symbol prepended to mention span title 
Port d9a5c1acfa to glitch-soc

Co-authored-by: Sam BC <samuel.balbirnie-cumming@xdesign.com>
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2023-07-05 12:38:54 +02:00
Eugen Rochko 0a5271629c [Glitch] Change labels of live feeds tabs in web UI 
Port 54a10523e2 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2023-07-05 12:37:37 +02:00
Claire 5de49e74d4 Merge branch 'main' into glitch-soc/merge-upstream 2023-07-05 12:01:26 +02:00
Eugen Rochko 000b835803
Add canonical link tags in web UI (#25715) 2023-07-05 11:25:27 +02:00
Eugen Rochko b7910bc751
Add button to see results for polls in web UI (#25726) 2023-07-05 10:32:04 +02:00
Claire eb2417ce99
Fix OAuth apps page crashing when listing apps with certain admin API scopes (#25713) 2023-07-04 18:58:23 +02:00
Claire 4658263b4a
Fix re-activated accounts being deleted by AccountDeletionWorker (#25711) 2023-07-04 18:36:24 +02:00
Trevor Wolf 182fd93a07
fix read more button overlapping thread line bug (#25706) 2023-07-04 14:57:46 +02:00
mogaminsk 6268188543
Fix local live feeds does not expand (#25694) 2023-07-04 00:37:57 +02:00
forsamori d9a5c1acfa
Add at-symbol prepended to mention span title (#25684) 
Co-authored-by: Sam BC <samuel.balbirnie-cumming@xdesign.com>
 2023-07-03 22:58:10 +02:00
Eugen Rochko 54a10523e2
Change labels of live feeds tabs in web UI (#25683) 2023-07-03 22:57:18 +02:00
Daniel M Brasil 383c00819c
Fix `/api/v2/search` not working with following query param (#25681) 2023-07-03 18:06:57 +02:00
Eugen Rochko 69e124e2ed
Fix regression of icon button colors in web UI (#25679) 2023-07-03 16:51:04 +02:00
Plastikmensch ed15893eed
Add regex filter back to firehose (#2266) 
* Add regex filter back to firehose

The regex filter will apply to all tabs and not be automatically applied when pinned.

Signed-off-by: Plastikmensch <plastikmensch@users.noreply.github.com>

* Keep regex when pinned

Signed-off-by: Plastikmensch <plastikmensch@users.noreply.github.com>

---------

Signed-off-by: Plastikmensch <plastikmensch@users.noreply.github.com>
 2023-07-03 15:41:50 +02:00
Trevor Wolf 54cb679c19
Change button colors to increase hover/focus contrast and consistency (#25677) 2023-07-03 11:32:31 +02:00
Plastikmensch b422b5eebd
Fix showing local only toots in "All" (#2265) 
* Fix warnings about missing dependency in hooks

Signed-off-by: Plastikmensch <plastikmensch@users.noreply.github.com>

* Add `allowLocalOnly` to timelineId

Without this local-only toots will never be loaded.

feedType is checked to be public to not show local-only toots in the "Remote" tab.

Signed-off-by: Plastikmensch <plastikmensch@users.noreply.github.com>

---------

Signed-off-by: Plastikmensch <plastikmensch@users.noreply.github.com>
 2023-07-03 07:00:38 +02:00
Claire 9f3c3f5209 Show local-only posts in “All” by default, and add back option to toggle it 2023-07-02 20:28:02 +02:00
Claire e6a8faae81
Add users index on unconfirmed_email (#25672) 2023-07-02 19:41:35 +02:00
Claire 180f0e6715
Fix inefficient query when requesting a new confirmation email from a logged-in account (#25669) 2023-07-02 16:08:58 +02:00
mogaminsk 587ddc2c7f [Glitch] Prevent duplicate concurrent calls of `/api/*/instance` in web UI 
Port 5b46345459 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2023-07-02 12:00:03 +02:00
Eugen Rochko c49e339c89 [Glitch] Change dropdown icon above compose form from ellipsis to bars in web UI 
Port 0512537eb6 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2023-07-02 11:59:31 +02:00
Claire 7cc2c1be29 [Glitch] Change local and federated timelines to be in a single firehose column 
Port cea9db5a0b to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2023-07-02 11:58:51 +02:00
Renaud Chaput eb1cb8224a [Glitch] Use an Immutable Record as the root state 
Port 78ba12f0bf to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2023-07-02 11:55:34 +02:00
Claire 2ba4773ebe [Glitch] Fix onboarding prompt being displayed because of disconnection gaps 
Port 9934949fc4 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2023-07-02 11:55:08 +02:00
Claire b75aa6b819 [Glitch] Remove the search button from UI header when logged out 
Port 285a691936 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2023-07-02 11:54:47 +02:00
Claire 44e98a2740 Merge branch 'main' into glitch-soc/merge-upstream 2023-07-02 11:49:08 +02:00
Eugen Rochko ba06a2f104
Revert "Rails 7 update" (#25667) 2023-07-02 11:14:22 +02:00
mogaminsk 5b46345459
Prevent duplicate concurrent calls of `/api/*/instance` in web UI (#25663) 2023-07-02 11:12:16 +02:00
Eugen Rochko 0512537eb6
Change dropdown icon above compose form from ellipsis to bars in web UI (#25661) 2023-07-02 10:39:55 +02:00
Matt Jankowski 50c2a03695
Rails 7 update (#24241) 2023-07-02 10:38:53 +02:00
Daniel M Brasil 4fe2d7cb59
Fix HTTP 500 in `/api/v1/emails/check_confirmation` (#25595) 2023-07-02 00:05:44 +02:00
Claire cea9db5a0b
Change local and federated timelines to be in a single firehose column (#25641) 2023-07-02 00:05:10 +02:00
Vivianne 155fc459e3
Fixing an issue with a missing argument (#2261) 
undefined
 2023-07-01 22:55:43 +02:00
Matt Jankowski 683ba5ecb1
Fix rails `rewhere` deprecation warning in directories api controller (#25625) 2023-07-01 21:48:16 +02:00
Renaud Chaput 78ba12f0bf
Use an Immutable Record as the root state (#25584) 2023-06-30 17:03:25 +02:00
Claire 9934949fc4
Fix onboarding prompt being displayed because of disconnection gaps (#25617) 2023-06-30 16:32:12 +02:00
Claire a209d1e683
Fix ResolveURLService not resolving local URLs for remote content (#25637) 2023-06-29 14:48:54 +02:00
jsgoldstein 4581a528f7
Change account search to match by text when opted-in (#25599) 
Co-authored-by: Eugen Rochko <eugen@zeonfederated.com>
 2023-06-29 13:05:21 +02:00
Claire 285a691936
Remove the search button from UI header when logged out (#25631) 2023-06-28 14:57:51 +02:00
Renaud Chaput c43cfd2406 [Glitch] Improve dismissable banner buttons when they dont fit on 1 line 
Port ae30a60b1f to glitch-soc

Co-authored-by: Claire <claire.github-309c@sitedethib.com>
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2023-06-27 13:25:21 +02:00
Eugen Rochko 4faa4eb3c4 [Glitch] Fix onboarding prompt flashing while home feed is loading in web UI 
Port 65aa04647a to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2023-06-27 13:21:55 +02:00
Eugen Rochko 2f996375e5 [Glitch] Fix search not being easily findable on smaller screens in web UI 
Port 2b78c07ef1 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2023-06-27 13:21:14 +02:00
Claire 80a5c16ae1 Merge branch 'main' into glitch-soc/merge-upstream 2023-06-27 13:15:41 +02:00
Claire c7c6f02ae6
Fix suspending an already-limited domain (#25603) 2023-06-27 12:32:51 +02:00
Claire 0ccf6c0eb7
Fix batch attachment deletion leaving empty directories (#25587) 2023-06-27 09:36:11 +02:00
S.H 7a25af64dd
Remove media attachment only when file was exist (#25586) 2023-06-26 16:38:19 +02:00
Eugen Rochko bb4756c823
Change files to be deleted in batches instead of one-by-one (#23302) 2023-06-26 14:17:41 +02:00
Renaud Chaput ae30a60b1f
Improve dismissable banner buttons when they dont fit on 1 line (#25580) 
Co-authored-by: Claire <claire.github-309c@sitedethib.com>
 2023-06-26 12:31:48 +02:00
Claire ed96e28c9e
Fix compose form not being shown when clicking “Make your first post” on mobile (#25581) 2023-06-26 12:30:35 +02:00
Eugen Rochko 7b024baf50
Change header backgrounds to use fewer different colors in web UI (#25577) 2023-06-26 05:27:07 +02:00
Eugen Rochko 65aa04647a
Fix onboarding prompt flashing while home feed is loading in web UI (#25579) 2023-06-26 05:26:54 +02:00
Eugen Rochko 2b78c07ef1
Fix search not being easily findable on smaller screens in web UI (#25576) 2023-06-26 05:26:41 +02:00
Claire 5def74a436 [Glitch] Remove unique accounts condition from Home onboarding prompt 
Port 0842a68532 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2023-06-25 17:40:01 +02:00
Eugen Rochko 6fb34258a4 [Glitch] Add onboarding prompt when home feed too slow in web UI 
Port 00ec43914a to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2023-06-25 17:40:01 +02:00
Claire 7d160d2272 [Glitch] Fix j/k keyboard shortcuts on some status lists 
Port a8c1c8bd37 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2023-06-25 17:40:01 +02:00
mogaminsk 222713a768 [Glitch] Fix custom signup URL may not loaded 
Port 8d2c26834f to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2023-06-25 14:27:46 +02:00
Ian 6fe345c383 [Glitch] Change emoji picker icon 
Port 69db507924 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2023-06-25 14:27:46 +02:00
たいち ひ c71fc42f4e [Glitch] Rewrite `<AutosuggestHashtag />` as FC and TS 
Port 804488d38e to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2023-06-25 14:27:46 +02:00
Claire 178e151019 Merge commit '55e7c08a83547424024bac311d5459cb82cf6dae' into glitch-soc/merge-upstream 
Conflicts:
- `app/models/user_settings.rb`:
  Upstream added a constraint on a setting textually close
  to glitch-soc-only settings.
  Applied upstream's change.
- `lib/sanitize_ext/sanitize_config.rb`:
  Upstream added support for the `translate` attribute on a few elements,
  where glitch-soc had a different set of allowed elements and attributes.
  Extended glitch-soc's allowed attributes with `translate` as upstream did.
- `spec/validators/status_length_validator_spec.rb`:
  Upstream refactored to use RSpec's `instance_double` instead of `double`,
  but glitch-soc had changes to tests due to configurable max toot chars.
  Applied upstream's changes while keeping tests against configurable max
  toot chars.
 2023-06-25 14:27:38 +02:00
Claire 55e7c08a83
Fix verified badge in account lists potentially including rel="me" links (#25561) 2023-06-24 17:24:31 +02:00
Eugen Rochko a985d587e1
Change labels and styles on the onboarding screen in web UI (#25559) 2023-06-23 16:34:27 +02:00
Claire 0842a68532
Remove unique accounts condition from Home onboarding prompt (#25556) 2023-06-23 14:44:54 +02:00
Eugen Rochko 00ec43914a
Add onboarding prompt when home feed too slow in web UI (#25267) 2023-06-22 23:48:40 +02:00
Claire 1d622c8033
Add POST /api/v1/conversations/:id/unread (#25509) 2023-06-22 18:46:43 +02:00
Claire a8c1c8bd37
Fix j/k keyboard shortcuts on some status lists (#25554) 2023-06-22 17:54:43 +02:00
Claire a5b6f6da80
Change /api/v1/statuses/:id/history to always return at least one item (#25510) 2023-06-22 14:56:14 +02:00
Claire 602c458ab6
Add finer permission requirements for managing webhooks (#25463) 2023-06-22 14:52:25 +02:00
mogaminsk 8d2c26834f
Fix custom signup URL may not loaded (#25531) 2023-06-22 12:10:49 +02:00
Ian 69db507924
Change emoji picker icon (#25479) 2023-06-21 17:58:00 +02:00
Claire ebfeaebedb
Fix /api/v1/conversations sometimes returning empty accounts (#25499) 2023-06-20 18:32:26 +02:00
Claire ec91ea4457
Fix missing validation on `default_privacy` setting (#25513) 2023-06-20 18:32:14 +02:00
Claire fd23f50243
Fix wrong view being displayed when a webhook fails validation (#25464) 2023-06-20 18:15:35 +02:00
Claire c78280a8ce
Add translate="no" to outgoing mentions and links (#25524) 2023-06-20 18:10:19 +02:00
Emelia Smith 3a91603b15
Prevent UserCleanupScheduler from overwhelming streaming (#25519) 2023-06-20 18:04:35 +02:00
Claire dd07393e75
Fix user settings not getting validated (#25508) 2023-06-19 14:06:06 +01:00
たいち ひ 804488d38e
Rewrite `<AutosuggestHashtag />` as FC and TS (#25481) 2023-06-19 14:11:46 +02:00
Matt Jankowski e1c9d52e91
Reduce `sleep` time in request pool spec (#25470) 2023-06-19 13:48:25 +02:00
Matt Jankowski 155ec185b2
Remove unused `picture_hint` helper method (#25485) 2023-06-19 09:04:15 +02:00
Daniel M Brasil b9bc9d0bda
Fix incorrect pagination headers in `/api/v2/admin/accounts` (#25477) 2023-06-19 08:53:05 +02:00
Claire dc68306b8e Merge branch 'main' into glitch-soc/merge-upstream 
Conflicts:
- `app/views/layouts/application.html.haml`:
  Conflicts due to glitch-soc's theming system.
  Added `crossorigin: 'anonymous'` like upstream did, to the glitch-soc-specific code.
- `app/views/layouts/embedded.html.haml`:
  Conflicts due to glitch-soc's theming system.
  Added `crossorigin: 'anonymous'` like upstream did, to the glitch-soc-specific code.
 2023-06-18 16:14:29 +02:00
Claire 64f7a11658
Fix cross-origin loading of locales (#25498) 2023-06-18 15:47:04 +02:00
Claire 3b04e39534 [Glitch] Fix non-interactive upload container being given a `button` role and tabIndex 
Port c9d06d10d4 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2023-06-18 14:10:49 +02:00
Claire 6c99479ef4 Merge commit '9e245d147bcb2c72cc552ff8c276a1c34e2f686d' into glitch-soc/merge-upstream 
Conflicts:
- `app/views/settings/profiles/show.html.haml`:
  Upstream redesigned the settings page, where glitch-soc had changes because of
  the ability to set some custom limits.
  Went with upstream's design while keeping our custom limits.
- `yarn.lock`:
  Upstream updated dependencies textually close to a glitch-soc-only dependency.
  Updated the dependnencies as well.
 2023-06-18 13:41:33 +02:00
Eugen Rochko d795c2c70c [Glitch] Fix CAPTCHA page not following design pattern of sign-up flow 
Port 39110d1d0a to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2023-06-18 12:11:58 +02:00
たいち ひ b1b95ddd1f [Glitch] Rewrite `emoji_mart_data_light` as TS 
Port 3b5e302f7f to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2023-06-18 12:11:19 +02:00
alfe 9bf63257fb [Glitch] Rewrite `<LoadingIndicator/>` as FC and TS (#25364) 
Port a86886b1fd to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2023-06-18 12:10:37 +02:00
Renaud Chaput 0a212cfa7f [Glitch] Add missing report category translation 
Port 1cb4514d0e to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2023-06-18 10:43:07 +02:00
alfe cdec45eca9 [Glitch] Rewrite <LoadPending /> as FC and TS 
Port dfaf59d99a to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2023-06-18 10:42:04 +02:00
Eugen Rochko f815bd5fd9 [Glitch] Change "bot" label to "automated" 
Port 432a5d2d4b to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2023-06-18 10:40:56 +02:00
Claire 65cbcce997 Merge commit '39110d1d0af5e3d9cf452ae47496a52797249fd0' into glitch-soc/merge-upstream 2023-06-18 10:36:14 +02:00
Claire c9d06d10d4
Fix non-interactive upload container being given a `button` role and tabIndex (#25462) 2023-06-16 12:03:06 +02:00
Daniel M Brasil d9c6f70cc6
Fix `ArgumentError` in `/api/v1/admin/accounts/:id/action` (#25386) 2023-06-14 15:21:36 +02:00
Eugen Rochko f20698000f
Fix always redirecting to onboarding in web UI (#25396) 2023-06-14 09:05:03 +02:00
Claire ec59166844
Fix ArgumentError when loading newer Private Mentions (#25399) 2023-06-14 08:54:52 +02:00
Eugen Rochko bca649ba79
Change edit profile page (#25413) 2023-06-14 04:38:07 +02:00
Eugen Rochko 39110d1d0a
Fix CAPTCHA page not following design pattern of sign-up flow (#25395) 2023-06-13 22:30:40 +02:00
たいち ひ 3b5e302f7f
Rewrite `emoji_mart_data_light` as TS (#25138) 2023-06-13 19:28:31 +02:00
alfe a86886b1fd
Rewrite `<LoadingIndicator/>` as FC and TS (#25364) 2023-06-13 19:26:25 +02:00
Renaud Chaput 1cb4514d0e
Add missing report category translation (#25400) 2023-06-13 15:05:40 +02:00
Eugen Rochko 6637ef7852
Add unsubscribe link to e-mails (#25378) 2023-06-12 14:22:46 +02:00
Plastikmensch fefdc3244c
[Glitch] Change "direct message" nomenclature to "private mention" in web UI (#2158) 
Port 68a192e718 to glitch-soc

Signed-off-by: Plastikmensch <plastikmensch@users.noreply.github.com>
 2023-06-11 13:33:45 +02:00
alfe dfaf59d99a
Rewrite <LoadPending /> as FC and TS (#25363) 2023-06-11 04:47:18 +02:00
Eugen Rochko 432a5d2d4b
Change "bot" label to "automated" (#25356) 2023-06-11 04:47:07 +02:00
Claire 20718a8b59 Fix some translation strings inconsistencies 2023-06-10 19:21:44 +02:00
Claire 42a0898f16 Merge commit '3a2a15c6ea4d4603469861ed9be09da12a122e45' into glitch-soc/merge-upstream 
Conflicts:
- `app/views/settings/preferences/appearance/show.html.haml`:
  Conflict because glitch-soc does not have a theme selector here.
 2023-06-10 18:42:29 +02:00
Claire 34efd1a24c Switch to using a `common` runtime chunk rather than `locales` 2023-06-10 17:43:13 +02:00
Claire 8c26d49cbd Merge commit '16dd3f08c1e5396d5f9ff3f13417901bc4e4b8b9' into glitch-soc/merge-upstream 
Conflicts:
- `app/views/settings/preferences/appearance/show.html.haml`:
  Upstream fixed a translation bug in the theme selector that is absent from
  glitch-soc due to our different theming system.
  Discarded upstream changes.
- `streaming/index.js`:
  Upstream changed the signature of a function to change its return type.
  This is not a real conflict, the conflict being caused by an extra
  argument in glitch-soc's code.
  Applied upstream's change while keeping our extra argument.
 2023-06-10 17:18:36 +02:00
Eugen Rochko fb0d2de8fe [Glitch] Change design of dropdowns in web UI 
Port e4fd9503ec to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2023-06-10 17:10:06 +02:00
alfe 83ae40e192 [Glitch] Rewrite `<LoadMore />` as FC and TS 
Port fb5bf5cbf8 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2023-06-10 16:59:25 +02:00
Claire c48ec9cb8c Merge commit 'b85c387c5c0527b0ad31c27031a09d361826c5fc' into glitch-soc/merge-upstream 
Conflicts:
- `config/initializers/content_security_policy.rb`:
  Kept our version, it was not affected by upstream's bug.
 2023-06-10 16:48:01 +02:00
Claire 88c5ad3136 [Glitch] Add data-nosnippet so Google doesn't use trending posts in snippets for / 
Port 1483a3ddfe to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2023-06-10 16:38:03 +02:00
S.H 5a961f84cf [Glitch] Fix not shown announcements in hometimeline. 
Port a6c898f501 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2023-06-10 16:37:20 +02:00
Claire 475185a2ee [Glitch] Fix design issues with recent react-intl upgrade 
Port c2c396157f to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2023-06-10 16:36:54 +02:00
Darius Kazemi a8a30f1298 [Glitch] Add exclusive lists 
Port bacb674921 to glitch-soc

Co-authored-by: Liam Cooke <liam@liamcooke.com>
Co-authored-by: John Holdun <john@johnholdun.com>
Co-authored-by: Effy Elden <effy@effy.space>
Co-authored-by: Lina Reyne <git@lina.pizza>
Co-authored-by: Lina <20880695+necropolina@users.noreply.github.com>
Co-authored-by: Claire <claire.github-309c@sitedethib.com>
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2023-06-10 16:36:15 +02:00
Claire bf23afa059 [Glitch] Add card with who invited you to join when displaying rules on sign-up 
Port SCSS from 0766c9a631 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2023-06-10 16:30:36 +02:00
Jed Fox 753385d3e0 [Glitch] Fix spacing of middle dots in the detailed status meta section 
Port acc419b81b to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2023-06-10 16:29:48 +02:00
Claire d8b0a732aa Merge commit '1483a3ddfe74e4fb81d87447a1781943eab86c60' into glitch-soc/merge-upstream 
Conflicts:
- `config/initializers/simple_form.rb`:
  Upstream added a new simple_form component, where we had an extra one.
  Kept both components.
 2023-06-10 16:22:14 +02:00
Renaud Chaput 9e66c07be7 [Glitch] Fix `/share` and cleanup and reorganize frontend locale loading 
Port b0780cfeed to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2023-06-10 16:18:01 +02:00
Claire 734e186717 Merge commit 'b0780cfeeda641645ea65da257a72ec507e71647' into glitch-soc/merge-upstream 
Conflicts:
- `app/javascript/mastodon/load_locale.js`:
  The file moved to `app/javascript/mastodon/locales/load_locale.ts`.
  Ported the changes there and deleted `app/javascript/mastodon/load_locale.js`.
- `app/javascript/mastodon/locales/index.js`:
  The file moved to `app/javascript/mastodon/locales/index.ts`.
  Did *not* port the changes as I want to try something a bit different.
 2023-06-10 15:32:29 +02:00
S.H a4d7a17089 [Glitch] Fix using Date.now() instead of intl.now() 
Port b3f9a0da52 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2023-06-10 15:21:04 +02:00