Claire
549ab089ee
Change grouped notifications API shape (take 2) ( #31214 )
2024-07-31 10:50:13 +00:00
Claire
288961bbb9
Change private mention icon for consistency in grouped notifications ( #31223 )
2024-07-31 10:26:43 +00: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
fd1bade135
Fix inconsistent dismiss icon for notification requests ( #31220 )
2024-07-31 07:52:59 +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
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
Essem
30899e050e
Fix reactions bar alignment in grouped notifications
2024-07-30 08:38:38 +02:00
Jeremy Kescher
afa0c78715
Merge branch 'refs/heads/glitch' into develop
...
# Conflicts:
# app/javascript/flavours/glitch/actions/interactions.js
2024-07-30 08:38:14 +02:00
Emelia Smith
ceb7972e6e
[Glitch] Implement UI for Admin Search of Hashtags
...
Port SCSS changes from c40e481169
2024-07-29 19:21:04 +02:00
Michael Stanclift
eae81d3254
[Glitch] Follow up tweaking of admin UI changes
...
Port 848a5ca53d
2024-07-29 19:19:29 +02: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
Michael Stanclift
848a5ca53d
Follow up tweaking of admin UI changes ( #31168 )
2024-07-29 08:10:23 +00:00
David Roetzel
0e18e1ba31
[Glitch] Decrease count of filtered notifications when notification requests are accepted or dismissed
...
Port dfd43869c9
2024-07-27 15:16:15 +02:00
Eugen Rochko
14bc73e94c
[Glitch] Change design of confirmation modals in web UI
...
Port 8818748b90
2024-07-27 15:16:15 +02:00
Claire
fb411b6d0f
Merge commit 'dd5379271410219de0806bb33e7cdfa427ea6988' into glitch-soc/merge-upstream
2024-07-27 13:19:38 +02:00
David Roetzel
dfd43869c9
Decrease count of filtered notifications when notification requests are accepted or dismissed ( #31149 )
2024-07-26 09:36:54 +00:00
github-actions[bot]
3793c845c9
New Crowdin Translations (automated) ( #31154 )
...
Co-authored-by: GitHub Actions <noreply@github.com>
2024-07-26 07:51:37 +00:00
Eugen Rochko
8818748b90
Change design of confirmation modals in web UI ( #30884 )
...
Co-authored-by: Renaud Chaput <renchap@gmail.com>
2024-07-25 17:05:54 +00:00
Claire
c94c5da7b4
Merge commit '4d374cf73096be1e5347e131c91c99842e3c6dbb' into glitch-soc/merge-upstream
2024-07-25 12:43:25 +02:00
github-actions[bot]
ef0e3e447a
New Crowdin Translations (automated) ( #31119 )
...
Co-authored-by: GitHub Actions <noreply@github.com>
2024-07-25 07:44:00 +00:00
Claire
6be21ae8ac
Fix double indent for post attachments and metadata in grouped notifications ( #2793 )
2024-07-24 22:35:39 +02:00
Michael Stanclift
2919d8b097
[Glitch] Recolor Preferences/Admin UI to better match main design
...
Port 8b7f93cc7f
2024-07-24 20:14:13 +02:00
Claire
d999fc52ba
Merge commit '06f070d86d448b97c082c038220becaec8a038ce' into glitch-soc/merge-upstream
2024-07-24 20:07:37 +02:00
Claire
e507d17520
[Glitch] Widen the clickable area for statuses in grouped notifications
...
Port a8330be93e
2024-07-23 20:28:22 +02:00
Nick Schonning
977337f2d2
[Glitch] Update Prettier to 3.3.3
...
Port 9a015a2a15
2024-07-23 20:28:22 +02:00
Claire
838ea5f9cd
[Glitch] Fix keyboard shortcuts and navigation in grouped notifications
...
Port af06d74574
2024-07-23 20:28:22 +02:00
Claire
68000956f4
Merge commit 'cd0ca4b99473f54464e5134f91b7b1c8d5544011' into glitch-soc/merge-upstream
2024-07-23 19:31:23 +02:00
Michael Stanclift
8b7f93cc7f
Recolor Preferences/Admin UI to better match main design ( #31034 )
2024-07-23 15:30:45 +00:00
Claire
a8330be93e
Widen the clickable area for statuses in grouped notifications ( #31111 )
2024-07-23 12:11:08 +00:00
Nick Schonning
9a015a2a15
Update Prettier to 3.3.3 ( #31106 )
2024-07-23 06:46:09 +00:00
Claire
af06d74574
Fix keyboard shortcuts and navigation in grouped notifications ( #31076 )
2024-07-23 06:20:17 +00:00
Claire
cbf25634a9
[Glitch] Fix reblogging after refactor
...
Port 55705d8191
2024-07-22 22:03:10 +02:00
Claire
643b1ef3e9
[Glitch] Refactor CW handling in an action
...
Port 9cb9427133
2024-07-22 22:03:10 +02:00
Claire
f13a231b39
[Glitch] Refactor code for reblogging and favouriting
...
Port 03dea64b79
2024-07-22 22:03:10 +02:00
Claire
dcfcfdcb14
Merge commit '55705d8191f31c1089095956fb4124f7505b4bd7' into glitch-soc/merge-upstream
2024-07-22 21:41:31 +02:00
Claire
55705d8191
Fix reblogging after refactor ( #31105 )
2024-07-22 19:30:06 +00:00
Claire
9cb9427133
Refactor CW handling in an action ( #31103 )
2024-07-22 16:03:58 +00:00
Claire
03dea64b79
Refactor code for reblogging and favouriting ( #31102 )
2024-07-22 15:45:07 +00:00
Claire
2aac73341a
Merge commit '80d9bff6df137afc3376f47b62d10a2e3e9456e2' into glitch-soc/merge-upstream
...
Conflicts:
- `app/services/backup_service.rb`:
Conflict due to glitch-soc's local-only posts.
Ported upstream's changes while keeping glitch-soc's feature.
2024-07-22 17:38:30 +02:00
github-actions[bot]
5a60a3b80c
New Crowdin Translations (automated) ( #31087 )
...
Co-authored-by: GitHub Actions <noreply@github.com>
2024-07-22 08:01:24 +00:00
Jeremy Kescher
1e52ab0c9b
Merge branch 'refs/heads/glitch' into develop
2024-07-19 19:09:47 +02:00
Essem
fd8b04e9e7
Add notification grouping for reactions
2024-07-19 18:14:22 +02:00
Jeremy Kescher
b1a8a42664
Merge branch 'refs/heads/glitch' into develop
2024-07-19 18:13:52 +02:00
Claire
95984b729a
[Glitch] Remove routerHistory parameters from composer actions
...
Port e768b23aa9
2024-07-19 18:06:35 +02:00
Michael Stanclift
9f05a06dee
[Glitch] Fix double border on column filter on narrow screens
...
Port 784e088533
2024-07-19 17:46:56 +02:00
Claire
f7598b267b
Merge commit '0397df9bef82042221f35e9938ad5b917fa1d4fc' into glitch-soc/merge-upstream
2024-07-19 17:45:19 +02:00
Claire
e768b23aa9
Remove routerHistory parameters from composer actions ( #31077 )
2024-07-19 15:26:44 +00:00
Claire
2e63e802b3
Fix inconsistent padding in glitch-soc's grouped notifications ( #2784 )
2024-07-19 12:13:50 +02:00
Michael Stanclift
784e088533
Fix double border on column filter on narrow screens ( #31068 )
2024-07-19 08:30:26 +00:00
github-actions[bot]
8e0aed8ac7
New Crowdin Translations (automated) ( #31072 )
...
Co-authored-by: GitHub Actions <noreply@github.com>
2024-07-19 08:21:09 +00:00
Renaud Chaput
7224e24054
[Glitch] Grouped Notifications UI
...
Port f587ff643f
2024-07-18 19:55:02 +02:00
Claire
c75fe09e2b
Merge commit '82344342c1c5adb3f6a4b376559db737a9e982b7' into glitch-soc/merge-upstream
2024-07-18 17:56:25 +02:00
Renaud Chaput
f587ff643f
Grouped Notifications UI ( #30440 )
...
Co-authored-by: Eugen Rochko <eugen@zeonfederated.com>
Co-authored-by: Claire <claire.github-309c@sitedethib.com>
2024-07-18 14:36:09 +00:00
github-actions[bot]
7d090b2ab6
New Crowdin Translations (automated) ( #31055 )
...
Co-authored-by: GitHub Actions <noreply@github.com>
2024-07-18 08:00:29 +00:00
Claire
5e7720d11b
Merge commit 'aa4d8987a00fe82490fb949b82d3baa33d0acd49' into glitch-soc/merge-upstream
2024-07-17 22:20:12 +02:00
github-actions[bot]
00c110ac7b
New Crowdin Translations (automated) ( #31047 )
...
Co-authored-by: GitHub Actions <noreply@github.com>
2024-07-17 07:23:07 +00:00
Jeremy Kescher
1862a60e51
Merge branch 'refs/heads/glitch' into develop
2024-07-16 22:32:15 +02:00
Claire
c546757cd1
Merge commit '66430cb25c824cfad0394216d8e7a523533bcf4b' into glitch-soc/merge-upstream
2024-07-16 17:54:36 +02:00
github-actions[bot]
66430cb25c
New Crowdin Translations (automated) ( #31038 )
...
Co-authored-by: GitHub Actions <noreply@github.com>
2024-07-16 15:24:56 +00:00
Adam Niedzielski
a609940ec9
Fix test description in hashtag_bar ( #30827 )
2024-07-16 13:23:26 +00:00
David Roetzel
70969ac64c
[Glitch] Move filtered notifications bar in scrollable area
...
Port 9d0bce4072
2024-07-15 18:57:38 +02:00
Claire
64b2c712d4
Merge commit '9d0bce40724eb77b7cc3917091b62e4ab159e29e' into glitch-soc/merge-upstream
...
Conflicts:
- `app/helpers/theme_helper.rb`:
Conflict because upstream refactored theme-related code, and glitch-soc has
a different theming system.
2024-07-15 18:51:38 +02:00
David Roetzel
9d0bce4072
Move filtered notifications bar in scrollable area ( #30996 )
...
Co-authored-by: Claire <claire.github-309c@sitedethib.com>
2024-07-15 13:42:47 +00:00
github-actions[bot]
17117109ad
New Crowdin Translations (automated) ( #31018 )
...
Co-authored-by: GitHub Actions <noreply@github.com>
2024-07-15 07:44:37 +00:00
Claire
8d2a93b0cb
[Glitch] Add setting to disable hover cards
...
Port ad52b04a1c
2024-07-12 13:50:42 +02:00
Claire
55cf5e0188
Merge commit 'c929b4cace3f95fe54fdafe449ea7e972c8d61e8' into glitch-soc/merge-upstream
2024-07-12 13:41:54 +02:00
github-actions[bot]
28ad3588e4
New Crowdin Translations (automated) ( #31006 )
...
Co-authored-by: GitHub Actions <noreply@github.com>
2024-07-12 08:25:27 +00:00
Claire
ad52b04a1c
Add setting to disable hover cards ( #30931 )
...
Co-authored-by: Eugen Rochko <eugen@zeonfederated.com>
2024-07-11 19:42:58 +00:00
Renaud Chaput
e26052192d
[Glitch] Change disabled buttons color in light mode to make it more visible
...
Port 8c8bee5a36
2024-07-11 21:08:20 +02:00
Claire
db0b12e5dc
Merge commit '8c8bee5a36e0cd0b5d35903f8891896447c3e060' into glitch-soc/merge-upstream
2024-07-11 21:07:03 +02:00
Renaud Chaput
8c8bee5a36
Change disabled buttons color in light mode to make it more visible ( #30998 )
2024-07-11 13:43:42 +00:00
github-actions[bot]
c244b70dc2
New Crowdin Translations (automated) ( #30993 )
...
Co-authored-by: GitHub Actions <noreply@github.com>
2024-07-11 10:38:35 +00:00
github-actions[bot]
182fee1c45
New Crowdin Translations (automated) ( #2738 )
...
* New Crowdin translations
* Fix bogus no.yml
* Fix bogus simple_form.no.yml
---------
Co-authored-by: GitHub Actions <noreply@github.com>
Co-authored-by: Claire <claire.github-309c@sitedethib.com>
2024-07-10 18:18:15 +02:00
Claire
959ad1d6be
Fix deprecation warning in win95 theme
2024-07-10 17:46:33 +02:00
Renaud Chaput
0d4a8a53d5
[Glitch] Fix SCSS mixed declarations deprecation
...
Port 182b9248c0
2024-07-10 16:59:31 +02:00
Claire
52fb4f16ef
Merge commit '2ea9336b6855b44126a55106a81e96ea68eaf8ff' into glitch-soc/merge-upstream
2024-07-10 16:58:06 +02:00
Renaud Chaput
182b9248c0
Fix SCSS mixed declarations deprecation ( #30986 )
2024-07-10 12:23:24 +00:00
github-actions[bot]
9984fca9a0
New Crowdin Translations (automated) ( #30983 )
...
Co-authored-by: GitHub Actions <noreply@github.com>
2024-07-10 10:40:19 +00:00
Claire
388672ff0d
Merge commit '967505ee9bcacf0e5189aa06c654ff586c198a46' into glitch-soc/merge-upstream
2024-07-09 20:39:09 +02:00
github-actions[bot]
249b4117f9
New Crowdin Translations (automated) ( #30970 )
...
Co-authored-by: GitHub Actions <noreply@github.com>
2024-07-09 07:36:13 +00:00
Tianwei Dong
80179d53ba
[Glitch] Change to use an unified constant for max media attachments per status
...
Port 36d819bef3
2024-07-08 19:49:56 +02:00
Renaud Chaput
aa8ad92fa4
[Glitch] Remove the title attribute when hovering a card anchor
...
Port 981395e4d6
2024-07-08 19:48:01 +02:00
Renaud Chaput
2fa3c3a748
[Glitch] Add the account hover card for account search results
...
Port 0899c91d4b
2024-07-08 19:47:30 +02:00
Claire
6a55232988
Merge commit 'fa8e972722fb8fc056aa348dddaee4005b4a8ac4' into glitch-soc/merge-upstream
2024-07-08 19:41:14 +02:00
Tianwei Dong
36d819bef3
Change to use an unified constant for max media attachments per status ( #29073 )
...
Co-authored-by: Renaud Chaput <renchap@gmail.com>
2024-07-08 08:10:57 +00:00
github-actions[bot]
1a37862a76
New Crowdin Translations (automated) ( #30940 )
...
Co-authored-by: GitHub Actions <noreply@github.com>
2024-07-08 08:03:44 +00:00
Renaud Chaput
981395e4d6
Remove the title attribute when hovering a card anchor ( #30948 )
2024-07-07 16:14:15 +00:00
Renaud Chaput
0899c91d4b
Add the account hover card for account search results ( #30949 )
2024-07-07 16:13:10 +00:00
Claire
a99ae90d76
[Glitch] Fix overflow behavior on profile fields in hover cards
...
Port 63ba69810e
2024-07-06 21:11:37 +02:00
Claire
aca1decf54
[Glitch] Fix right-to-left text in preview cards
...
Port 8f5694d79e
2024-07-06 21:11:17 +02:00
Claire
11dd51ef44
Merge commit '63ba69810eca80fc2d10114a79f2988c1b75892f' into glitch-soc/merge-upstream
...
Conflicts:
- `.env.production.sample`:
Upstream and glitch-soc had different comments, some comments got updated upstream.
Updated them in glitch-soc accordingly.
2024-07-06 21:02:42 +02:00
Claire
63ba69810e
Fix overflow behavior on profile fields in hover cards ( #30928 )
2024-07-06 07:22:24 +00:00
Claire
8f5694d79e
Fix right-to-left text in preview cards ( #30930 )
2024-07-05 13:40:53 +00:00
github-actions[bot]
81547845ac
New Crowdin Translations (automated) ( #30925 )
...
Co-authored-by: GitHub Actions <noreply@github.com>
2024-07-05 09:09:40 +00:00
Jeremy Kescher
4f80bc8493
Merge branch 'refs/heads/glitch' into develop
2024-07-04 18:17:55 +02:00
Claire
e61a7794f8
Merge commit 'df9e26158d9787859b24bdc276af478abf05e1af' into glitch-soc/merge-upstream
...
Conflicts:
- `lib/sanitize_ext/sanitize_config.rb`:
Conflict because glitch-soc has a different list of allowed tags.
Added upstream's new allowed tags while keeping ours.
- `spec/requests/api/v1/timelines/public_spec.rb`:
Conflict because of glitch-soc's default settings.
Updated accordingly.
2024-07-04 17:12:14 +02:00
github-actions[bot]
8331f9e379
New Crowdin Translations (automated) ( #30916 )
...
Co-authored-by: GitHub Actions <noreply@github.com>
2024-07-04 08:46:27 +00:00
Claire
70ff7a7c69
Merge commit '9be77fc0dbb01c1a8a54cd3da97e16c7941df367' into glitch-soc/merge-upstream
2024-07-03 22:10:41 +02:00
github-actions[bot]
dd85e3bcc5
New Crowdin Translations (automated) ( #30901 )
...
Co-authored-by: GitHub Actions <noreply@github.com>
2024-07-03 07:30:30 +00:00
Jeremy Kescher
c1f70540c6
Merge branch 'refs/heads/glitch' into develop
2024-07-02 19:30:16 +02:00
github-actions[bot]
1fc14e324b
New Crowdin Translations (automated) ( #30890 )
...
Co-authored-by: GitHub Actions <noreply@github.com>
2024-07-02 08:41:54 +00:00
Claire
4d4f7ede4f
Revert "Temporarily disable hover cards"
...
This reverts commit 935b955b15
2024-07-01 21:21:22 +02:00
Eugen Rochko
4c5067e3a4
[Glitch] Add timeline of public posts about a trending link in web UI
...
Port 20fa9ce484
2024-07-01 21:19:38 +02:00
Eugen Rochko
a70b1141d6
[Glitch] Fix missing confirmation when unfollowing from hover card in web UI
...
Port d3f504245c
2024-07-01 20:55:56 +02:00
Eugen Rochko
dcfd39991b
[Glitch] Change hover cards to not appear until the mouse stops in web UI
...
Port b728c0e8ce
2024-07-01 20:50:26 +02:00
Claire
92dcc50278
Merge commit 'd3f504245cab5a9a0e89262e0a1398d035dffac9' into glitch-soc/merge-upstream
2024-07-01 20:45:13 +02:00
Eugen Rochko
d3f504245c
Fix missing confirmation when unfollowing from hover card in web UI ( #30879 )
2024-07-01 18:10:22 +00:00
Eugen Rochko
b728c0e8ce
Change hover cards to not appear until the mouse stops in web UI ( #30850 )
2024-07-01 15:52:01 +00:00
Eugen Rochko
20fa9ce484
Add timeline of public posts about a trending link in web UI ( #30840 )
2024-07-01 14:45:48 +00:00
Claire
d270165be3
Merge commit 'aeefe5b2bea6e0fb511f029c2aacdefa7bd41eb8' into glitch-soc/merge-upstream
2024-07-01 12:05:39 +02:00
github-actions[bot]
7756db6551
New Crowdin Translations (automated) ( #30873 )
...
Co-authored-by: GitHub Actions <noreply@github.com>
2024-07-01 08:34:38 +00:00
Aria
6d6064d2c0
fix(collapsing): fix and simplify post collapsing CSS ( #2757 )
2024-06-30 22:27:38 +02:00
Claire
935b955b15
Temporarily disable hover cards
2024-06-30 21:48:30 +02:00
Eugen Rochko
412e5ddcbf
[Glitch] Fix follow button in hover cards not working when signed out in web UI
...
Port ea6c455e81
2024-06-30 18:41:48 +02:00
Eugen Rochko
98185247b8
[Glitch] Add hover cards in web UI
...
Port e89317d4c1
2024-06-30 18:41:48 +02:00
Eugen Rochko
4179f5fcf3
[Glitch] Change author_account to be authors in REST API
...
Port 096057b845
2024-06-30 17:33:23 +02:00
Eugen Rochko
d612daee97
[Glitch] Convert <ColumnHeader> to Typescript
...
Port 3939352e92
2024-06-30 17:33:23 +02:00
Renaud Chaput
8160a655a5
[Glitch] Convert <Directory> to Typescript / function component
...
Port 863c470a2b
2024-06-30 17:33:23 +02:00
Renaud Chaput
1ac4e64a3b
[Glitch] Change light mode to apply CSS variables to the body
...
Port 8c0ff6498e
2024-06-30 14:49:55 +02:00
Claire
d2aea85e6c
Merge commit '5d4dbbcc67c98007d417cbe67b5a2261889304dc' into glitch-soc/merge-upstream
2024-06-30 11:25:40 +02:00
renovate[bot]
1bccba1408
chore(deps): update dependency @testing-library/react to v16 ( #30533 )
...
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
Co-authored-by: Renaud Chaput <renchap@gmail.com>
2024-06-28 11:39:32 +00:00
github-actions[bot]
a5134f2695
New Crowdin Translations (automated) ( #30867 )
...
Co-authored-by: GitHub Actions <noreply@github.com>
2024-06-28 08:33:57 +00:00
Eugen Rochko
ea6c455e81
Fix follow button in hover cards not working when signed out in web UI ( #30864 )
2024-06-27 22:01:40 +00:00
Eugen Rochko
096057b845
Change author_account to be authors in REST API ( #30846 )
2024-06-27 13:17:18 +00:00
github-actions[bot]
6d1c1fd684
New Crowdin Translations (automated) ( #30851 )
...
Co-authored-by: GitHub Actions <noreply@github.com>
2024-06-27 08:00:04 +00:00
Eugen Rochko
3939352e92
Convert <ColumnHeader> to Typescript ( #30849 )
2024-06-26 19:46:28 +00:00
Eugen Rochko
e89317d4c1
Add hover cards in web UI ( #30754 )
...
Co-authored-by: Renaud Chaput <renchap@gmail.com>
2024-06-26 19:33:38 +00:00
Renaud Chaput
863c470a2b
Convert <Directory> to Typescript / function component ( #30829 )
2024-06-26 18:04:50 +00:00
Renaud Chaput
8c0ff6498e
Change light mode to apply CSS variables to the body ( #30839 )
2024-06-25 21:57:22 +00:00
Claire
7d89d1f186
[Glitch] Fix API requests after #30818
...
Port 2c7eed1fa1
2024-06-25 19:07:42 +02:00
Claire
85e6efd351
Merge commit '2c7eed1fa1e7af72dd03a041a60f2cfd42e913e0' into glitch-soc/merge-upstream
2024-06-25 19:06:59 +02:00
Claire
2c7eed1fa1
Fix API requests after #30818 ( #30837 )
2024-06-25 16:53:03 +00:00
Renaud Chaput
3a20290915
[Glitch] Change apiRequest to accept both params and data
...
Port 547e97945d
2024-06-25 18:03:51 +02:00
Claire
6f2771cb32
Merge commit '845fe1c6936a7b386fd74ae567c19600a88e795a' into glitch-soc/merge-upstream
2024-06-25 17:57:39 +02:00
Renaud Chaput
547e97945d
Change apiRequest to accept both params and data ( #30818 )
2024-06-25 13:45:41 +00:00
github-actions[bot]
052c90b8de
New Crowdin Translations (automated) ( #30825 )
...
Co-authored-by: GitHub Actions <noreply@github.com>
2024-06-25 07:45:58 +00:00
Claire
21ca03581a
Merge commit '6527d5039141fe4a80645147b581d76952a64f39' into glitch-soc/merge-upstream
2024-06-24 19:39:42 +02:00
github-actions[bot]
61722b1b1f
New Crowdin Translations (automated) ( #30808 )
...
Co-authored-by: GitHub Actions <noreply@github.com>
2024-06-24 10:46:53 +00:00
Jeremy Kescher
b3f731abac
Merge branch 'refs/heads/glitch-soc' into develop
2024-06-22 13:30:26 +02:00
Renaud Chaput
2f994bb34a
[Glitch] Fix error when deleting a status
...
Port 7d12522ed7
2024-06-21 12:03:35 +02:00
Claire
6300273664
Merge commit '9e932fa1ddaea569ca52fe663eb4bb13a5a43e0a' into glitch-soc/merge-upstream
2024-06-21 12:02:42 +02:00
github-actions[bot]
9e932fa1dd
New Crowdin Translations (automated) ( #30789 )
...
Co-authored-by: GitHub Actions <noreply@github.com>
2024-06-21 09:14:44 +00:00
Renaud Chaput
7d12522ed7
Fix error when deleting a status ( #30784 )
2024-06-20 22:39:06 +00:00
Renaud Chaput
8ae61fdee5
[Glitch] Convert disconnectTimeline and timelineDelete actions to Typescript
...
Port 1c65932776
2024-06-20 19:22:24 +02:00
Claire
fd867adffe
Merge commit 'bb2d77b4a07e95e7d96df080f2d6994c1422b0c0' into glitch-soc/merge-upstream
2024-06-20 18:36:13 +02:00
Renaud Chaput
c97e798d8c
[Glitch] Improve createdataLoadingThunk
...
Port 27529247b2
2024-06-20 13:57:58 +02:00
Claire
04e57efa55
Merge commit '27529247b289a0e78d2deb97626ddb60baf04d86' into glitch-soc/merge-upstream
2024-06-20 13:57:08 +02:00
Renaud Chaput
1c65932776
Convert disconnectTimeline and timelineDelete actions to Typescript ( #30777 )
2024-06-20 11:56:52 +00:00
Renaud Chaput
27529247b2
Improve createdataLoadingThunk ( #30778 )
2024-06-20 11:42:10 +00:00
github-actions[bot]
a0910cd49c
New Crowdin Translations (automated) ( #30772 )
...
Co-authored-by: GitHub Actions <noreply@github.com>
2024-06-20 09:03:28 +00:00
Jeremy Kescher
3f2e2c0923
Merge branch 'refs/heads/glitch' into develop
2024-06-19 17:20:56 +02:00
Renaud Chaput
af0a1a8774
[Glitch] Convert notifications policies frontend code to Typescript
...
Port d558dfd77d
2024-06-18 18:22:40 +02:00
Claire
b0c979af49
Merge commit '58ace2e45e16a69977267d03874568c11043f04c' into glitch-soc/merge-upstream
2024-06-18 18:20:36 +02:00
Renaud Chaput
d558dfd77d
Convert notifications policies frontend code to Typescript ( #29868 )
2024-06-18 13:23:30 +00:00
github-actions[bot]
50db95b9a1
New Crowdin Translations (automated) ( #30746 )
...
Co-authored-by: GitHub Actions <noreply@github.com>
2024-06-18 12:39:36 +00:00
Jeremy Kescher
29ac8c0606
Merge branch 'refs/heads/glitch-soc' into develop
2024-06-18 00:15:52 +02:00
Jeremy Kescher
895b479c23
Merge branch 'refs/heads/glitch-soc' into develop
2024-06-17 22:52:08 +02:00
Essem
83f07c7d9b
Disable reactions in detailed status view when visibleReactions is 0
2024-06-17 22:50:11 +02:00
Eugen Rochko
eccec92496
[Glitch] Change sidebar text in web UI
...
Port b9fd7571ae
2024-06-17 18:35:10 +02:00
Claire
395b9011ee
Merge commit 'd5f02adad716520b6b9014553bc730dcef5b2f50' into glitch-soc/merge-upstream
...
Conflicts:
- `app/helpers/application_helper.rb`:
Not a real conflict, just upstream adding a method textually adjacent to
glitch-soc only code.
Ported upstream's change.
2024-06-17 18:30:28 +02:00
Marcin Mikołajczak
f0dba9af6f
[Glitch] LanguageDropdown: remove unused function
...
Port a243963e93
2024-06-17 18:22:00 +02:00
Claire
8089fa6935
Merge commit 'a7264a2b42631bd876d114b96f689492e2908a8d' into glitch-soc/merge-upstream
...
Conflicts:
- `app/views/layouts/application.html.haml`:
Conflict because of glitch-soc's different theming system.
Ported upstream's change.
2024-06-17 18:14:14 +02:00
github-actions[bot]
35d52d7914
New Crowdin Translations (automated) ( #30723 )
...
Co-authored-by: GitHub Actions <noreply@github.com>
2024-06-17 12:13:23 +00:00
Eugen Rochko
fd3697723c
[Glitch] Add author links on the explore page in web UI
...
Port ed6d24330b
2024-06-17 14:08:08 +02:00
Eugen Rochko
454dc407f4
[Glitch] Fix a few visual glitches with link previews in web UI
...
Port 9984243467
2024-06-17 13:56:23 +02:00
Claire
677f73f793
Merge commit '3a191b3797dde1daf79cd748a14b87240532d543' into glitch-soc/merge-upstream
2024-06-17 13:41:58 +02:00
Jeremy Kescher
209f90f670
Merge branch 'refs/heads/glitch-soc' into develop
2024-06-16 05:32:45 +02:00
Eugen Rochko
b9fd7571ae
Change sidebar text in web UI ( #30696 )
2024-06-14 13:04:20 +00:00
github-actions[bot]
a7264a2b42
New Crowdin Translations (automated) ( #30704 )
...
Co-authored-by: GitHub Actions <noreply@github.com>
2024-06-14 09:08:17 +00:00
Marcin Mikołajczak
a243963e93
LanguageDropdown: remove unused function ( #30346 )
...
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
2024-06-13 19:46:45 +00:00
github-actions[bot]
dd587d29b6
New Crowdin Translations (automated) ( #30684 )
...
Co-authored-by: GitHub Actions <noreply@github.com>
2024-06-13 13:30:07 +00:00
Eugen Rochko
ed6d24330b
Add author links on the explore page in web UI ( #30521 )
2024-06-13 13:04:16 +00:00
Eugen Rochko
9984243467
Fix a few visual glitches with link previews in web UI ( #30670 )
2024-06-12 13:10:51 +00:00
github-actions[bot]
ced463360e
New Crowdin Translations (automated) ( #30666 )
...
Co-authored-by: GitHub Actions <noreply@github.com>
2024-06-12 10:48:31 +00:00
Claire
4daed855e5
Merge commit 'd818ddd6870094e89e58ef61f37da4cb73935856' into glitch-soc/merge-upstream
2024-06-11 19:46:11 +02:00
David Roetzel
f48f39a767
Fix cutoff of instance name ( #30598 )
2024-06-11 12:54:37 +00:00
github-actions[bot]
0dabda9bee
New Crowdin Translations (automated) ( #30646 )
...
Co-authored-by: GitHub Actions <noreply@github.com>
2024-06-11 07:14:52 +00:00
Claire
be68f8f4af
Merge commit '9cc4040308a758d4b77961f4da79cf63a044fffe' into glitch-soc/merge-upstream
2024-06-10 18:20:08 +02:00
github-actions[bot]
bb27321781
New Crowdin Translations (automated) ( #30608 )
...
Co-authored-by: GitHub Actions <noreply@github.com>
2024-06-10 14:29:30 +00:00
GitHub Actions
33b3330dc7
New Crowdin translations
2024-06-09 04:29:04 +00:00
Claire
4c55a6ee73
Merge pull request #2730 from mayafri/fixes/collapsed-toots-gradient
...
light theme: fix gradient for collapsed toots
2024-06-08 14:41:10 +02:00
Claire
905e9fab97
Merge pull request #2696 from glitch-soc/i18n/crowdin/translations
...
New Crowdin Translations (automated)
2024-06-08 13:42:34 +02:00
GitHub Actions
aab5b10c38
New Crowdin translations
2024-06-08 04:29:18 +00:00
Claire
7277d2f130
Merge commit '496c10542bd39ca86a85d4de81778c134ea4383c' into glitch-soc/merge-upstream
2024-06-07 20:30:51 +02:00
github-actions[bot]
c1b0c1a5e4
New Crowdin Translations (automated) ( #30586 )
...
Co-authored-by: GitHub Actions <noreply@github.com>
2024-06-07 09:59:30 +00:00
Maya Friedrichs
ac3d761c78
Remove gradient for collapsed toots
...
This gradient is already set in `components.scss` with the new background
2024-06-07 00:36:41 +02:00
Claire
30b00ca2b5
Merge commit '5652ca613582df03e5b838626078981414f3b897' into glitch-soc/merge-upstream
2024-06-06 12:27:26 +02:00
github-actions[bot]
a729104a41
New Crowdin Translations (automated) ( #30575 )
...
Co-authored-by: GitHub Actions <noreply@github.com>
2024-06-06 08:53:28 +00:00
Eugen Rochko
3c435f9ba0
Change counters to be displayed on profile timelines in web UI ( #30525 )
2024-06-05 23:52:46 +00:00
github-actions[bot]
e4e3875452
New Crowdin Translations (automated) ( #30543 )
...
Co-authored-by: GitHub Actions <noreply@github.com>
2024-06-05 07:52:25 +00:00
github-actions[bot]
aa9b80f57d
New Crowdin Translations (automated) ( #30517 )
...
Co-authored-by: GitHub Actions <noreply@github.com>
2024-06-03 07:34:33 +00:00
Jeremy Kescher
3d3d958aba
Removed Oatstodon skin
...
Originally taken from the types.pl fork, the theme was made by @oat@hellsite.site originally. The Mastodon frontend has changed far too much by now for us to keep up the changes in this theme.
2024-05-31 22:22:11 +02:00
github-actions[bot]
dac4eba46b
New Crowdin Translations (automated) ( #30499 )
...
Co-authored-by: GitHub Actions <noreply@github.com>
2024-05-31 09:26:52 +00:00
Jeremy Kescher
cb080ca3ef
Bump version to v4.3.0-alpha.4+glitch+cat+1.0.0
2024-05-30 18:51:42 +02:00
github-actions[bot]
a0b525e50b
New Crowdin Translations (automated) ( #30477 )
...
Co-authored-by: GitHub Actions <noreply@github.com>
2024-05-30 14:54:51 +00:00
Eugen Rochko
4069fae10d
[Glitch] Add support for fediverse:creator OpenGraph tag
...
Port 128987eded
2024-05-29 18:52:11 +02:00
Renaud Chaput
2e3d6e451f
[Glitch] Enable stricter Typescript options
...
Port 3750e8050c
2024-05-29 17:09:35 +02:00
Renaud Chaput
6b4c182806
[Glitch] Fix createDataLoadingThunk to allow actions without arguments
...
Port 6a75e1c8c8
2024-05-29 17:08:13 +02:00
Claire
c827a98f19
Merge commit 'd20a5c3ec9ed40a991245fe32d0acb6187dd48c4' into glitch-soc/merge-upstream
...
Conflicts:
- `yarn.lock`:
Not a real conflict, just a line adjacent to a glitch-soc only dependency
getting updated.
Updated dependencies as upstream did.
2024-05-29 17:03:24 +02:00
Jeremy Kescher
6d448d46ff
Merge branch 'refs/heads/glitch-soc' into develop
...
# Conflicts:
# app/javascript/flavours/glitch/actions/interactions.js
# app/javascript/flavours/glitch/reducers/statuses.js
2024-05-29 14:23:08 +02:00
github-actions[bot]
6eea83211c
New Crowdin Translations (automated) ( #30464 )
...
Co-authored-by: GitHub Actions <noreply@github.com>
2024-05-29 11:12:23 +00:00
Eugen Rochko
128987eded
Add support for fediverse:creator OpenGraph tag ( #30398 )
2024-05-29 01:34:33 +02:00
github-actions[bot]
e5c3dc33a2
New Crowdin Translations (automated) ( #30421 )
...
Co-authored-by: GitHub Actions <noreply@github.com>
2024-05-27 09:35:45 +00:00
Renaud Chaput
3750e8050c
Enable stricter Typescript options ( #30435 )
2024-05-27 09:24:59 +00:00
Renaud Chaput
6a75e1c8c8
Fix createDataLoadingThunk to allow actions without arguments ( #30439 )
2024-05-27 09:00:40 +00:00
Renaud Chaput
e947f1f2ed
[Glitch] Fix a leftover argument to api()
...
Port 8ea2726376
2024-05-24 17:09:49 +02:00
Claire
d76106da12
Merge commit 'ccb6aeddacbab950d7d7f1b0d2b64212d7aa99eb' into glitch-soc/merge-upstream
2024-05-24 17:08:21 +02:00
github-actions[bot]
54351d01f2
New Crowdin Translations (automated) ( #30410 )
...
Co-authored-by: GitHub Actions <noreply@github.com>
2024-05-24 08:26:38 +00:00
Renaud Chaput
8ea2726376
Fix a leftover argument to api() ( #30405 )
2024-05-24 08:25:42 +00:00
Renaud Chaput
e32bfad88a
[Glitch] Fix createDataLoadingThunk and related actions
...
Port b6fd14f0e2
2024-05-23 20:37:00 +02:00
Renaud Chaput
8d6058b40a
[Glitch] Proposal: a modern & typed way of writing Redux actions doing API requests
...
Port 10ec421dd4
2024-05-23 20:33:05 +02:00
Claire
51631c785f
Merge commit 'b6fd14f0e2842eca269ef8962e3c5bd560a76357' into glitch-soc/merge-upstream
...
Conflicts:
- `app/lib/activitypub/parser/status_parser.rb`:
Glitch-soc had changes to adjacent lines.
Ported upstream's changes.
2024-05-23 20:30:23 +02:00
Renaud Chaput
b6fd14f0e2
Fix createDataLoadingThunk and related actions ( #30408 )
2024-05-23 18:22:42 +00:00
Renaud Chaput
c465ef7560
[Glitch] Fix some API calls that should not use an API token
...
Port 15d3070754
2024-05-23 20:11:20 +02:00
Claire
0e8633f6c7
Merge commit '3a862439dfc989c6c5741e007c2f4e0335fffe33' into glitch-soc/merge-upstream
2024-05-23 20:11:12 +02:00
Renaud Chaput
10ec421dd4
Proposal: a modern & typed way of writing Redux actions doing API requests ( #30270 )
2024-05-23 09:50:13 +00:00
github-actions[bot]
5b5a35cf96
New Crowdin Translations (automated) ( #30402 )
...
Co-authored-by: GitHub Actions <noreply@github.com>
2024-05-23 08:26:29 +00:00
Renaud Chaput
15d3070754
Fix some API calls that should not use an API token ( #30401 )
2024-05-23 07:30:48 +00:00
Jeremy Kescher
d1856ea48d
Merge branch 'refs/heads/glitch-soc' into develop
...
# Conflicts:
# app/javascript/mastodon/initial_state.js
2024-05-22 23:56:46 +02:00
Renaud Chaput
3e9298370d
[Glitch] Remove the access token from Redux & context
...
Port 2c5ab8f647
2024-05-22 21:14:54 +02:00
Claire
22d12229b2
Merge commit '2c5ab8f647841ea8075ece50ccc9e12c21af8720' into glitch-soc/merge-upstream
2024-05-22 21:05:19 +02:00
Renaud Chaput
2c5ab8f647
Remove the access token from Redux & context ( #30275 )
2024-05-22 14:45:18 +00:00
github-actions[bot]
a2b4c29c8f
New Crowdin Translations (automated) ( #30394 )
...
Co-authored-by: GitHub Actions <noreply@github.com>
2024-05-22 07:57:51 +00:00
David Lapshin
dc35563f65
[Glitch] Fix announcements icon rotating like settings one
...
Port cd0c547936
2024-05-21 17:45:59 +02:00
Claire
5ab111554e
Merge commit 'cd0c5479362260082dbe1cbc42e364017853bbfc' into glitch-soc/merge-upstream
2024-05-21 17:45:21 +02:00
David Lapshin
cd0c547936
Fix announcements icon rotating like settings one ( #30388 )
2024-05-21 15:24:51 +00:00
Claire
d3136e6d58
Merge commit '89f89d738f5840c80ff938f8bf6734cdafe0fa83' into glitch-soc/merge-upstream
2024-05-21 12:06:38 +02:00
github-actions[bot]
eda2bdfc7a
New Crowdin Translations (automated) ( #30383 )
...
Co-authored-by: GitHub Actions <noreply@github.com>
2024-05-21 08:48:36 +00:00
Jeremy Kescher
16ce10a2bd
Apply changes from emoji reactions branch
2024-05-21 05:47:06 +02:00
Jeremy Kescher
47884616f7
[Glitch+Emoji reactions] Use modern React context for for identity for emoji reaction code
2024-05-21 00:46:17 +02:00
Jeremy Kescher
fae98d1deb
Merge branch 'refs/heads/glitch-soc' into develop
...
# Conflicts:
# app/javascript/flavours/glitch/initial_state.js
# app/javascript/mastodon/initial_state.js
2024-05-20 23:57:04 +02:00
Renaud Chaput
ca5955ed76
[Glitch] Use a modern React context for identity in the app
...
Port a178ba7cd5
2024-05-20 12:53:52 +02:00
Claire
e46321e63d
Merge commit 'de4815afda0809bf999519aabda1cd14c67278da' into glitch-soc/merge-upstream
2024-05-20 12:17:36 +02:00
github-actions[bot]
8b75d18371
New Crowdin Translations (automated) ( #30358 )
...
Co-authored-by: GitHub Actions <noreply@github.com>
2024-05-20 07:41:38 +00:00
Renaud Chaput
990a0c19a9
Fix a warning when running JS Tests because of FakeIdentityContext using deprecated context API ( #30368 )
2024-05-20 07:29:27 +00:00
Renaud Chaput
a178ba7cd5
Use a modern React context for identity in the app ( #30098 )
2024-05-19 17:07:32 +00:00
Jeremy Kescher
70c76a1f30
Merge branch 'refs/heads/glitch-soc' into develop
2024-05-17 15:33:30 +02:00
Claire
7b078b46a2
[Glitch] Fix Web UI trying to save user settings when logged out
...
Port 66906a1bc1
2024-05-16 19:34:50 +02:00
David Lapshin
061464a563
[Glitch] Fix incorrect element selector from #30221
...
Port 94493cff92
2024-05-16 19:34:17 +02:00
Claire
2810231180
Merge commit 'b2388be71eb0031ef9e47c492b1c038231cd8bc0' into glitch-soc/merge-upstream
...
Conflicts:
- `app/controllers/activitypub/collections_controller.rb`:
Upstream renamed a helper method everywhere.
There was one glitch-soc line involving changes because of the local-only post
feature.
Ported upstream's change.
2024-05-16 19:30:10 +02:00
Claire
66906a1bc1
Fix Web UI trying to save user settings when logged out ( #30324 )
2024-05-16 13:01:01 +00:00
github-actions[bot]
cdb042ae86
New Crowdin Translations (automated) ( #30319 )
...
Co-authored-by: GitHub Actions <noreply@github.com>
2024-05-16 07:50:19 +00:00
David Lapshin
94493cff92
Fix incorrect element selector from #30221 ( #30307 )
2024-05-16 07:33:29 +00:00
github-actions[bot]
aad5e841b5
New Crowdin Translations (automated) ( #30290 )
...
Co-authored-by: GitHub Actions <noreply@github.com>
2024-05-15 08:53:57 +00:00
Renaud Chaput
47ce5f4ca9
[Glitch] Fix missing prop warning for <Account>
...
Port 1bf661cddb
2024-05-14 20:53:40 +02:00
David Lapshin
160823716a
[Glitch] Add active animation to header settings button
...
Port cb93c1edf0
2024-05-14 20:53:01 +02:00
Claire
666760f450
Merge commit '1bf661cddbc614d4076e9d9e855575fc29e976c0' into glitch-soc/merge-upstream
...
Conflicts:
- `package.json`:
Upstream fixed a command we have modified in glitch-soc.
Updated as upstream did.
2024-05-14 20:47:14 +02:00
Renaud Chaput
1bf661cddb
Fix missing prop warning for <Account> ( #30291 )
2024-05-14 18:15:42 +00:00
