Commit Graph

867 Commits (7c7355a964f51f175b31b4e371c5e69fa329066f)

Author SHA1 Message Date
kouhai dev 7c7355a964 th: Merge remote-tracking branch 'glitch/main' (d033fab0ed) 2023-08-26 22:00:56 -07:00
Antonin Del Fabbro 6f5721e5c9 [Glitch] Change opacity of the delete icon in the search field to be more visible
Port b271c3da75 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2023-08-24 21:51:13 +02:00
Claire 7c2c2918ac [Glitch] Fix layout of the closed registrations modal
Port 38ec8071fa to glitch-soc

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

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2023-08-24 21:36:42 +02:00
Claire 0b50d6b662 [Glitch] Fix unfollow icon styling in advanced column
Port bd7f631918 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2023-08-22 18:48:23 +02:00
Claire 523ec5b349 Remove leftover `.orig` files that were mistakenly included (#2379) 2023-08-22 18:24:03 +02:00
Eugen Rochko b4dcac1315 [Glitch] Change header of hashtag timelines in web UI
Port 2ddf268e73 to glitch-soc

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

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

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

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2023-08-13 19:04:07 +02:00
kouhai dev f8028d190e th: Merge remote-tracking branch 'glitch/main' 2023-08-12 18:54:16 -07:00
Claire 9efddd203b Fix border-radius on “sensitive media” overlay for full-width media (#2364) 2023-08-12 09:30:27 +02:00
Plastikmensch 58d0a8f79b Remove .orig files (#2347)
Signed-off-by: Plastikmensch <plastikmensch@users.noreply.github.com>
2023-07-31 07:43:46 +02:00
Claire 87cee068ee 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 540cced981 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 cf170761e7 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 70b4eb5baa to glitch-soc

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

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

Port 257fadcec4 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 d5a4ef8459 to glitch-soc

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

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

Port bfa1f2a86f 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 633071d1d5 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 5db70fc514 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 a90d7ac141 to glitch-soc

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

* [Glitch] fix poll input active style

Port e6475f79d7 to glitch-soc

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

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

Port 1d29569d89 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 b977a84e19 to glitch-soc

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

* [Glitch] Preserve translation on status re-import

Port 28eb5e8f4c to glitch-soc

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

* [Glitch] Fix missing GIF badge in account gallery

Port aa8d37c422 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 20809d5d8c 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 fc10002966 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 d025cce982 Port search popout changes from upstream (#2333)
* [Glitch] Change search pop-out in web UI

Port d22e712648 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 4e6e4bcc4d 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 6fa4054a5d (rename to ts), 0886856bd2 (code style change), 9094a65fd4 (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 17f5142a44 [Glitch] Change interaction modal in web UI
Port 20809d5d8c 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
Eugen Rochko 1ed1d5fcff [Glitch] Add published date and author to news on the explore screen in web UI
Port b977a84e19 to glitch-soc

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

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

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

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

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

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

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2023-07-30 15:18:07 +02:00
Claire eed89bc69f Change error boundary to upstream's (#2323) 2023-07-27 19:25:07 +02:00
Plastikmensch 6fb2982ec0 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
Plastikmensch 21fed4601f 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 15561ace1b Fix relationship-tag background color (#2322) 2023-07-23 14:40:37 +02:00
Claire cf9d76d4a1 Fix glitch local settings navigation items not being proper buttons (#2320) 2023-07-23 14:31:16 +02:00
Michael Stanclift df2d18c52a [Glitch] Fix for "follows you" indicator in light web UI not readable
Port 40e20d687a to glitch-soc

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

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2023-07-17 13:01:07 +02:00
Claire 84c0f759d3 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
Claire c1bd8248c4 [Glitch] Fix follow link style in embeds
Port fc6d89573c to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2023-07-13 14:52:36 +02:00
Claire 385eb83893 [Glitch] Upgrade to Prettier 3
Port 9094a65fd4 to glitch-soc
2023-07-13 14:01:40 +02:00
Claire bd06bdf164 Fix various CSS issues 2023-07-12 19:13:31 +02:00
Trevor Wolf 7e3d2d3b4f [Glitch] fix buttons showing inconsistent styles
Port 29c29410d2 to glitch-soc

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

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2023-07-12 15:47:43 +02:00
Eugen Rochko 70c0ba7e5b [Glitch] Change label and design of sensitive and unavailable media in web UI
Port 7496c1b655 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2023-07-12 15:43:10 +02:00
Renaud Chaput 5cd9e85fbb [Glitch] Fix translate button position
Port 7ff696d848 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2023-07-12 15:05:24 +02:00
Ariadne Conill 2829c732f6 th: Merge gitea.treehouse.systems:mirrors/mastodon-glitch into merge-2023-07-07 2023-07-07 21:56:29 +00:00
Claire 4c1f5cd847 Fix incorrect secondary button size (#2276) 2023-07-07 09:50:06 +02:00
kouhai dev 234f7cc84e th: Merge remote-tracking branch 'glitch/main'
fixes: CVE-2023-36459
fixes: CVE-2023-36460
fixes: CVE-2023-36461
fixes: CVE-2023-36462
fixes: GHSA-55j9-c3mp-6fcq
fixes: GHSA-9928-3cp5-93fm
fixes: GHSA-9pxv-6qvf-pjwc
fixes: GHSA-ccm4-vgcc-73hp
2023-07-06 12:12:21 -07:00
Eugen Rochko 3676bc46da [Glitch] Fix regression of icon button colors in web UI
Port 12c6337c96 to glitch-soc

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

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2023-07-05 13:30:52 +02:00
kouhai dev fa0f31a8fb th: merge glitch again (lol) 2023-07-05 01:14:10 -07:00
Renaud Chaput bbe08e28cd [Glitch] Improve dismissable banner buttons when they dont fit on 1 line
Port ff9ed824db 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 fa093eef89 [Glitch] Fix search not being easily findable on smaller screens in web UI
Port 1924660c5b to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2023-06-27 13:21:14 +02:00
Eugen Rochko 5660204731 [Glitch] Add onboarding prompt when home feed too slow in web UI
Port ad92c48d71 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2023-06-25 17:40:01 +02:00
Eugen Rochko 85041b74fb [Glitch] Fix CAPTCHA page not following design pattern of sign-up flow
Port 239ee4f5d1 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2023-06-18 12:11:58 +02:00
Plastikmensch a804371e21 [Glitch] Change "direct message" nomenclature to "private mention" in web UI (#2158)
Port 868d478b1b to glitch-soc

Signed-off-by: Plastikmensch <plastikmensch@users.noreply.github.com>
2023-06-11 13:33:45 +02:00
Eugen Rochko b5872b0686 [Glitch] Change design of dropdowns in web UI
Port 7abfddd8a5 to glitch-soc

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