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
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
d7ab5655ef
Replace `render_symbol` method with `inline_svg_tag` usage ( #29647 )
2024-03-19 14:17:18 +00:00
bc6f9befde
Change “Notifications” settings page to “E-mail notifications” ( #29646 )
2024-03-19 13:40:16 +00:00
bd06963c16
Slightly increase font weight of favorite/boost numbers in detailed statuses ( #29648 )
2024-03-19 13:39:30 +00:00
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
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
6c68c3c0ce
Introduce `inline_svg` gem, minimal usage, prep for material design icons ( #29612 )
2024-03-19 09:03:15 +00:00
4e61bce4e9
New Crowdin Translations (automated) ( #29641 )
...
Co-authored-by: GitHub Actions <noreply@github.com>
2024-03-19 08:36:52 +00:00
72e1162eb3
Flatten `olm` section of context helper extension map ( #29638 )
2024-03-19 08:22:46 +00:00
cf08a438e7
Add badge on account card in report moderation interface when account is already suspended ( #29592 )
2024-03-19 08:20:53 +00:00
39839baec3
Fix mute for 30 days ( #29640 )
2024-03-19 08:18:14 +00:00
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
6d2986017e
Remove unused `active_nav_class` helper method ( #29617 )
2024-03-18 13:24:59 +00:00
d5063072c3
Revert friends-of-friends follow recommendation query to using a CTE ( #29619 )
2024-03-18 12:57:21 +00:00
b5115850bb
Move repeated `insert_pagination_headers` method to api base class ( #29606 )
2024-03-18 10:11:53 +00:00
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
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
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
6ebb971aad
Update dependency async-mutex to ^0.5.0 ( #29552 )
...
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
2024-03-18 09:59:31 +00:00
9142805ca8
Remove deprecated `@types/…` packages ( #29633 )
2024-03-18 09:58:28 +00:00
a732ef21b0
Update dependency json-schema to v4.2.0 ( #29604 )
...
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
2024-03-18 09:37:33 +00:00
1164c7005e
Update dependency http-link-header to v1.1.3 ( #29625 )
...
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
2024-03-18 09:33:54 +00:00
f279ff3bd6
Update `rspec-*` gems ( #29616 )
2024-03-18 09:19:38 +00:00
307efe41c6
Update dependency axios to v1.6.8 ( #29613 )
...
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
2024-03-18 09:15:03 +00:00
92855948a0
Remove unused `show_landing_strip?` helper method ( #29618 )
2024-03-18 08:55:54 +00:00
ecdbf15ebe
Remove unused `link_to_older` and `link_to_newer` helper methods ( #29620 )
2024-03-18 08:54:46 +00:00
97a229d5f4
Update dependency nokogiri to v1.16.3 ( #29622 )
...
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
2024-03-18 08:53:29 +00:00
a0fcac9652
Update dependency postcss to v8.4.36 ( #29628 )
...
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
2024-03-18 08:49:34 +00:00
2f653174b1
Update libretranslate/libretranslate Docker tag to v1.5.6 ( #29629 )
...
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
2024-03-18 08:49:18 +00:00
cf7d412367
Update peter-evans/create-pull-request action to v6.0.2 ( #29630 )
...
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
2024-03-18 08:48:37 +00:00
5d3d525d0e
Update DefinitelyTyped types (non-major) ( #29631 )
...
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
2024-03-18 08:48:13 +00:00
04817e965a
New Crowdin Translations (automated) ( #29623 )
...
Co-authored-by: GitHub Actions <noreply@github.com>
2024-03-18 08:47:48 +00:00
ada2ac411a
Merge pull request #2681 from ClearlyClaire/glitch-soc/merge-upstream
...
Merge upstream changes up to d702a03a0c
2024-03-16 22:34:16 +01:00
82c2af0356
Fix `user_mailer.welcome.hashtags_recent_count` not having plural form ( #29607 )
2024-03-16 16:38:20 +00:00
726e7ad024
Fix extra separator besides favourite count on private posts ( #29605 )
2024-03-16 01:11:59 +00:00
c511e52d1e
[Glitch] Add “Learn more” on block modal to inform of federation caveats
...
Port d702a03a0c
2024-03-15 22:58:16 +01:00
80fda17868
[Glitch] Change mute, block and domain block confirmations in web UI
...
Port ec19d0a14b
2024-03-15 22:58:01 +01:00
3beba00c4e
[Glitch] Change Explore icon to compass in advanced interface
...
Port be7a68b095
2024-03-15 22:50:15 +01:00
b8f476256e
Merge commit 'd702a03a0c35fc631a0fa456532946e6751cbbfd' into glitch-soc/merge-upstream
2024-03-15 22:48:04 +01:00
7fe848b161
[Glitch] Convert `packs/public.jsx` to Typescript
...
Port c76ae7a5c0
2024-03-15 22:43:36 +01:00
1b06e4e1b7
Merge commit 'c76ae7a5c0d247264afa896f081db9d1fd278711' into glitch-soc/merge-upstream
...
Conflicts:
- `app/javascript/packs/public.jsx`:
In glitch-soc, this file was split across the following files:
- `app/javascript/packs/public.jsx`
- `app/javascript/core/embed.js`
- `app/javascript/core/settings.js`
Update all those files accordingly, as well as the related `theme.yml` files.
2024-03-15 22:37:55 +01:00
6ee7a64465
Reduce differences with upstream in “public” pack ( #2680 )
...
* Reduce differences with upstream
* Further reduce pack differences with upstream
2024-03-15 22:21:57 +01:00
2cdac2bc38
Merge pull request #2679 from ClearlyClaire/glitch-soc/merge-upstream
...
Merge upstream changes up to 407287573c
2024-03-15 21:38:07 +01:00
d702a03a0c
Add “Learn more” on block modal to inform of federation caveats ( #29614 )
2024-03-15 19:09:21 +00:00
a32f992182
[Glitch] Add domain information to profiles in web UI
...
Port 407287573c
2024-03-15 18:51:41 +01:00
2c622497c2
Merge commit '407287573c9c602c5490224c43639b39edf7d48a' into glitch-soc/merge-upstream
2024-03-15 18:48:39 +01:00
ec19d0a14b
Change mute, block and domain block confirmations in web UI ( #29576 )
2024-03-15 17:36:41 +00:00
ed1af46108
Merge pull request #2677 from ClearlyClaire/glitch-soc/merge-upstream
...
Merge upstream changes
2024-03-15 18:23:54 +01:00
Claire