Jeremy Kescher
788e0fe2ec
Merge branch 'refs/heads/glitch' into develop
2024-07-31 15:02:40 +02: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
