c3a128f31e
Remove strings already defined upstream
2024-04-06 21:25:04 +02:00
afaad0755f
[Glitch] Remove setting for unfollow confirmation modal, and make it unconditional
...
Port 37ca59815c
2024-04-06 21:17:45 +02:00
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
f635cde756
[Glitch] Change new modals to allow vertical scrolling
...
Port de6c9e0fcd
2024-04-06 20:43:43 +02:00
0f8b33238f
[Glitch] Change icon of severed relationships notifications
...
Port 387c78ddf9
2024-04-06 20:39:07 +02:00
576c085ea0
[Glitch] Add the role ID to the badge component
...
Port ec1e770fea
2024-04-06 20:35:29 +02:00
777984faeb
Merge commit '119c7aa0df1e1d26bdee1701250d23a7af9e9136' into glitch-soc/merge-upstream
2024-04-06 20:34:07 +02:00
f14b6f3d99
[Glitch] Fix duplicate translation string for severed relationships
...
Port 885d0faf83
2024-04-06 20:31:09 +02:00
903dc53522
Merge commit '05eda8d19330a9c27c0cf07de19a87edff269057' into glitch-soc/merge-upstream
2024-04-06 20:01:25 +02:00
375af259a2
[Glitch] Change back button to always appear in advanced web UI
...
Port be52633ee4
2024-04-06 19:55:13 +02:00
67842ffb22
Merge commit '01464074c91f9b7a720928fc4ee912be3d8002d2' into glitch-soc/merge-upstream
2024-04-06 19:54:11 +02:00
0f966209ca
[Glitch] Add notifications of severed relationships
...
Port 44bf7b8128
2024-04-06 19:38:57 +02:00
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
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
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
6c381f20b1
Restore advanced filter bar setting ( #29737 )
2024-03-24 14:17:06 +00:00
37ca59815c
Remove setting for unfollow confirmation modal, and make it unconditional ( #29373 )
2024-03-22 16:24:04 +00:00
58376eedda
Remove obsolete `admin` and `moderator` columns from `users` table ( #29718 )
2024-03-22 16:22:36 +00:00
d71d26a3c9
Reattribute notification-related records if possible when merging accounts ( #29694 )
2024-03-22 16:21:53 +00:00
de6c9e0fcd
Change new modals to allow vertical scrolling ( #29644 )
2024-03-22 16:21:50 +00:00
387c78ddf9
Change icon of severed relationships notifications ( #29712 )
2024-03-22 15:45:04 +00:00
dfa43707eb
Change `AccountRelationshipSeveranceEvent` model to store lost followers and following counts separately ( #29714 )
2024-03-22 15:44:31 +00:00
34f293475e
Fix results/query in `api/v1/featured_tags/suggestions` ( #29597 )
2024-03-22 15:08:27 +00:00
5db5fa879b
New Crowdin Translations (automated) ( #29708 )
...
Co-authored-by: GitHub Actions <noreply@github.com>
2024-03-22 14:50:03 +00:00
8c1d29df7e
Use `has_many through` instead of `delegate` for ARSE<>SR ( #29672 )
2024-03-22 14:43:35 +00:00
ec1e770fea
Add the role ID to the badge component ( #29707 )
2024-03-22 11:59:35 +00:00
05eda8d193
Remove severed relationship notifications for single account suspensions ( #29700 )
2024-03-21 21:53:24 +00:00
75f34b80a8
Clean up notification requests when deleting accounts ( #29693 )
2024-03-21 14:12:26 +00:00
885d0faf83
Fix duplicate translation string for severed relationships ( #29689 )
2024-03-21 10:06:21 +00:00
c007dd5dd2
New Crowdin Translations (automated) ( #29687 )
...
Co-authored-by: GitHub Actions <noreply@github.com>
2024-03-21 09:57:45 +00:00
77897cd24c
Use existing `SeveredRelationship.about_local_account` scope in more places ( #29673 )
2024-03-21 08:36:49 +00:00
cdd168f5d3
Update `enum` away from deprecated ( #29678 )
2024-03-21 08:32:35 +00:00
821fc53583
Fix error when attempting to delete posts that triggered a notification request ( #29666 )
2024-03-20 19:53:20 +01:00
49089817b0
[Glitch] Fix “Explore” icon in navigation bar not being filled when selected
...
Port 3211e960ac
2024-03-20 18:33:00 +01:00
c0aade79b0
Merge commit '8a1423a47425dd67615e94bdfd13d64b53676da4' into glitch-soc/merge-upstream
2024-03-20 18:31:09 +01:00
be52633ee4
Change back button to always appear in advanced web UI ( #29669 )
2024-03-20 17:21:03 +00:00
f4d753aedf
Fix error in severed relationship event serializer ( #29670 )
2024-03-20 17:14:53 +00:00
98a2bb8be2
Fix issue with severed relationships notifications ( #29668 )
2024-03-20 17:02:09 +00:00
954b470fbc
Fix error when attempting to delete posts that triggered a notification request ( #29666 )
2024-03-20 16:48:24 +00:00
d4449cc682
Fix account_relationship_severance_events unique indexes ( #29665 )
2024-03-20 16:08:34 +00:00
44bf7b8128
Add notifications of severed relationships ( #27511 )
2024-03-20 15:37:21 +00:00
8a1423a474
Allow unblocking email addresses from any matching account ( #29305 )
2024-03-20 14:38:00 +00:00
0a33be39c1
Reduce `LineLength` for `react_admin_component` helpers ( #29650 )
2024-03-20 13:45:34 +00:00
3211e960ac
Fix “Explore” icon in navigation bar not being filled when selected ( #29649 )
2024-03-20 13:31:31 +00:00
df777776f1
[Glitch] Fix blockquote color in reply indicator
...
Port 50fd94f481
2024-03-20 12:32:37 +01:00
5e039b96c3
[Glitch] Fix emoji picker placement on limited-height viewports
...
Port 94f7ae192b
2024-03-20 12:31:45 +01:00
72baa1e5c3
[Glitch] Fix emoji picker dropdown background and borders
...
Port e36e7ea243
2024-03-20 12:31:12 +01:00
100cb46608
[Glitch] Fix icon and styling in browser notifications banner
...
Port a583317df6
2024-03-20 12:30:45 +01:00
eb3aed9545
Merge commit '50fd94f481cf23a81662140afe99df2fbf1149be' into glitch-soc/merge-upstream
...
Conflicts:
- `yarn.lock`:
Upstream touched a dependency that is on an adjacent line to a
glitch-soc-only dependency in that file.
Updated as upstream did.
2024-03-20 12:27:52 +01:00
50fd94f481
Fix blockquote color in reply indicator ( #29659 )
2024-03-20 11:20:23 +00:00
Claire