Izalia Mae
b9bce199fe
Merge branch 'main' of https://git.barkshark.xyz/mirror/mastodon
2024-03-21 22:26:46 -04:00
Claire
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
Claire
821fc53583
Fix error when attempting to delete posts that triggered a notification request ( #29666 )
2024-03-20 19:53:20 +01:00
Claire
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
Claire
49089817b0
[Glitch] Fix “Explore” icon in navigation bar not being filled when selected
...
Port 3211e960ac
2024-03-20 18:33:00 +01:00
Claire
c0aade79b0
Merge commit '8a1423a47425dd67615e94bdfd13d64b53676da4' into glitch-soc/merge-upstream
2024-03-20 18:31:09 +01:00
Claire
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
Claire
8a1423a474
Allow unblocking email addresses from any matching account ( #29305 )
2024-03-20 14:38:00 +00:00
Matt Jankowski
0a33be39c1
Reduce LineLength for react_admin_component helpers ( #29650 )
2024-03-20 13:45:34 +00:00
Claire
3211e960ac
Fix “Explore” icon in navigation bar not being filled when selected ( #29649 )
2024-03-20 13:31:31 +00:00
Claire
df777776f1
[Glitch] Fix blockquote color in reply indicator
...
Port 50fd94f481
2024-03-20 12:32:37 +01:00
Claire
5e039b96c3
[Glitch] Fix emoji picker placement on limited-height viewports
...
Port 94f7ae192b
2024-03-20 12:31:45 +01:00
Claire
72baa1e5c3
[Glitch] Fix emoji picker dropdown background and borders
...
Port e36e7ea243
2024-03-20 12:31:12 +01:00
Claire
100cb46608
[Glitch] Fix icon and styling in browser notifications banner
...
Port a583317df6
2024-03-20 12:30:45 +01:00
Claire
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
Claire
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
Claire
50fd94f481
Fix blockquote color in reply indicator ( #29659 )
2024-03-20 11:20:23 +00:00
Claire
a68dd889fe
Add back support for old browsers ( #29654 )
2024-03-20 11:07:10 +00:00
Claire
94f7ae192b
Fix emoji picker placement on limited-height viewports ( #29651 )
2024-03-20 11:07:02 +00:00
Claire
e36e7ea243
Fix emoji picker dropdown background and borders ( #29653 )
2024-03-20 11:06:50 +00:00
Claire
a583317df6
Fix icon and styling in browser notifications banner ( #29658 )
2024-03-20 11:06:44 +00:00
github-actions[bot]
6c0b1a41a1
New Crowdin Translations (automated) ( #29657 )
...
Co-authored-by: GitHub Actions <noreply@github.com>
2024-03-20 08:39:42 +00:00
renovate[bot]
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
Claire
d0dfcc9f3a
Fix build issue with glitch-soc's theming system
2024-03-19 19:58:04 +01:00
Claire
da2bb672ce
[Glitch] Change filtered icon from “archive” to “inventory 2”
...
Port ffc5be4820
2024-03-19 19:35:17 +01:00
Claire
8b3bd12def
[Glitch] Slightly increase font weight of favorite/boost numbers in detailed statuses
...
Port bd06963c16
2024-03-19 19:35:17 +01:00
Claire
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
Jeong Arm
ccf2f2cb75
[Glitch] Fix mute for 30 days
...
Port 39839baec3
2024-03-19 19:24:51 +01:00
Claire
d959501ef1
[Glitch] Fix extra separator besides favourite count on private posts
...
Port 726e7ad024
2024-03-19 19:24:34 +01:00
Claire
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
Matt Jankowski
4c84891453
Pull out full li element into admin/status_edits/status_edit partial ( #29499 )
2024-03-19 16:11:10 +00:00
Claire
ffc5be4820
Change filtered icon from “archive” to “inventory 2” ( #29652 )
2024-03-19 15:39:26 +00:00
Matt Jankowski
62e266fbd6
Add BrowserDetection model concern ( #29513 )
2024-03-19 15:39:14 +00:00
Matt Jankowski
d7ab5655ef
Replace render_symbol method with inline_svg_tag usage ( #29647 )
2024-03-19 14:17:18 +00:00
Claire
bc6f9befde
Change “Notifications” settings page to “E-mail notifications” ( #29646 )
2024-03-19 13:40:16 +00:00
Claire
bd06963c16
Slightly increase font weight of favorite/boost numbers in detailed statuses ( #29648 )
2024-03-19 13:39:30 +00:00
renovate[bot]
42cdd0c095
Update babel monorepo to v7.24.1 ( #29645 )
...
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
2024-03-19 13:00:39 +00:00
renovate[bot]
caee5e4d6a
Update dependency core-js to v3.36.1 ( #29642 )
...
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
2024-03-19 09:11:38 +00:00
Matt Jankowski
6c68c3c0ce
Introduce inline_svg gem, minimal usage, prep for material design icons ( #29612 )
2024-03-19 09:03:15 +00:00
github-actions[bot]
4e61bce4e9
New Crowdin Translations (automated) ( #29641 )
...
Co-authored-by: GitHub Actions <noreply@github.com>
2024-03-19 08:36:52 +00:00
Matt Jankowski
72e1162eb3
Flatten olm section of context helper extension map ( #29638 )
2024-03-19 08:22:46 +00:00
Claire
cf08a438e7
Add badge on account card in report moderation interface when account is already suspended ( #29592 )
2024-03-19 08:20:53 +00:00
Jeong Arm
39839baec3
Fix mute for 30 days ( #29640 )
2024-03-19 08:18:14 +00:00
renovate[bot]
4ce714adea
Update dependency irb to v1.12.0 ( #29519 )
...
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
2024-03-18 14:09:18 +00:00
Matt Jankowski
6d2986017e
Remove unused active_nav_class helper method ( #29617 )
2024-03-18 13:24:59 +00:00
Claire
d5063072c3
Revert friends-of-friends follow recommendation query to using a CTE ( #29619 )
2024-03-18 12:57:21 +00:00
Matt Jankowski
b5115850bb
Move repeated insert_pagination_headers method to api base class ( #29606 )
2024-03-18 10:11:53 +00:00
renovate[bot]
58ce0002cd
Update dependency typescript to v5.4.2 ( #29632 )
...
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
2024-03-18 10:00:29 +00:00
renovate[bot]
7f17162242
Update dependency cssnano to v6.1.0 ( #29514 )
...
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
2024-03-18 10:00:13 +00:00
renovate[bot]
0dd1c772a8
Update dependency cocoon-js-vanilla to v1.5.1 ( #29461 )
...
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
2024-03-18 09:59:45 +00:00
Izalia Mae
