hazycora
8ad361cb29
allow dashes in emoji shortcodes
2024-07-19 18:14:57 +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
Matt Jankowski
0397df9bef
Resolve TODO in api/v1/admin/domain_* controllers ( #31067 )
2024-07-19 15:32:42 +00:00
renovate[bot]
65a8dc7869
chore(deps): update dependency selenium-webdriver to v4.23.0 ( #31073 )
...
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
2024-07-19 15:32:06 +00:00
kyori19
3a00f89aa1
Respect Account::DISPLAY_NAME_LENGTH_LIMIT in account spec correctly ( #31075 )
2024-07-19 15:31:48 +00: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
Matt Jankowski
adadfdbc03
Update strong_migrations to version 2.0.0 ( #31061 )
2024-07-19 08:32:43 +00:00
Matt Jankowski
05342529dd
Reduce factory creation in AP activity move spec ( #31064 )
2024-07-19 08:31:34 +00: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
Claire
d55ecf4145
Merge pull request #2782 from ClearlyClaire/glitch-soc/merge-upstream
...
Merge upstream changes up to 82344342c1
2024-07-18 20:42:27 +02: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
Matt Jankowski
82344342c1
Add link to org-level contribution guidelines to contributing doc ( #31043 )
2024-07-18 15:45:40 +00:00
Matt Jankowski
848b59c8ae
Reduce factory creation in MediaAttachment model spec ( #31058 )
2024-07-18 15:23:46 +00:00
renovate[bot]
41b7281b56
fix(deps): update dependency use-debounce to v10.0.1 ( #31060 )
...
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
2024-07-18 15:23:43 +00:00
Claire
6e47637dd4
Fix grouping across hourly buckets happening in a 12 seconds window instead of 12 hours window ( #31062 )
2024-07-18 15:23:40 +00: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
Matt Jankowski
47ea83d246
Reduce factory creation in AP::ProcessStatusUpdateService spec ( #31051 )
2024-07-18 08:00:19 +00:00
renovate[bot]
64c7ffdc65
chore(deps): update dependency ruby-vips to v2.2.2 ( #31050 )
...
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
2024-07-18 07:53:36 +00:00
Matt Jankowski
2616fde9e6
Use change-requiring records in admin/reports controller spec ( #31052 )
2024-07-18 07:49:44 +00:00
Matt Jankowski
c5f8256801
Reduce extra factories in FanOutOnWriteService spec ( #31053 )
2024-07-18 07:45:59 +00:00
Claire
fb29f40a28
Merge pull request #2781 from ClearlyClaire/glitch-soc/merge-upstream
...
Merge upstream up to aa4d8987a0
2024-07-17 22:42:32 +02:00
Claire
5e7720d11b
Merge commit 'aa4d8987a00fe82490fb949b82d3baa33d0acd49' into glitch-soc/merge-upstream
2024-07-17 22:20:12 +02:00
renovate[bot]
aa4d8987a0
chore(deps): update dependency faker to v3.4.2 ( #31046 )
...
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
2024-07-17 10:42:54 +00:00
Claire
4957771a8a
Update rexml to version 3.3.2 ( #31048 )
2024-07-17 09:18:25 +00:00
Matt Jankowski
76c2c5c748
Reduce extra round trips in activitypub controller specs ( #31041 )
2024-07-17 08:09:34 +00:00
Matt Jankowski
f5e90f3de3
Reduce extra round trips in AP::SynchronizeFollowersService spec ( #31044 )
2024-07-17 07:33:08 +00:00
Matt Jankowski
81877e7950
Reduce extra round trips in AP::FetchRemoteStatusService spec ( #31045 )
2024-07-17 07:24:14 +00: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
5ed78a1e90
Bump Catstodon revision to 1.0.1
2024-07-16 22:38:39 +02:00
Jeremy Kescher
1862a60e51
Merge branch 'refs/heads/glitch' into develop
2024-07-16 22:32:15 +02:00
Claire
d6a2635a77
Merge pull request #2780 from ClearlyClaire/glitch-soc/merge-upstream
...
Merge upstream changes up to 66430cb25c
2024-07-16 18:51:02 +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
Emelia Smith
aa88aca0ad
Add optional OAuth application to reports ( #30539 )
2024-07-16 13:23:08 +00:00
Adam Niedzielski
fa54b61216
Handle missing links in Webfinger response ( #31030 )
2024-07-16 13:21:16 +00:00
renovate[bot]
c27d194eb2
fix(deps): update dependency pino to v9.3.1 ( #31032 )
...
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
2024-07-16 13:20:34 +00:00
renovate[bot]
c3a2f9d993
chore(deps): update dependency json-schema to v4.3.1 ( #31012 )
...
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
2024-07-16 12:14:25 +00:00
Michael Stanclift
905921b2ef
Add missing "Update Report" string in audit log ( #31033 )
2024-07-16 07:06:19 +00:00
Claire
b7b6f1c89a
Merge pull request #2777 from ClearlyClaire/glitch-soc/merge-upstream
...
Merge upstream changes up to 9d0bce4072
2024-07-15 19:35:20 +02: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
