Claire
18556d3e9b
Merge commit '98237207e67697abffc6b141f2388e3d8c925260' into glitch-soc/merge-upstream
...
Conflicts:
- `app/helpers/application_helper.rb`:
Upstream refactored some helpers and moved them in another file.
Not a real conflict, but glitch-soc had adjacent glitch-only definitions.
Kept glitch-soc definitions where they are and moved upstream ones
as upstream did.
2024-08-22 19:54:20 +02:00
Emelia Smith
376088f6da
Add button to view the Hashtag on the instance from Hashtags in Moderation UI ( #31533 )
2024-08-22 08:42:33 +00:00
github-actions[bot]
f86d16adba
New Crowdin Translations (automated) ( #31536 )
...
Co-authored-by: GitHub Actions <noreply@github.com>
2024-08-22 08:04:56 +00:00
Claire
0cec9077a4
Merge commit 'edeae945c0c9d6318d489ab720587621545063d0' into glitch-soc/merge-upstream
...
Conflicts:
- `spec/requests/api/v2/instance_spec.rb`:
Upstream added a test for a new attribute, next to a line we modified
in glitch-soc because of a different default value.
Updated as upstream's did, keeping glitch-soc's default value.
2024-08-21 18:44:21 +02:00
github-actions[bot]
3994195fea
New Crowdin Translations (automated) ( #31521 )
...
Co-authored-by: GitHub Actions <noreply@github.com>
2024-08-21 07:19:16 +00:00
Claire
f5c0c32edd
Merge commit '9ba7c90151463a6e4f7952317253fe8c113e9b0a' into glitch-soc/merge-upstream
...
Conflicts:
- `app/javascript/material-icons/400-24px/chat.svg`:
Glitch-soc used this one but not upstream.
Upstream pulled a presumably more up-to-date version of the file.
Switched to upstream's version.
- `app/views/layouts/application.html.haml`:
Upstream removed use of font-awesome.
I hope we are ready.
- `app/views/layouts/embedded.html.haml`:
Upstream removed use of font-awesome.
I hope we are ready.
- `app/views/layouts/error.html.haml`:
Upstream removed use of font-awesome.
I hope we are ready.
2024-08-20 18:31:50 +02:00
github-actions[bot]
c75f7262ed
New Crowdin Translations (automated) ( #31504 )
...
Co-authored-by: GitHub Actions <noreply@github.com>
2024-08-20 07:59:21 +00:00
Claire
1760f84349
Merge commit '53c183f899b5382f1eebd72e34a090c30f8eba6a' into glitch-soc/merge-upstream
2024-08-19 18:25:31 +02:00
Claire
53c183f899
Reload notifications when accepted notifications are merged (streaming only) ( #31419 )
2024-08-19 15:59:06 +00:00
github-actions[bot]
c4e0a7dced
New Crowdin Translations (automated) ( #31463 )
...
Co-authored-by: GitHub Actions <noreply@github.com>
2024-08-19 08:29:48 +00:00
Claire
3ea00508ac
Merge commit '2d589a5ed445b474ab7cec27b0db2a331ed7bd49' into glitch-soc/merge-upstream
2024-08-16 20:06:59 +02:00
github-actions[bot]
9a24552732
New Crowdin Translations (automated) ( #31440 )
...
Co-authored-by: GitHub Actions <noreply@github.com>
2024-08-16 09:11:33 +00:00
Claire
169b35869f
Merge commit 'a1ddaa9ee96ab1d05f4e37f3472b0418e0d5628e' into glitch-soc/merge-upstream
2024-08-14 21:17:43 +02:00
github-actions[bot]
202f43ccc6
New Crowdin Translations (automated) ( #31411 )
...
Co-authored-by: GitHub Actions <noreply@github.com>
2024-08-14 07:04:01 +00:00
github-actions[bot]
862e793b45
New Crowdin Translations (automated) ( #31394 )
...
Co-authored-by: GitHub Actions <noreply@github.com>
2024-08-13 07:42:08 +00:00
Matt Jankowski
02df1b4e4a
Finish email allow/deny list naming migration ( #30530 )
2024-08-13 07:37:32 +00:00
Claire
83480df820
Merge commit 'b42661ba95b7872ba278fca9b0fee8faffd89e52' into glitch-soc/merge-upstream
...
Conflicts:
- `lib/sanitize_ext/sanitize_config.rb`:
Upstream added `<s>` to the list of allowed tags, the conflict is because
we have a different list of allowed tags.
Added `<s>` like upstream did.
2024-08-12 17:46:24 +02:00
Emelia Smith
b42661ba95
Add missing Appeals link under Moderation in navigiation ( #31071 )
2024-08-12 14:45:30 +00:00
Emelia Smith
a1f723a6a4
Add support for PKCE Extension in OmniAuth OIDC ( #31131 )
2024-08-12 14:32:52 +00:00
github-actions[bot]
3abb5c0eaa
New Crowdin Translations (automated) ( #31382 )
...
Co-authored-by: GitHub Actions <noreply@github.com>
2024-08-12 07:22:50 +00:00
Claire
f441b280dc
Merge commit '85152af95f51642bcef0ba781a1e7213d79e8f03' into glitch-soc/merge-upstream
2024-08-11 21:05:09 +02:00
github-actions[bot]
85152af95f
New Crowdin Translations (automated) ( #31377 )
...
Co-authored-by: GitHub Actions <noreply@github.com>
2024-08-11 18:51:39 +00:00
github-actions[bot]
634ab0bad0
New Crowdin Translations (automated) ( #31351 )
...
Co-authored-by: GitHub Actions <noreply@github.com>
2024-08-11 18:13:10 +00:00
Robin
c39a8e1061
Change “e-mail” to “email” in en.yml ( #31317 )
2024-08-10 09:32:57 +00:00
Emelia Smith
d3089018d5
Move Follow Recommendations to Trends menu, rename to Recommendations & Trends ( #31292 )
2024-08-10 09:17:10 +00:00
Claire
31a00c0c1a
Merge commit '658addcbf783f6baa922d11c9524ebb9ddbcbc59' into glitch-soc/merge-upstream
2024-08-09 17:15:32 +02:00
Claire
eaedd52def
Fix incorrect rate limit on PUT requests ( #31356 )
2024-08-09 14:48:05 +00:00
Claire
cbdd8edf68
Revamp notification policy options ( #31343 )
2024-08-09 13:30:55 +00:00
Jeong Arm
9bae237792
Change confirmation prompt on trending management ( #19626 )
2024-08-09 12:47:02 +00:00
Claire
dd2a991e24
Merge commit '079d681ac6f279f3a7a6be5c3734549f3be8f912' into glitch-soc/merge-upstream
...
Conflicts:
- `app/javascript/material-icons/400-24px/code.svg`:
Icon newly-introduced upstream.
Used upstream's more recent version.
- `app/javascript/material-icons/400-24px/mail.svg`:
Icon newly-introduced upstream.
Used upstream's more recent version.
- `app/javascript/material-icons/400-24px/manufacturing.svg`:
Icon newly-introduced upstream.
Used upstream's more recent version.
- `app/views/admin/settings/shared/_links.html.haml`:
Glitch-soc had extra menu items, ported the changes for them too.
- `config/navigation.rb`:
Glitch-soc had extra menu items, ported the changes for them too.
2024-08-08 19:30:16 +02:00
github-actions[bot]
0e4d3c0403
New Crowdin Translations (automated) ( #31337 )
...
Co-authored-by: GitHub Actions <noreply@github.com>
2024-08-08 13:54:10 +00:00
Matt Jankowski
abc4ed48f2
Replace more font-awesome
icons in navigation sidebar area ( #30974 )
2024-08-07 22:52:08 +00:00
Claire
06e034db15
Merge commit '670e4655d13975e0597bd1c74ebeeeeffc4edc37' into glitch-soc/merge-upstream
2024-08-07 19:22:25 +02:00
github-actions[bot]
fc964c9bfd
New Crowdin Translations (automated) ( #31321 )
...
Co-authored-by: GitHub Actions <noreply@github.com>
2024-08-07 09:32:16 +00:00
Claire
08adca0c63
Merge commit 'c8b9e60ec123c458efff83eedcfd07f067ef05ae' into glitch-soc/merge-upstream
2024-08-06 17:27:48 +02:00
github-actions[bot]
d15f46a0b8
New Crowdin Translations (automated) ( #31307 )
...
Co-authored-by: GitHub Actions <noreply@github.com>
2024-08-06 07:22:38 +00:00
github-actions[bot]
cb56a6dc7e
New Crowdin Translations (automated) ( #31276 )
...
Co-authored-by: GitHub Actions <noreply@github.com>
2024-08-05 07:43:04 +00:00
Claire
e67e07211f
Merge commit 'ad95c98054574080ac5d15584b3018d1db836531' into glitch-soc/merge-upstream
...
Conflicts:
- `package.json`:
Upstream removed their direct dependency `autoprefixer`, which was textually adjacent
to glitch-soc-only dependency `atrament`.
Removed direct dependency on `autoprefixer`.
- `yarn.lock`:
Upstream removed their direct dependency `autoprefixer`, which was textually adjacent
to glitch-soc-only dependency `atrament`.
Removed direct dependency on `autoprefixer`.
2024-08-02 18:09:48 +02:00
github-actions[bot]
caeae25b55
New Crowdin Translations (automated) ( #31261 )
...
Co-authored-by: GitHub Actions <noreply@github.com>
2024-08-02 07:01:04 +00:00
Claire
da5b45a573
Add endpoints to accept and dismiss multiple notification requests at once ( #31242 )
2024-08-01 12:36:54 +00:00
github-actions[bot]
584b1524dd
New Crowdin Translations (automated) ( #31237 )
...
Co-authored-by: GitHub Actions <noreply@github.com>
2024-08-01 09:27:24 +00:00
Claire
8dd671a977
Merge commit 'a50c8e951f03a8eb53957ad1c3703155b223ed24' into glitch-soc/merge-upstream
2024-07-31 18:16:01 +02:00
github-actions[bot]
520ff04248
New Crowdin Translations (automated) ( #31219 )
...
Co-authored-by: GitHub Actions <noreply@github.com>
2024-07-31 08:09:49 +00:00
Claire
1f796d129d
Merge commit '598ae4f2da86029b1c3c3e35e64b89873037b598' into glitch-soc/merge-upstream
...
Conflicts:
- `config/routes/api.rb`:
Upstream added an endpoint, textually close to a glitch-soc-only endpoint.
Ported upstream changes.
2024-07-30 20:47:34 +02:00
Claire
598ae4f2da
Add endpoints for unread notifications count ( #31191 )
2024-07-30 08:39:11 +00:00
Tim Rogers
2ce99c51dd
Fixed Rails route covering %40-encoded profile URL paths to not 404 ( #31184 )
2024-07-30 08:18:00 +00:00
github-actions[bot]
7d11a6c9b0
New Crowdin Translations (automated) ( #31206 )
...
Co-authored-by: GitHub Actions <noreply@github.com>
2024-07-30 08:15:40 +00:00
Claire
654187a995
Merge commit '1229d2907a4a7ee09ee42cd24043d74561507e0a' into glitch-soc/merge-upstream
2024-07-29 19:16:58 +02:00
Emelia Smith
c40e481169
Implement UI for Admin Search of Hashtags ( #30880 )
2024-07-29 15:49:44 +00:00
github-actions[bot]
ec5a860924
New Crowdin Translations (automated) ( #31169 )
...
Co-authored-by: GitHub Actions <noreply@github.com>
2024-07-29 08:24:15 +00:00