mirrors
/
mastodon-glitch
mirror of https://github.com/glitch-soc/mastodon
3
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
21,418 Commits
69 Branches
20 Tags
374 MiB
Commit Graph

21418 Commits (b21322b406bf798954c55a72bb93c111c4643694)

Author SHA1 Message Date
Claire 0e76b919b5 Merge commit '0cea7a623be470c51d7a162265f44f5a3e149275' into glitch-soc/merge-upstream 2024-04-06 21:48:35 +02:00
Claire a844a6a577 [Glitch] Change `AccountRelationshipSeveranceEvent` model to store lost followers and following counts separately 
Port dfa43707eb to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2024-04-06 21:39:04 +02:00
Claire c3a128f31e Remove strings already defined upstream 2024-04-06 21:25:04 +02:00
Claire afaad0755f [Glitch] Remove setting for unfollow confirmation modal, and make it unconditional 
Port 37ca59815c to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2024-04-06 21:17:45 +02:00
Claire 1d1c3a808a Merge commit '6c381f20b1d52c96525cbd5c41b0c972c3394a48' into glitch-soc/merge-upstream 
Conflicts:
- `app/models/user_settings.rb`:
  Upstream removed a setting textually adjacent to a glitch-soc-only setting.
  Removed the setting glitch-soc removed.
 2024-04-06 21:01:40 +02:00
Claire f635cde756 [Glitch] Change new modals to allow vertical scrolling 
Port de6c9e0fcd to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2024-04-06 20:43:43 +02:00
Claire 0f8b33238f [Glitch] Change icon of severed relationships notifications 
Port 387c78ddf9 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2024-04-06 20:39:07 +02:00
Renaud Chaput 576c085ea0 [Glitch] Add the role ID to the badge component 
Port ec1e770fea to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2024-04-06 20:35:29 +02:00
Claire 777984faeb Merge commit '119c7aa0df1e1d26bdee1701250d23a7af9e9136' into glitch-soc/merge-upstream 2024-04-06 20:34:07 +02:00
Claire f14b6f3d99 [Glitch] Fix duplicate translation string for severed relationships 
Port 885d0faf83 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2024-04-06 20:31:09 +02:00
Claire 903dc53522 Merge commit '05eda8d19330a9c27c0cf07de19a87edff269057' into glitch-soc/merge-upstream 2024-04-06 20:01:25 +02:00
Eugen Rochko 375af259a2 [Glitch] Change back button to always appear in advanced web UI 
Port be52633ee4 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2024-04-06 19:55:13 +02:00
Claire 67842ffb22 Merge commit '01464074c91f9b7a720928fc4ee912be3d8002d2' into glitch-soc/merge-upstream 2024-04-06 19:54:11 +02:00
Claire 0f966209ca [Glitch] Add notifications of severed relationships 
Port 44bf7b8128 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2024-04-06 19:38:57 +02:00
Claire f2b23aa5f3 Merge commit '954b470fbce3fbe4b9b42992b03425fa24d6a2ad' into glitch-soc/merge-upstream 
Conflicts:
- `config/navigation.rb`:
  Upstream added a navigation item while glitch-soc had an additional one.
  Ported upstream changes.
 2024-04-06 19:35:21 +02:00
Claire 9451997fa8
Refactor notifications code to reduce differences with upstream (#2692) 
* Merge back `Follow` notification component

* Merge back part of `FollowRequestContainer` notification container

* Reduce differences with upstream in the `mention` case

* Reduce differences with upstream in the `favourite` case

* Reduce differences with upstream in the `reblog` case

* Reduce differences with upstream in the `status` case

* Reduce differences with upstream in the `update` case

* Reduce differences with upstream in the `poll` case

* Merge back `AdminSignup` notification component

* Merge back `AdminReport` notification container
 2024-04-06 19:34:30 +02:00
github-actions[bot] 8a64406d34
New Crowdin Translations (automated) (#2668) 
* New Crowdin translations

* Fix bogus translation files

---------

Co-authored-by: GitHub Actions <noreply@github.com>
Co-authored-by: Claire <claire.github-309c@sitedethib.com>
 2024-04-06 18:18:06 +02:00
Jeong Arm 4045c069f8
Use `public_visibility` (#29847) 2024-04-04 07:31:30 +00:00
renovate[bot] 91d3b3fb25
Update dependency sass to v1.74.1 (#29846) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2024-04-04 07:25:30 +00:00
renovate[bot] 58dfc12af2
Update babel monorepo to v7.24.4 (#29840) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2024-04-04 07:23:53 +00:00
nicolas c6da3ee828
Makes the star icon rotate around its actual centre axis (#29844) 2024-04-03 21:10:02 +00:00
Matt Jankowski cde3206478
Simplify feature loop in welcome mailer (#29760) 2024-04-03 20:10:59 +00:00
renovate[bot] 37d984b8bf
Update eslint (non-major) (#29820) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
Co-authored-by: Renaud Chaput <renchap@gmail.com>
 2024-04-03 18:05:39 +00:00
Michael Stanclift e284417349
Fix blue border on emoji/language search in Safari & Chrome (#29832) 2024-04-03 15:19:10 +00:00
Michael Stanclift 5d67247061
Fix language and emoji search field background colors on light theme (#29828) 2024-04-03 14:22:50 +00:00
github-actions[bot] 56d13069cd
New Crowdin Translations (automated) (#29836) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2024-04-03 09:04:29 +00:00
renovate[bot] 4233ee1f59
Update dependency pg to v8.11.5 (#29833) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2024-04-02 21:33:43 +00:00
renovate[bot] 54c7d1ad14
Update dependency pg-connection-string to v2.6.4 (#29814) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2024-04-02 21:22:22 +00:00
Matt Jankowski a7b637768e
Regenerate rubocop todo with version 1.62.1 (#29830) 2024-04-02 19:56:54 +00:00
renovate[bot] 88c3664889
Update dependency rubocop-performance to v1.21.0 (#29804) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2024-04-02 17:00:07 +00:00
Matt Jankowski d27eb181f6
Reduce `LineLength` from 320 to 300 (#29636) 2024-04-02 15:50:57 +00:00
renovate[bot] f8b03c3925
Update dependency faker to v3.3.1 (#29829) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2024-04-02 15:48:27 +00:00
Matt Jankowski edde54e991
Update stoplight to version 4.1.0 (#28366) 2024-04-02 15:47:40 +00:00
Matt Jankowski 921c4c1273
Match comment style of `FeedManager` list/tags checks (#29639) 
Co-authored-by: Renaud Chaput <renchap@gmail.com>
 2024-04-02 14:07:31 +00:00
Claire 0b9d4103cb
Fix contrast in notification request badge (#29826) 2024-04-02 14:05:46 +00:00
Matt Jankowski f87959ab50
Fix `RSpec/LetSetup` cop in api/v1/timelines/public spec (#28972) 2024-04-02 14:05:02 +00:00
Claire 54119570e6
Remove dependency on posix-spawn (#18559) 2024-04-02 14:02:07 +00:00
Matt Jankowski 34489591ec
Add `max_pinned_statuses` to instances serializer and api response (#29441) 2024-04-02 13:54:11 +00:00
Matt Jankowski f56309f5f0
Add `by_latest_used` scope, move admin area recent IPs to partial (#29497) 2024-04-02 13:51:34 +00:00
renovate[bot] c70c39cad0
Update docker/dockerfile Docker tag to v1.7 (#27993) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2024-04-02 13:47:15 +00:00
renovate[bot] b0692d994f
Update dependency letter_opener to v1.10.0 (#29189) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2024-04-02 13:31:03 +00:00
renovate[bot] 695dded7ed
Update dependency aws-sdk-s3 to v1.146.1 (#28961) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2024-04-02 13:29:46 +00:00
renovate[bot] f6e24bbd79
Update dependency postcss-preset-env to v9.5.4 (#29825) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2024-04-02 12:13:43 +00:00
Renaud Chaput b4d991adaa
Use integers and not numbers in notification policy API counters (#29810) 2024-04-02 10:06:26 +00:00
renovate[bot] d05f62391d
Update dependency public_suffix to v5.0.5 (#29824) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2024-04-02 10:04:32 +00:00
Renaud Chaput e47a3d00fe
Add API types for status and related objects (#29792) 2024-04-02 10:03:33 +00:00
Renaud Chaput 07635228e2
Fix Redux Middleware types (#29800) 2024-04-02 09:56:03 +00:00
Matt Jankowski a3fe82e359
Rename cop `RSpec/Rails/HttpStatus` to `RSpecRails/HttpStatus` (#29806) 2024-04-02 09:34:44 +00:00
github-actions[bot] c717747603
New Crowdin Translations (automated) (#29812) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2024-04-02 09:26:06 +00:00
Michael Stanclift fa9574086d
Fix search box color on light theme (#29808) 2024-04-02 09:15:31 +00:00