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
01464074c9
Update dependency autoprefixer to v10.4.19 ( #29682 )
...
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
2024-03-21 08:32:31 +00:00
3f363c61bc
Update dependency postcss to v8.4.38 ( #29684 )
...
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
2024-03-21 08:32:25 +00:00
7434c9c276
Fix the relationships controller spec, since it requires an extra model now ( #29671 )
2024-03-21 08:28:37 +00:00
39bac24cb7
Remove reference to deleted haml lint todo file ( #29675 )
2024-03-20 22:12:11 +00:00
62722238c9
Lock `i18n` gem to version `1.14.1` ( #29674 )
2024-03-20 22:10:50 +00:00
3341db939c
Merge pull request #2686 from ClearlyClaire/glitch-soc/cherry-pick
...
Fix error when attempting to delete posts that triggered a notification request (#29666 )
2024-03-20 20:13:24 +01:00
821fc53583
Fix error when attempting to delete posts that triggered a notification request ( #29666 )
2024-03-20 19:53:20 +01:00
58a606e0ab
Merge pull request #2685 from ClearlyClaire/glitch-soc/merge-upstream
...
Merge upstream changes up to 8a1423a474
2024-03-20 19:43:22 +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
8cac5d8f78
Merge pull request #2684 from ClearlyClaire/glitch-soc/merge-upstream
...
Merge upstream changes up to 50fd94f481
2024-03-20 18:03:06 +01: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
99c9db5f67
Update babel monorepo to v7.24.3 ( #29660 )
...
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
2024-03-20 15:48:24 +00:00
27a6fa7b0e
Update dependency cssnano to v6.1.1 ( #29661 )
...
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
2024-03-20 15:44:36 +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
d6f5702d66
Merge pull request #2683 from ClearlyClaire/glitch-soc/merge-upstream
...
Merge upstream changes up to ffc5be4820
2024-03-20 12:20:34 +01:00
50fd94f481
Fix blockquote color in reply indicator ( #29659 )
2024-03-20 11:20:23 +00:00
a68dd889fe
Add back support for old browsers ( #29654 )
2024-03-20 11:07:10 +00:00
94f7ae192b
Fix emoji picker placement on limited-height viewports ( #29651 )
2024-03-20 11:07:02 +00:00
e36e7ea243
Fix emoji picker dropdown background and borders ( #29653 )
2024-03-20 11:06:50 +00:00
a583317df6
Fix icon and styling in browser notifications banner ( #29658 )
2024-03-20 11:06:44 +00:00
6c0b1a41a1
New Crowdin Translations (automated) ( #29657 )
...
Co-authored-by: GitHub Actions <noreply@github.com>
2024-03-20 08:39:42 +00:00
5f1380415f
Update dependency postcss to v8.4.37 ( #29656 )
...
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
2024-03-20 08:19:08 +00:00
d0dfcc9f3a
Fix build issue with glitch-soc's theming system
2024-03-19 19:58:04 +01:00
da2bb672ce
[Glitch] Change filtered icon from “archive” to “inventory 2”
...
Port ffc5be4820
2024-03-19 19:35:17 +01:00
8b3bd12def
[Glitch] Slightly increase font weight of favorite/boost numbers in detailed statuses
...
Port bd06963c16
2024-03-19 19:35:17 +01:00
885a4c73cb
[Glitch] Add badge on account card in report moderation interface when account is already suspended
...
Port cf08a438e7
2024-03-19 19:35:17 +01:00
ccf2f2cb75
[Glitch] Fix mute for 30 days
...
Port 39839baec3
2024-03-19 19:24:51 +01:00
d959501ef1
[Glitch] Fix extra separator besides favourite count on private posts
...
Port 726e7ad024
2024-03-19 19:24:34 +01:00
876aa35350
Merge commit 'ffc5be4820ed7bad4656489f096230dd7965140b' into glitch-soc/merge-upstream
...
Conflicts:
- `package.json`:
Upstream updated a dependency that is on an adjacent line to a
glitch-soc-only dependency in that file.
Updated as upstream did.
- `yarn.lock`:
Upstream updated a dependency that is on an adjacent line to a
glitch-soc-only dependency in that file.
Updated as upstream did.
2024-03-19 19:21:12 +01:00
4c84891453
Pull out full `li` element into admin/status_edits/status_edit partial ( #29499 )
2024-03-19 16:11:10 +00:00
ffc5be4820
Change filtered icon from “archive” to “inventory 2” ( #29652 )
2024-03-19 15:39:26 +00:00
62e266fbd6
Add `BrowserDetection` model concern ( #29513 )
2024-03-19 15:39:14 +00:00
Claire
github-actions[bot]
renovate[bot]
Matt Jankowski
Eugen Rochko
Jeong Arm