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

12489 Commits

Author SHA1 Message Date
Emelia Smith 603b245cc6
Add VAPID public key to instance serializer () 
Co-authored-by: Renaud Chaput <renchap@gmail.com>
 2023-11-29 08:34:36 +00:00
Matt Jankowski 6b46bf9953
Handle scenario when webfinger response `subject` is missing host value () 2023-11-28 18:37:54 +00:00
Josh Goldberg ✨ 3a7f10c3f1
Converted hashtag.jsx to TypeScript () 
Co-authored-by: Claire <claire.github-309c@sitedethib.com>
Co-authored-by: Renaud Chaput <renchap@gmail.com>
 2023-11-28 18:20:10 +00:00
Josh Goldberg ✨ 1142f4c79e
Converted app/javascript/mastodon/utils/ folder to TypeScript () 2023-11-28 17:47:55 +00:00
Matt Jankowski baf3b71e3b
Extract `path_without_format` private methd in accounts controller () 2023-11-28 09:17:26 +00:00
github-actions[bot] af02484714
New Crowdin Translations (automated) () 
Co-authored-by: GitHub Actions <noreply@github.com>
 2023-11-28 08:59:48 +00:00
Matt Jankowski 9072896ae5
Avoid unnecessary i-var for account rss page url generation () 2023-11-28 08:19:08 +00:00
Matt Jankowski dfc7154767
Remove unused `cached_filtered_status_page` method from accounts controller () 2023-11-28 07:43:16 +00:00
Matt Jankowski 2d536bb05f
Use `admin_mailer` layout with initial salutation () 2023-11-28 07:41:26 +00:00
6543 10b879bd5e
nodeinfo: add instance name and description () 2023-11-28 00:51:22 +00:00
Claire f1657e6d62
Clamp dates when serializing to Elasticsearch API () 2023-11-27 13:25:54 +00:00
Matt Jankowski 9b8ba9b350
Remove unused `plain_mailer` layout () 2023-11-27 10:40:03 +00:00
June 97e677f993
Fix not all legal images showing in file picker when uploading custom emoji () 2023-11-27 10:06:48 +00:00
github-actions[bot] fad9343bab
New Crowdin Translations (automated) () 
Co-authored-by: GitHub Actions <noreply@github.com>
 2023-11-27 10:06:35 +00:00
Jeong Arm b3581d1e2f
Fix @rails/ujs import on public.jsx () 
Related: 8a131fb7bc
 2023-11-24 17:40:31 +01:00
github-actions[bot] 8521238677
New Crowdin Translations (automated) () 
Co-authored-by: GitHub Actions <noreply@github.com>
 2023-11-24 10:25:39 +00:00
Claire 3a24754229
Change GIF max matrix size error to explicitly mention GIF files () 2023-11-24 09:31:28 +00:00
Claire 6e70819840
Change search popout to not list unusable search options when logged out () 2023-11-24 09:27:54 +00:00
Kevin Bongart 7877fcd83c
Deduplicate IDs in relationships and familiar_followers APIs () 2023-11-23 10:00:09 +00:00
github-actions[bot] c810b197ad
New Crowdin Translations (automated) () 
Co-authored-by: GitHub Actions <noreply@github.com>
 2023-11-23 09:34:50 +00:00
Matt Jankowski 4be12791e6
Remove `default_scope` from `StatusEdit` class () 2023-11-23 09:26:11 +00:00
github-actions[bot] d3ed03fd6b
New Crowdin Translations (automated) () 
Co-authored-by: GitHub Actions <noreply@github.com>
 2023-11-22 15:48:12 +00:00
Matt Jankowski 9742bccbe7
Add coverage for `api/v2/media` endpoint () 2023-11-22 15:39:34 +00:00
Eugen Rochko cdc57c74b7
Fix unsupported time zone or locale preventing sign-up () 
Co-authored-by: Claire <claire.github-309c@sitedethib.com>
 2023-11-22 11:38:07 +00:00
Claire 32319187ee
Fix error when muting users from Web UI () 2023-11-21 11:16:16 +00:00
Matt Jankowski 6d51ac246b
Update partials for the `AdminMailer.new_trends` mailer () 2023-11-21 10:52:20 +00:00
github-actions[bot] 3c3e0c25ef
New Crowdin Translations (automated) () 
Co-authored-by: GitHub Actions <noreply@github.com>
 2023-11-21 10:35:02 +00:00
Claire f00fcda785 Reduce differences with upstream in `Account` component 2023-11-20 13:24:02 +01:00
Claire 9ab1aa15e9 Change `ReplyIndicator` implementation and markup to match upstream's 2023-11-20 13:24:02 +01:00
Matt Jankowski 876f5b1d12
Convert `/instances/*` controller specs to request specs () 
Co-authored-by: Claire <claire.github-309c@sitedethib.com>
 2023-11-20 11:05:28 +00:00
Matt Jankowski d2aacea8da
Reduce `.times` usage in AccountSearch spec, use constant for default limit () 2023-11-20 09:08:22 +00:00
Matt Jankowski 00c6ebd86f
Reduce `.times` usage in `StatusPin` and add `PIN_LIMIT` constant in validator () 2023-11-20 09:07:25 +00:00
github-actions[bot] 8ceae2bce6
New Crowdin Translations (automated) () 
Co-authored-by: GitHub Actions <noreply@github.com>
 2023-11-20 08:47:34 +00:00
Eugen Rochko 0e9801443f
Change to single opt-in during profile setup in onboarding in web UI () 2023-11-17 10:37:04 +00:00
github-actions[bot] 9c68741f46
New Crowdin Translations (automated) () 
Co-authored-by: GitHub Actions <noreply@github.com>
 2023-11-17 09:16:12 +00:00
Claire d3ae5b21d2 Reduce code and markup discrepancies on reply indicator 2023-11-16 18:33:16 +01:00
Claire e023acfd00 Remove unnecessary proptype discrepancy 2023-11-16 17:57:13 +01:00
Claire 0a6ec048a8
Fix upper border radius of onboarding columns () 2023-11-16 13:43:02 +00:00
Claire c94bedf4e6
Use container queries to hide profile share button () 2023-11-16 11:59:45 +00:00
Eugen Rochko 87696ea26e
Add prominent share/copy button on profiles in web UI () 2023-11-16 10:23:14 +00:00
github-actions[bot] 7232d4750d
New Crowdin Translations (automated) () 
Co-authored-by: GitHub Actions <noreply@github.com>
 2023-11-16 10:08:22 +00:00
Claire 36f25ea067 Fix more import discrepancies 2023-11-15 22:50:23 +01:00
Claire 4101057b9a Fix various code discrepancies 2023-11-15 22:50:23 +01:00
Claire 09a5a78527 Fix discrepancy for `autosuggest-emoji` class 2023-11-15 22:50:23 +01:00
Claire f69f1e9429 Fix code discrepancies with upstream 2023-11-15 21:52:19 +01:00
Claire d358a3cc61
Merge pull request from ClearlyClaire/glitch-soc/cleanup 
Clean up some more and reduce unwarranted differences with upstream further
 2023-11-15 21:49:50 +01:00
Claire 0d877a3076 [Glitch] Change compose form checkbox to native input with `appearance: none` 
Port d3b4d4d4f3 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2023-11-15 17:20:44 +01:00
Claire e7b3598f04 No need to have a separate localStorage key for home instance 2023-11-15 17:16:21 +01:00
Claire 0c727a6790 Fix more import style discrepancies 2023-11-15 17:16:21 +01:00
Claire 50eb673494 Fix some markup discrepancies 2023-11-15 17:16:21 +01:00
Claire 349579e318 Fix more code discrepancies 2023-11-15 17:16:21 +01:00
Claire 1023c2f90b Fix more whitespace and comment discrepancies 2023-11-15 17:16:21 +01:00
Claire 7e5d00720b
Merge pull request from ClearlyClaire/glitch-soc/port-upstream-hashtags 
Port upstream's hashtag handling to glitch-soc
 2023-11-15 17:15:21 +01:00
Claire bd575a1dd6
Add banner for forwarded reports made by remote users about remote content () 2023-11-15 14:18:43 +00:00
Matt Jankowski fe58ac8d9f
Improve spec coverage for `api/web/push_subscriptions` controller () 
Co-authored-by: Claire <claire.github-309c@sitedethib.com>
 2023-11-15 13:14:51 +00:00
Claire cd3a636b7f [Glitch] Fix some remote posts getting truncated 
Port 4d59dfb1c6 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2023-11-15 12:59:06 +01:00
Eugen Rochko 6a8623588a [Glitch] Fix colors and typography on hashtag bar in web UI 
Port 10b06436d1 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2023-11-15 12:56:58 +01:00
Claire c226d00490 Fix interaction between CWs and hashtag bars 2023-11-15 12:56:58 +01:00
Claire 7ae45676c8 Fix hashtag bar styling 2023-11-15 12:56:58 +01:00
Claire 45690b01d1 [Glitch] Change hashtag bar tags to be de-emphasized 
Port 613cfd625c to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2023-11-15 12:56:58 +01:00
Renaud Chaput fc514fa8c6 [Glitch] Better hashtag normalization when processing a post 
Port 58acaa9ae6 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2023-11-15 12:56:58 +01:00
Renaud Chaput 18462ee4b6 [Glitch] Remove hashtags from the last line of a status if it only contains hashtags 
Port 061fd66ee6 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2023-11-15 12:56:58 +01:00
Claire 2ce03420d6 [Glitch] Fix case-insensitive comparison of hashtags to do case-folding 
Port 3ed2bf92d0 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2023-11-15 12:56:58 +01:00
Claire fe8d9f6221 [Glitch] Fix hashtag bar sometimes including tags that appear in the post's body 
Port f0862bcf98

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2023-11-15 12:56:58 +01:00
Claire a81ed84453 [Glitch] Add display of out-of-band hashtags in the web interface 
Port df6e719898 to glitch-soc

Co-authored-by: Eugen Rochko <eugen@zeonfederated.com>
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2023-11-15 12:56:58 +01:00
Claire 3b210e093a Fix more code style discrepancies 2023-11-15 12:53:21 +01:00
Claire 542d95c2bc Fix import style discrepancy 2023-11-15 12:53:21 +01:00
Claire 8b24a9a507 Fix missed relative import discrepancy 2023-11-15 12:53:21 +01:00
Claire b1f0457cb8 Fix whitespace and comment discrepancies 2023-11-15 12:53:21 +01:00
Eugen Rochko 08ac91c40b [Glitch] Fix follow relationships not loading after notifications fetch 
Port 4f7f6b3922 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2023-11-15 12:53:21 +01:00
Eugen Rochko 103c0ca4f7 [Glitch] Hide loading bar on status interactions 
Port eb2425b53b to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2023-11-15 12:53:21 +01:00
Claire 21653beb30 Reduce more unwarranted differences with upstream 2023-11-15 12:53:21 +01:00
Claire 7b922c2d90 Reduce unwarranted differences with upstream 
Ports part of 0758b00bfd and 897199910f
 2023-11-15 12:53:21 +01:00
Claire 2f61b65b1e Remove dead code 2023-11-15 12:53:11 +01:00
Claire 9bbb0f13e0
Fix inconsistent React imports in JSX files () 2023-11-15 12:52:30 +01:00
Eugen Rochko d67bd44ca1
Add profile setup to onboarding in web UI () 2023-11-15 11:13:53 +00:00
Claire a97b722ad5
Reduce differences with upstream due to import style () 
Fix relative / VS absolute style imports, and fix whitespace discrepancies
 2023-11-15 12:01:51 +01:00
github-actions[bot] d8074128f9
New Crowdin Translations (automated) () 
Co-authored-by: GitHub Actions <noreply@github.com>
 2023-11-15 09:41:24 +00:00
Jeong Arm 922f086253
Fix open status on media modal () 2023-11-15 09:29:10 +00:00
Claire f7d3b74e03
Merge pull request from glitch-soc/i18n/crowdin/translations 
New Crowdin Translations (automated)
 2023-11-15 09:42:30 +01:00
ppnplus 2b038b4f89
Added Thai diacritics and tone marks in HASHTAG_INVALID_CHARS_RE () 2023-11-14 15:33:59 +00:00
Matt Jankowski 7e1a77ea51
Add base class for `api/v1/timelines/*` controllers () 2023-11-14 14:53:31 +00:00
Matt Jankowski d562fb8459
Specs for minimal CSP policy in `Api::` controllers () 2023-11-14 14:34:30 +00:00
github-actions[bot] c1e071f634
New Crowdin Translations (automated) () 
Co-authored-by: GitHub Actions <noreply@github.com>
 2023-11-14 10:53:47 +00:00
Matt Jankowski 1f8173ac5a
Extract private methods in api/v1/instances/domain_blocks () 2023-11-14 10:31:59 +00:00
Brian Holley 4aa06cbdbf
Fix "Hide these posts from home" list setting not refreshing when switching lists () 2023-11-14 00:39:54 +00:00
Matt Jankowski b7807f3d84
Use `normalizes` to prepare `Webhook#events` value () 2023-11-13 22:47:44 +00:00
neatchee bd6da814b5 Fix recurring "switch to advanced interface" warning by adding missing class to the navigation-panel__banner element 2023-11-13 13:20:51 -08:00
Claire bac9e0b55d
Add variable delay before link verification of remote account links () 2023-11-13 16:17:05 +00:00
Matt Jankowski 0945e25b8f
Add `Api::V1::Statuses::BaseController` base controller class () 2023-11-13 14:53:22 +00:00
Eugen Rochko 7e3c10dec6
Add icons for private and disabled boost in web UI () 
Co-authored-by: Claire <claire.github-309c@sitedethib.com>
 2023-11-13 14:39:45 +00:00
pajowu ed79713f3a
Fix modal content not being selectable () 2023-11-13 13:27:50 +00:00
Claire 07a4059901
Add support for invite codes in the registration API () 2023-11-13 13:27:00 +00:00
github-actions[bot] e5a7b73ef4
New Crowdin Translations (automated) () 
Co-authored-by: GitHub Actions <noreply@github.com>
 2023-11-13 13:21:02 +00:00
Eugen Rochko 0d14fcebae
Change link previews to keep original URL from the status () 2023-11-13 09:58:28 +00:00
GitHub Actions 46a28fc41f New Crowdin translations 2023-11-11 04:27:29 +00:00
github-actions[bot] ac62b995ef
New Crowdin Translations (automated) () 
Co-authored-by: GitHub Actions <noreply@github.com>
 2023-11-10 13:07:04 +00:00
Matt Jankowski 43e2f763b2
Extract crutches_active_mentions from FeedManager () 2023-11-10 12:47:38 +00:00
Matt Jankowski ac69f90098
Add `Api::V1::Instances::BaseController` base controller class () 2023-11-10 12:46:00 +00:00
Aleks Xhuvani 7840c6b75b
Do not try to update an undefined video element () 2023-11-09 22:35:53 +00:00
Claire c451bbe249
Allow viewing and severing relationships with suspended accounts () 2023-11-09 14:50:25 +00:00
Matt Jankowski 548bb30b2a
Consolidate html page title output logic into helper () 2023-11-09 13:05:57 +00:00
Claire 9b06c0f24a
Fix Web UI not displaying appropriate explanation when a user hides their follows/followers () 2023-11-09 12:58:02 +00:00
Matt Jankowski ce1bd81c85
Reduce complexity in `StatusCacheHydrator` () 2023-11-09 09:53:44 +00:00
Matt Jankowski 13c3e59601
Use helper method to build batched status edits in `admin/statuses/show` () 2023-11-08 13:04:52 +00:00
github-actions[bot] 5c328ae674
New Crowdin Translations (automated) () 
Co-authored-by: GitHub Actions <noreply@github.com>
 2023-11-08 12:40:09 +00:00
Matt Jankowski 7d6bcc0615
Remove unmatched `rubocop:enable` declaration () 2023-11-08 12:02:09 +00:00
João Pedro Marques d3cd37d73e
Feature - Prevents multiple audio/video attachments from being played at the same time () 2023-11-07 23:37:58 +00:00
Jasmin Johal 27cbdc6f22
Change alt text to empty string for avatars () 
Co-authored-by: Renaud Chaput <renchap@gmail.com>
 2023-11-07 21:46:08 +00:00
Aleks Xhuvani 58f01a5c9a
Add volume saving/reuse to video player () 2023-11-07 18:15:38 +00:00
Renaud Chaput f476d9dab2
Fix the `notificationsUpdate` call () 2023-11-07 14:18:59 +00:00
Matt Jankowski 45770c9306
Fix `Performance/MapMethodChain` cop () 2023-11-07 13:01:09 +00:00
Matt Jankowski bbad5b6456
Remove false positive cop detection () 2023-11-07 10:44:15 +00:00
github-actions[bot] 1b28ab7263
New Crowdin Translations (automated) () 
Co-authored-by: GitHub Actions <noreply@github.com>
 2023-11-07 09:03:59 +00:00
Matt Jankowski d6f50839e1
Fix `RSpec/SpecFilePathFormat` cops () 2023-11-06 16:25:40 +00:00
Matt Jankowski 0c4e7c06dc
Fix `Rails/FindEach` cop () 2023-11-06 15:53:29 +00:00
Matt Jankowski fe26f33e0a
Fix `Rails/RedundantActiveRecordAllMethod` cop () 2023-11-06 15:51:52 +00:00
zunda e4e752c26e
Adjust transform origin for favorite star () 2023-11-06 11:14:46 +00:00
Claire c0989b78f8
Fix incoming status creation date not being restricted to standard ISO8601 () 2023-11-06 09:28:14 +00:00
Renaud Chaput 6712bf86cd
Fixes website not loading for unlogged users () 2023-11-04 21:52:56 +00:00
Renaud Chaput 3bf2a7296e
Use Immutable `Record` for accounts in Redux state () 2023-11-03 15:00:03 +00:00
github-actions[bot] 2d548e273e
New Crowdin Translations (automated) () 
Co-authored-by: GitHub Actions <noreply@github.com>
 2023-11-03 10:10:13 +00:00
Claire 0337df3a42
Fix posts from threads received out-of-order sometimes not being inserted into timelines () 2023-11-02 14:58:37 +00:00
mogaminsk ac8e4ed38d
Fix inserting emojis from emoji picker fails with TypeError () 2023-11-01 07:22:02 +00:00
Renaud Chaput 277e6968f5
Use helpers to check environment in frontend () 2023-10-31 16:05:44 +00:00
Renaud Chaput 0e3401bc1c
Improve Babel configuration and automatically load polyfills () 2023-10-31 10:55:13 +00:00
Claire 9c8891b39a
Rewrite `AutosuggestTextarea` as Functional Component () 2023-10-31 10:17:37 +00:00
Claire d649bbf28f
Add some more tests and clean up domain block controller () 2023-10-31 09:40:30 +00:00
github-actions[bot] e5b7ae9576
New Crowdin Translations (automated) () 
Co-authored-by: GitHub Actions <noreply@github.com>
 2023-10-31 08:43:17 +00:00
Claire 6c52f8286b
Fix posts from force-sensitized accounts being able to trend () 2023-10-30 22:32:25 +00:00
github-actions[bot] a918208ec6
New Crowdin Translations (automated) () 
Co-authored-by: GitHub Actions <noreply@github.com>
 2023-10-30 14:19:25 +00:00
Ricardo Trindade 33f8c1c5eb
Remove version check from update cache_concern.rb () 2023-10-30 14:04:12 +00:00
Matt Jankowski eae5c7334a
Extract class from CSP configuration/initialization () 2023-10-27 16:20:40 +00:00
Jonathan de Jong 1cc512909c
Have `Follow` activities bypass availability () 
Co-authored-by: Claire <claire.github-309c@sitedethib.com>
 2023-10-27 14:55:00 +00:00
Claire 93e4cdc31b
Fix hashtag matching pattern matching some URLs () 2023-10-27 14:04:51 +00:00
SouthFox 08bdd5751e
Fix account click on detailed status () 2023-10-27 14:03:21 +00:00
Renaud Chaput 13d310e64d
Simplify column headers () 2023-10-27 13:21:07 +00:00
Matt Jankowski 1f5187e2e2
Misc spec/refactor to user mailer and user mailer spec () 2023-10-27 09:57:16 +00:00
Claire bbf46cc418
Fix error and incorrect URLs in `/api/v1/accounts/:id/featured_tags` for remote accounts () 2023-10-27 08:35:21 +00:00
Jeong Arm 8f998cd96a
Handle featured collections without items () 2023-10-27 02:36:22 +00:00
Eugen Rochko fa7e64df1d
Fix various icon styles in web UI () 2023-10-26 23:37:58 +00:00
Matt Jankowski 12550a6a28
Use `Rails.env.local?` shorthand method to check env () 2023-10-26 21:20:41 +00:00
Simon Rapilly 2d8f759a34
Add HTML lang attribute to preview card descriptions () 2023-10-26 20:34:15 +00:00
Claire d2f52f7f64
Fix report processing notice not mentioning the report number when performing a custom action () 2023-10-26 17:03:31 +00:00
Mark T. Tomczak ba8dcb50fe
Issue 26048: swap "muting" and "blocking" list options in settings -> Data Exports () 2023-10-26 14:08:25 +00:00
Claire 75255c01fc
Fix error when trying to delete already-deleted file with OpenStack Swift () 2023-10-26 13:09:48 +00:00
github-actions[bot] 3427b51d63
New Crowdin Translations (automated) () 
Co-authored-by: GitHub Actions <noreply@github.com>
 2023-10-26 11:05:47 +00:00
Renaud Chaput 537442853f
Use a context to propagate column-related Props, and remove `forceUpdate` usage () 2023-10-26 11:00:10 +00:00
Matt Jankowski 3ca974e101
Use `next` keyword in field loop in admin/accounts/index view () 2023-10-26 10:52:14 +00:00
Claire 49b8433c56
Fix confusing screen when visiting a confirmation link for an already-confirmed email () 2023-10-25 21:33:44 +00:00
Claire 36c8570e50 Fix HAML linting issue 2023-10-25 20:01:51 +02:00
Claire 62620956d5 Merge commit '9a3d047f3e604e581e18346424569e28fc9c5b96' into glitch-soc/merge-upstream 2023-10-25 19:59:17 +02:00
Claire 235a4cfdc8
Fix batch attachment deletion when using OpenStack Swift () 2023-10-25 13:55:57 +00:00
Renaud Chaput a4e6fe36cb
Add missing ban icons () 2023-10-25 12:47:37 +00:00
Matt Jankowski 70dbf84b9b
Solve simplest haml-lint `Rubocop` lints () 2023-10-25 12:38:01 +00:00
Matt Jankowski c926f5fd67
Fix haml-lint `UnnecessaryStringOutput` for views () 2023-10-25 12:01:00 +00:00
Renaud Chaput 85d4846d8a [Glitch] Fix `<ColumnBackButtonSlim>` 
Port cb92cdf9af to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2023-10-25 12:22:59 +02:00
Claire 6e9f89e5b6 Merge commit 'c85e0a6b047f1a72ad970bc04c4e1be3f028b3d1' into glitch-soc/merge-upstream 
Conflicts:
- `app/javascript/packs/admin.jsx`:
  Upstream fixed `@rails/ujs` imports.
  Already taken care of in 8a131fb7bc
- `app/javascript/packs/public.jsx`:
  Upstream fixed `@rails/ujs` imports.
  Already taken care of in 8a131fb7bc
 2023-10-25 12:18:45 +02:00
Claire ba527c071f Merge commit '134de736dcbc6aa613fd5aec21d983d92d8b0be8' into glitch-soc/merge-upstream 
Conflicts:
- `app/javascript/mastodon/features/compose/components/poll_form.jsx`:
  Upstream changed how icons are handled, including on a line modified by
  glitch-soc to bump the number of poll options.
  Applied upstream's change, while keeping the increased number of poll
  options.
 2023-10-25 12:14:24 +02:00
github-actions[bot] c85e0a6b04
New Crowdin Translations (automated) () 
Co-authored-by: GitHub Actions <noreply@github.com>
 2023-10-25 07:36:07 +00:00
Matt Jankowski cec7f0ed72
Remove unused `#error_explanation` id from error partials () 2023-10-25 07:12:32 +00:00
Renaud Chaput cb92cdf9af
Fix `<ColumnBackButtonSlim>` () 2023-10-24 20:43:55 +00:00
Renaud Chaput f08ca3f042
Fix missing icon props () 2023-10-24 20:43:06 +00:00
Matt Jankowski bc3afb6311
Update `rails/ujs` delegate method usage () 2023-10-24 20:38:19 +00:00
Claire b19d4eb43d Fix HAML linting issues 2023-10-24 20:53:58 +02:00
Claire 8123e86623 [Glitch] Fix double scroll bars in some columns in advanced interface 
Port 37bbd3c106 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2023-10-24 20:46:11 +02:00
Claire b73e4b59fc [Glitch] Fix history handling not properly handling states after update to react-router v5 
Port 15182d1e5e to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2023-10-24 20:34:30 +02:00
たいち ひ c6f990997d [Glitch] Rewrite `emoji_unicode_mapping_light` to TS 
Port 9482810703 to glitch-soc

Co-authored-by: taichi.fukuda ひ <taichi.fukuda@systemi.co.jp>
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2023-10-24 20:33:55 +02:00
Claire 4ef66d6538 Merge commit '15182d1e5e595b21c47b48c5d258f30a0251e753' into glitch-soc/merge-upstream 
Conflicts:
- `.rubocop_todo.yml`:
  glitch-soc had extra ignores.
  Removed them.
 2023-10-24 20:31:20 +02:00
Claire 8a131fb7bc Fix `@rails/ujs` imports 2023-10-24 20:23:31 +02:00
Claire 4b0fb764c3 Merge commit 'e93a75f1a11d6dfdcbd39dbdc22526c5508ad881' into glitch-soc/merge-upstream 
Conflicts and ported changes:
- updated `@rails/ujs` imports
 2023-10-24 19:59:19 +02:00
Eugen Rochko 134de736dc
Change icons in web UI () 
Co-authored-by: Renaud Chaput <renchap@gmail.com>
 2023-10-24 17:45:08 +00:00
Claire e25cc4deb7 Merge commit '379115e601361c2b5da775fbf28b7dff9dc02e71' into glitch-soc/merge-upstream 
Conflicts:
- `config/navigation.rb`:
  Conflict due to glitch-soc having extra navigation items for its theming
  system.
  Ported upstream changes.
 2023-10-24 19:31:14 +02:00
Eugen Rochko 69ea596e55 [Glitch] Fix explore page reloading when you navigate back to it in web UI 
Port d9503a1965 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2023-10-24 19:22:39 +02:00
Claire e6c3d3c744 Merge commit 'd9503a1965a16328b62ea7bf0bb54e87cbe30d29' into glitch-soc/merge-upstream 2023-10-24 19:21:01 +02:00
Claire 57c0de949b Merge commit '8b770ce8110e6cd609a6769c66210d95e291e3e5' into glitch-soc/merge-upstream 
Conflicts:
- `config/initializers/content_security_policy.rb`:
  Upstream changed how asset host CSP directives are used, and glitch-soc has
  a pretty different CSP file.
  It may be worth reconsidering the differences between upstream and glitch-soc
  but for now, just port the change.
 2023-10-24 19:17:20 +02:00
Claire 787d5ad386 Merge commit 'bcae7442757845191c0e82b61cd1d0cd3ca860d1' into glitch-soc/merge-upstream 
Conflicts:
- `yarn.lock`:
  Caused by a glitch-soc-only dependency (`exif-js`).
  Kept it.
 2023-10-24 19:05:18 +02:00
Claire 5323f0eeca [Glitch] Fix incorrect proptypes from react-router-v5 update 
Port 0ad66175bf to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2023-10-24 19:03:16 +02:00
Renaud Chaput 9325cb5759 [Glitch] Convert `<Button>` to Typescript 
Port 9d45a444f9 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2023-10-24 19:03:16 +02:00
Eugen Rochko 1138d44c7d [Glitch] Fix missing background behind dismissable banner in web UI 
Port 33bd8eccd5 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2023-10-24 18:46:08 +02:00
Claire b0c76eaadd Merge commit '0ad66175bf59a34b03d9ab2347181548d07089ea' into glitch-soc/merge-upstream 
Conflicts:
- `app/javascript/mastodon/features/compose/components/compose_form.jsx`:
  Upstream changed one import, close to a glitch-soc-only import to handle
  different max character counts.
  Ported upstream's change.
 2023-10-24 18:41:20 +02:00
Claire 15182d1e5e
Fix history handling not properly handling states after update to react-router v5 () 2023-10-24 13:24:57 +00:00
Matt Jankowski 714e3ae5b5
Use Rails 7.1 `normalizes` feature () 2023-10-24 10:06:10 +00:00
github-actions[bot] 50b7ea810e
New Crowdin Translations (automated) () 
Co-authored-by: GitHub Actions <noreply@github.com>
 2023-10-24 09:51:34 +00:00
Matt Jankowski e923bb9ec9
Use `ENV.fetch` in views, fixes rubocop haml-lint issue () 2023-10-24 09:30:14 +00:00
たいち ひ 9482810703
Rewrite `emoji_unicode_mapping_light` to TS () 
Co-authored-by: taichi.fukuda ひ <taichi.fukuda@systemi.co.jp>
 2023-10-24 08:06:14 +00:00
Matt Jankowski e93a75f1a1
Rails 7.1 update () 2023-10-23 17:58:29 +00:00
Claire 379115e601
Add SELF_DESTRUCT env variable to process self-destructions in the background () 2023-10-23 15:46:21 +00:00
Eugen Rochko d9503a1965
Fix explore page reloading when you navigate back to it in web UI () 2023-10-23 17:07:13 +02:00
Claire 8b770ce811
Add warnings to report action logs () 2023-10-23 14:30:46 +02:00
Claire 99f2534cee
Add support for displaying unknown servers on /admin/instances/:domain () 2023-10-23 14:27:57 +02:00
Claire bcae744275
Fix some link anchors being recognized as hashtags () 2023-10-23 14:19:38 +02:00
Claire 0ad66175bf
Fix incorrect proptypes from react-router-v5 update () 2023-10-23 11:39:53 +02:00
github-actions[bot] 70fd819935
New Crowdin Translations (automated) () 
Co-authored-by: GitHub Actions <noreply@github.com>
 2023-10-23 10:04:54 +02:00
Matt Jankowski b0213472df
Validate allowed schemes on preview card URLs () 2023-10-23 09:50:02 +02:00
Renaud Chaput 9d45a444f9
Convert `<Button>` to Typescript () 2023-10-23 09:43:00 +02:00
Renaud Chaput d6eacb79c6 [Glitch] Upgrade to react-router v5 
Port 1b70d7ed7c to glitch-soc

Co-authored-by: Claire <claire.github-309c@sitedethib.com>
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2023-10-21 22:14:24 +02:00
Claire 245513d630 Merge commit '1b70d7ed7c0fd3a9fcf028bf76b8c62ac8b3897f' into glitch-soc/merge-upstream 2023-10-21 14:33:33 +02:00
Matt Jankowski ab0fb81479
Configure brakeman to ignore url safe preview card urls () 2023-10-20 15:32:16 +02:00
Claire 13688539bc
Fix processing LDSigned activities from actors with unknown public keys () 2023-10-20 10:45:46 +02:00
github-actions[bot] 284c719f64
New Crowdin Translations (automated) () 
Co-authored-by: GitHub Actions <noreply@github.com>
 2023-10-20 10:11:40 +02:00
Eugen Rochko 33bd8eccd5
Fix missing background behind dismissable banner in web UI () 2023-10-20 04:08:13 +02:00
Renaud Chaput 5d9df170cf [Glitch] Do not display the navigation banner in the logo container 
Port 126cd7705d to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2023-10-19 20:50:44 +02:00
Claire cc000c8859 Merge commit '126cd7705dbeca5712da941a72661e26c189658b' into glitch-soc/merge-upstream 2023-10-19 20:48:22 +02:00
Brian Campbell 1a3248dc90 [Glitch] Consider shown and pending status in explore prompt calculation 
Port f76e5111f0 to glitch-soc

Co-authored-by: Brian Campbell <brcampbell@beta.team>
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2023-10-19 20:23:08 +02:00
Renaud Chaput 41f58e945c [Glitch] The `class` props should be `className` 
Port 10df97c542 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2023-10-19 20:23:08 +02:00
Renaud Chaput 1b70d7ed7c
Upgrade to react-router v5 () 
Co-authored-by: Claire <claire.github-309c@sitedethib.com>
 2023-10-19 19:44:55 +02:00
Renaud Chaput 126cd7705d
Do not display the navigation banner in the logo container () 2023-10-19 19:36:08 +02:00
Claire 74fd46d3ab Merge commit '9f218c9924b883207a3463a29314c92032cf06df' into glitch-soc/merge-upstream 2023-10-19 19:14:04 +02:00
Jeong Arm 68401fc426 [Glitch] Support "in:public" search filter 
Port ad44d832b8 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2023-10-19 18:56:18 +02:00
Matt Jankowski 9f218c9924
Refactor appeal partial to avoid brakeman XSS warning () 2023-10-19 17:25:54 +02:00
Matt Jankowski bcd0171e5e
Fix `Lint/UselessAssignment` cop () 2023-10-19 16:55:06 +02:00
github-actions[bot] 1ffd5a98a9
New Crowdin Translations (automated) () 
Co-authored-by: GitHub Actions <noreply@github.com>
 2023-10-19 14:31:25 +02:00
Brian Campbell f76e5111f0
Consider shown and pending status in explore prompt calculation () 
Co-authored-by: Brian Campbell <brcampbell@beta.team>
 2023-10-19 14:25:57 +02:00
Renaud Chaput 10df97c542
The `class` props should be `className` () 2023-10-19 13:22:44 +02:00
Emelia Smith 7c3fea7275
Feature: Allow token introspection without read scope () 2023-10-18 14:10:07 +02:00
github-actions[bot] 4612576c68
New Crowdin Translations (automated) () 
Co-authored-by: GitHub Actions <noreply@github.com>
 2023-10-18 11:08:10 +02:00
Matt Jankowski 63a2a4b074
Fix `Performance/DeletePrefix` cop () 2023-10-18 10:32:09 +02:00
Claire 63179f0bf4 Merge commit '5ef26d8fd50081c642b858a82bf0c5431b1c7e83' into glitch-soc/merge-upstream 2023-10-17 21:59:58 +02:00
Stanislas Signoud 8bbbd012d4 [Glitch] Fix missing redirections to make sure /home redirect to the advanced UI 
Port 935d54124e to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2023-10-17 21:48:36 +02:00
Claire c10a667ac2 Merge commit '935d54124e80e9fe5365c724e5c8827a2b3ed5b3' into glitch-soc/merge-upstream 2023-10-17 21:42:49 +02:00
Claire b867d4581e Merge commit 'c91c0175db1cc8b954a977d29472886234ce9586' into glitch-soc/merge-upstream 
Conflicts:
- `spec/controllers/api/v1/timelines/tag_controller_spec.rb`:
  Glitch-soc had a few extra lines in this file to account for a different
  default setting. This file got replaced by
  `spec/requests/api/v1/timelines/tag_spec.rb`, into which the glitch-soc
  additions were moved too.

Additional changes:
- `spec/requests/api/v1/statuses/sources_spec.rb`:
  Add glitch-soc-only attribute `content_type`.
 2023-10-17 21:35:07 +02:00
Claire 656a41db2a Merge commit '77098c6f1c25958960df98a1510b28352a39704f' into glitch-soc/merge-upstream 
Conflicts:
- `README.md`:
  Upstream has updated its README, we have a completely different one.
  Kept ours.
- `app/views/auth/sessions/two_factor.html.haml`:
  Upstream refactored stuff and the conflict is because of glitch-soc's theming
  system.
  Ported upstream changes while accounting for the different theming system.
 2023-10-17 20:59:18 +02:00
Jeong Arm ad44d832b8
Support "in:public" search filter () 2023-10-17 16:12:03 +02:00
Stanislas Signoud 935d54124e
Fix missing redirections to make sure /home redirect to the advanced UI () 2023-10-17 14:59:07 +02:00
Matt Jankowski 19900f647e
Add coverage for `UnreservedUsernameValidator` () 2023-10-17 13:05:28 +02:00
Matt Jankowski 33b073f77d
Extract partials from `admin/reports/show` view () 2023-10-16 18:07:17 +02:00
Matt Jankowski 8d0f12f776
Extract partials from `admin/accounts/show` view () 2023-10-16 18:02:15 +02:00
Matt Jankowski 08a376cbcb
Fix `Style/CombinableLoops` cop () 2023-10-16 16:36:28 +02:00
Matt Jankowski c91c0175db
Extract `card` partial from `disputes/strikes/show` view () 2023-10-16 16:04:29 +02:00
Matt Jankowski f5bc1f20e2
Add coverage for `ExistingUsernameValidator` () 
Co-authored-by: Claire <claire.github-309c@sitedethib.com>
 2023-10-16 15:41:23 +02:00
Claire 299aa71c8f
Fix handling of `inLanguage` attribute in preview card processing () 2023-10-16 15:24:14 +02:00
github-actions[bot] 13456efd7b
New Crowdin Translations (automated) () 
Co-authored-by: GitHub Actions <noreply@github.com>
 2023-10-16 11:31:52 +02:00
KMY（雪あすか） 45bdd60f3c
Fix when unfollow a tag, my post also disappears from the home timeline () 2023-10-13 11:15:47 +02:00
github-actions[bot] 773d25e8df
New Crowdin Translations (automated) () 
Co-authored-by: GitHub Actions <noreply@github.com>
 2023-10-13 11:01:40 +02:00
Claire c86ad45660
Change PWA start URL from `/home` to `/` () 2023-10-12 16:47:18 +02:00
github-actions[bot] c348b904a5
New Crowdin Translations (automated) () 
Co-authored-by: GitHub Actions <noreply@github.com>
 2023-10-12 10:07:40 +02:00
Matt Jankowski d4c2dca874
Fix haml-lint `InstanceVariables` rule for auth/sessions/two_factor/o… () 2023-10-12 09:44:20 +02:00
Matt Jankowski d7a8f6b658
Fix haml-lint `InstanceVariables` rule for relationships/account () 2023-10-11 17:06:26 +02:00
github-actions[bot] f1ae72ba46
New Crowdin Translations (automated) () 
Co-authored-by: GitHub Actions <noreply@github.com>
 2023-10-11 16:37:01 +02:00
Matt Jankowski f9abe700e7
Fix haml-lint `InstanceVariables` rule for auth/registrations/status () 2023-10-11 16:20:26 +02:00
Matt Jankowski 66becf9a1e
Fix haml-lint `InstanceVariables` rule for admin/reports/actions () 2023-10-11 15:58:33 +02:00
Claire 7d2cd7195b
Add variable delay before link verification of remote account links () 2023-10-11 15:14:18 +02:00
Claire 99c72830bc [Glitch] Fix scroll position in thread view reseting when closing a modal 
Port 9d1c3d0678 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2023-10-10 19:53:59 +02:00
Claire 3735e6f79d Merge commit '27e84c069112a3d2abfad947642457cc997a261a' into glitch-soc/merge-upstream 2023-10-10 19:53:41 +02:00
Claire 27e84c0691
Fix duplicate reports being sent when reporting some remote posts () 2023-10-10 16:00:50 +02:00
Claire 9d1c3d0678
Fix scroll position in thread view reseting when closing a modal () 2023-10-10 11:35:32 +02:00
github-actions[bot] 1a2a4c389f
New Crowdin Translations (automated) () 
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 () 2023-10-09 16:46:09 +02:00
Renaud Chaput 774e1189d2
Change `eslint` config to autofix missing comma and indentation in JS files () 2023-10-09 13:38:29 +02:00
Claire c310374a2f
Fix clicking on already-opened thread post scrolling to the top of the thread () 2023-10-09 12:21:02 +02:00
github-actions[bot] 89b48681cf
New Crowdin Translations (automated) () 
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` () 2023-10-06 17:46:04 +02:00
Michael Stanclift 3171afc36a
Add Elasticsearch index size to Admin dashboard () 
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 () 2023-10-06 12:58:16 +02:00
Claire 4d59dfb1c6
Fix some remote posts getting truncated () 2023-10-06 12:58:02 +02:00
github-actions[bot] e0b54ed3e1
New Crowdin Translations (automated) () 
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 () 2023-10-05 16:33:54 +02:00
github-actions[bot] 32ab474472
New Crowdin Translations (automated) () 
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 () 2023-10-05 13:10:17 +02:00
Claire 40ba6e119b
Fix Vary headers not being set on some redirects () 2023-10-05 09:50:08 +02:00
github-actions[bot] 8e4251f9e7
New Crowdin Translations (automated) () 
Co-authored-by: GitHub Actions <noreply@github.com>
 2023-10-04 10:53:04 +02:00
gunchleoc 68ec1d180a
Fix language sorting in settings () 2023-10-04 09:23:50 +02:00
Matt Jankowski c676bc91e9
Dont match mention in url query string () 
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 () 2023-10-03 15:52:47 +02:00
Matt Jankowski e715da6d25
Fix haml-lint Rubocop `Rails/*` cops () 2023-10-03 15:00:40 +02:00
Claire 37bbd3c106
Fix double scroll bars in some columns in advanced interface () 2023-10-03 13:12:39 +02:00
Claire ceb365c419
Fix boosts of local users being filtered in account timelines () 2023-10-03 12:21:42 +02:00
Claire 4e55001e65
Add a short-lived lock to trend refresh scheduler () 2023-10-03 12:21:32 +02:00
Michael Stanclift 5a437edc7f
Keep version string displayed without breakpoints in UI () 2023-10-03 11:52:21 +02:00
David Aaron 6320c52630
Change min age of backup policy from 1 week to 6 days () 2023-10-03 11:48:57 +02:00
Jakob Gillich 770fd993ec
Fix importer returning negative row estimates () 2023-10-03 10:47:50 +02:00
github-actions[bot] e95d25e101
New Crowdin Translations (automated) () 
Co-authored-by: GitHub Actions <noreply@github.com>
 2023-10-03 10:47:28 +02:00
Claire 5e56f3db65
Change some worker lock TTLs () 2023-10-03 10:09:00 +02:00
Claire 7e7d6e695b
Fix incorrectly keeping outdated update notices absent from the API endpoint () 2023-10-02 16:42:52 +02:00
Claire 1e2d4975cf
Fix import progress not updating on certain failures () 2023-10-02 16:20:04 +02:00
github-actions[bot] ee866ec0e0
New Crowdin Translations (automated) () 
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 () 2023-10-02 13:18:16 +02:00
Claire d80a819fc6
Fix explore prompt appearing because of posts being received out of order () 2023-09-29 15:51:36 +02:00
github-actions[bot] 695e42de0d
New Crowdin Translations (automated) () 
Co-authored-by: GitHub Actions <noreply@github.com>
 2023-09-29 10:04:18 +02:00
Matt Jankowski 340f1a68be
Simplify instance presenter view access () 2023-09-28 16:52:37 +02:00
Matt Jankowski 2016c5d912
Fix deprecation warning about `rewhere: true` being default behavior (Rails 7.1 prep) () 2023-09-28 16:52:23 +02:00
Matt Jankowski 99e289f03f
Fix include `Rails.application.routes.url_helpers` (Rails 7.1 prep) () 2023-09-28 16:52:11 +02:00
Matt Jankowski 89a17878ef
Fix haml-lint `InstanceVariables` rule for admin/roles/_form () 2023-09-28 16:36:24 +02:00
Matt Jankowski 9d56c1949b
Fix haml-lint `InstanceVariables` rule for admin/webhooks/_form () 2023-09-28 16:23:35 +02:00
Matt Jankowski 3060bfa4bd
Extract filename and csv helper methods from `Form::Import` () 2023-09-28 16:22:05 +02:00
Matt Jankowski e6b903b21e
Fix haml-lint `InstanceVariables` rule for invites/_form () 2023-09-28 15:40:28 +02:00
Claire 1da3c588ca
Fix link handling of mentions in user profiles when logged out () 2023-09-28 15:29:07 +02:00
Claire 686406cc2d
Fix filtering audit log for entries about disabling 2FA () 2023-09-28 13:41:24 +02:00
github-actions[bot] b93ce7d8b3
New Crowdin Translations (automated) () 
Co-authored-by: GitHub Actions <noreply@github.com>
 2023-09-28 10:44:16 +02:00
Christian Schmidt 6d0767558a
Make notification respect reduce-motion () 2023-09-28 10:39:38 +02:00
Michael Stanclift 7fddeca190
Fix retention dashboard not displaying correct month () 2023-09-28 10:16:15 +02:00
gunchleoc ce79caca4e
Only strip country code when language not listed in SUPPORTED_LOCALES () 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 () 2023-09-26 11:25:01 +02:00
github-actions[bot] 5ea3e8e765
New Crowdin Translations (automated) () 
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 () 2023-09-25 19:21:07 +02:00
Claire a001ae2f39
Fix explore prompt sometimes showing up when the home TL is loading () 2023-09-25 17:07:01 +02:00
Claire 3de6dcf634
Add redirection on `/deck` URLs for logged-out users () 2023-09-25 15:07:10 +02:00
Claire 38753acaa5
Fix width of large text icon buttons () 2023-09-25 15:06:57 +02:00
Claire 1bd7455d81
Fix inefficient queries in “Follows and followers” as well as several admin pages () 2023-09-25 15:06:43 +02:00
gunchleoc 88fa8e710a
Fix line wrapping of language selection button with long locale codes () 2023-09-25 12:59:37 +02:00
github-actions[bot] 736fe75346
New Crowdin Translations (automated) () 
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 () 2023-09-22 18:18:46 +02:00
Renaud Chaput b93ffb74bb
Improve modals reducer types () 2023-09-22 16:41:50 +02:00
Claire 39da3d86f8
Fix ActiveRecord using two connection pools when no replica is defined () 2023-09-22 16:01:59 +02:00
github-actions[bot] e824585523
New Crowdin Translations (automated) () 
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 () 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 () 2023-09-21 13:51:21 +02:00
github-actions[bot] effe4728cf
New Crowdin Translations (automated) () 
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 () 2023-09-20 18:25:16 +02:00
github-actions[bot] 61fe25fe74
New Crowdin Translations (automated) () 
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 ()"

This reverts commit 8891d8945d.

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

This reverts commit fd284311e7.
 2023-09-19 16:52:52 +02:00
github-actions[bot] 73ecc4de6e
New Crowdin Translations (automated) () 
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 () 2023-09-19 12:25:39 +02:00
github-actions[bot] 67eaaa4b90
New Crowdin Translations (automated) () 
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 () 
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) () 
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 () 2023-09-18 11:20:09 +02:00
Claire 893755f4cb
Fix error in Web UI when server rules cannot be fetched () 2023-09-18 09:51:52 +02:00
Claire 392c07f2bf
Fix `Setting.authorized_fetch` not being properly taken into consideration () 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 () 2023-09-15 19:54:32 +02:00
Claire 2a4fcc51fd
Fix dismiss button overlapping with text in dismissable banners () 2023-09-15 19:53:28 +02:00
Claire e4f5114aaf
Fix obsolete cache key in status cache invalidation logic () 2023-09-15 19:52:28 +02:00
Claire 9693c271f1
Fix processing of `min_id` and `max_id` parameters in `/api/v2/search` () 2023-09-15 10:23:24 +02:00
Eugen Rochko fc6825055b
Change score half-life for trending posts from 2 hours to 1 hour () 2023-09-14 09:20:14 +02:00
github-actions[bot] 921c6fe654
New Crowdin Translations (automated) () 
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 () 2023-09-13 11:22:53 +02:00
Plastikmensch 075ee0b2d4
Fix wrong gradient color on collapsed private mentions () 
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 () 2023-09-12 18:27:01 +02:00
Claire 287520453c
Fix front-end bug when processing relationship-related account actions () 2023-09-12 16:30:03 +02:00
CSDUMMI 9a70cac9de
Fix by adding the domain of the current SSO provider to the form-action CSP () 2023-09-12 13:04:51 +02:00
Renaud Chaput 0712cc2b99
Fix Redux types () 2023-09-12 12:18:19 +02:00
Santiago Kozak d2cfcdd09e
Fix recent search items not handling overflows correctly () 2023-09-12 04:20:57 +02:00
Claire 20ac5be1c1
Fix error on `status` type notification (bell icon) () 2023-09-11 20:23:13 +02:00
Renaud Chaput bd06c13204
Convert `actions/account_notes` into Typescript () 2023-09-11 16:09:22 +02:00
Claire 91040da871
Fix confusing behavior of mute button and volume slider in web UI () 2023-09-08 20:39:29 +02:00
Claire 33c8708a1a
Change `GET /api/v1/directory` to use database replica rather than primary () 2023-09-08 17:01:02 +02:00
Eugen Rochko 3a679844e4
Fix `account_id`, `max_id` and `min_id` params not working in search () 2023-09-08 14:25:00 +02:00
Claire 81caafbe84
Fix performances of profile directory () 2023-09-07 18:55:25 +02:00
Claire 355e3fb529
Simplify `Account.by_recent_status` and `Account.by_recent_sign_in` scopes () 2023-09-07 15:38:11 +02:00
Eugen Rochko 9b2bc3d1de
Add recent searches in web UI () 2023-09-07 14:56:19 +02:00
Eugen Rochko a90b0056cc
Fix `#hashtag` matching on individual components in search () 2023-09-07 12:53:41 +02:00
Colette Kerr 8a9d7aeb1e
Change DCT method used for JPEG encoding to float () 2023-09-07 05:26:25 +02:00
Eugen Rochko f3a2e15f8e
Fix mute button and volume slider feeling disconnected in web UI () 2023-09-07 04:24:24 +02:00
Eugen Rochko 1f141f656d
Change onboarding prompt to use full width of banner in web UI () 2023-09-07 04:24:11 +02:00
Eugen Rochko 398635c0c4
Fix paragraph margins resulting in irregular read-more cut-off in web UI () 2023-09-07 04:24:01 +02:00
Claire 1f99d86287
Fix blocked domain appears from account feed () 
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 () 
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 () 2023-09-06 17:25:39 +02:00
Claire 9c1ef8302a
Add some information about Full-text search being disabled in search popout () 2023-09-06 17:23:58 +02:00
Claire b83e487502
Fix moderator rights inconsistencies () 2023-09-06 16:40:19 +02:00
Claire 223f9ca665
Fix crash when encountering invalid URL () 2023-09-06 12:17:51 +02:00
Claire 09ec9c6aa5
Downgrade signature verification debug logging from `warn` to `debug` () 2023-09-06 12:17:22 +02:00
Eugen Rochko d8bdba2f9f
Add `in:` to search popout in web UI () 2023-09-06 06:46:26 +02:00
Eugen Rochko 9d290c23d2
Remove obfuscation of reply count in web UI () 2023-09-05 23:57:03 +02:00
Eugen Rochko 5d20733d8d
Add infinite scrolling for search results in web UI () 2023-09-05 23:54:24 +02:00
Claire 548c032dbb
Improve interaction modal error handling () 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 () 2023-09-05 20:05:58 +02:00
Claire cab4cbfa5c
Fix “Scoped order is ignored, it's forced to be batch order.” warnings () 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 () 
Co-authored-by: Claire <claire.github-309c@sitedethib.com>
 2023-09-04 17:20:35 +02:00
gunchleoc ac3f310f4b
Remove kmr from language selection () 2023-09-04 13:21:43 +02:00
Eugen Rochko 68b4e36c82
Fix `#hashtag` matching non-hashtagged posts in search () 2023-09-04 10:18:45 +02:00
Stanislas Signoud a106c46478
Fix light mode colors for advanced interface banner () 2023-09-04 10:14:01 +02:00
Eugen Rochko e52d0494ee
Fix `before:`, `after:` and `during:` failing when time zone not set () 2023-09-04 09:09:25 +02:00
Plastikmensch 6b0702a3b5
Add `recent` to search props () 
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 () 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 () 2023-09-02 09:02:44 +02:00
Claire 16681e0f20
Add admin notifications for new Mastodon versions () 2023-09-01 17:47:07 +02:00
Claire 9e26cd5503
Add `authorized_fetch` server setting in addition to env var () 2023-09-01 15:41:10 +02:00
Claire 6c4c72497a
Fix search popout including full-text search instructions when full-text search is disabled () 2023-09-01 15:13:27 +02:00
Claire 5c0a9aac3b
Revert to using primary database in IndexingScheduler () 2023-09-01 15:09:44 +02:00
Eugen Rochko e754083e8a
Fix unmatched quotes and prefixes causing search to fail () 2023-09-01 09:43:12 +02:00
Eugen Rochko 872145d1c2
Fix not being able to invoke phrase search using unicode quotation marks () 2023-09-01 09:27:03 +02:00