Claire
6503287c2d
Merge commit '4af8e83c8a236265c46a1b984fa5dbd3a7c73dfe' into glitch-soc/merge-upstream
2025-12-12 17:45:26 +01:00
diondiondion
8748f0812d
Convert Settings class to TS ( #37218 )
2025-12-12 10:20:32 +00:00
Echo
10f232ca08
Wrapstodon: Allow dismissing banner ( #37202 )
2025-12-12 09:40:45 +00:00
Claire
17ba99e5de
Merge commit 'd6f2a3ac8d61e0828a17f68a6e9094d0f4662f4c' into glitch-soc/merge-upstream
...
Conflicts:
- `app/views/wrapstodon/show.html.haml`:
Conflict because of glitch-soc's theming change.
Adapted upstream's changes.
- `docker-compose.yml`:
Conflict because of container repo name change.
Adapted upstream's changes.
- `yarn.lock`:
Conflict because of an additional glitch-soc dependency.
Updated the dependencies upstream did.
2025-12-10 18:05:44 +01:00
Echo
76184c998c
Fix issue where Wrapstodon was pushed to the bottom of the feed ( #37190 )
2025-12-10 15:55:12 +00:00
Claire
315f5e5a31
Merge commit '9d81561bb2440c8fb9a75bd05277120aff346b1e' into glitch-soc/merge-upstream
2025-12-09 18:06:56 +01:00
Echo
9702cbb41c
Fix emoji on Wrapstodon ( #37177 )
2025-12-09 10:36:08 +00:00
Claire
34aa825e96
Merge commit 'b3b5bf26d14f809a562244642949826b6a91bade' into glitch-soc/merge-upstream
2025-12-04 20:16:21 +01:00
Echo
e5e3a64a9b
Display Wrapstodon inline widget ( #37106 )
2025-12-03 13:58:38 +00:00
Claire
edfbcfb3f5
Fix error handling when re-fetching already-known statuses ( #37077 )
2025-12-01 10:52:06 +00:00
Claire
44e6abe48b
Merge commit '0004ed4c8021ebd400d32eb32a5e479ebd7bcf91' into glitch-soc/merge-upstream
2025-11-30 16:40:18 +01:00
diondiondion
07ecf648dd
Remove unused bundle-related Redux actions ( #37030 )
2025-11-27 10:50:48 +00:00
Claire
e0d7230f97
Merge commit 'c87b05282909383353a9561e97b9f18a2db0766d' into glitch-soc/merge-upstream
2025-11-14 18:19:00 +01:00
Claire
f25e066112
Fix bogus quote approval policy not always being replaced correctly ( #36885 )
2025-11-14 12:39:04 +00:00
Claire
6d8c43ab85
Fix hashtag completion not being inserted correctly ( #36884 )
2025-11-14 12:23:40 +00:00
Claire
bebc79d160
Merge commit '98c8c1ebd278f59e97c7d17628e7710cd4c933d4' into glitch-soc/merge-upstream
2025-11-13 18:12:49 +01:00
Claire
98c8c1ebd2
Fix error when sending new posts ( #36869 )
2025-11-13 15:42:14 +00:00
Claire
9dbebbb2ee
Fix posts coming from public/hashtag streaming being marked as unquotable ( #36860 )
2025-11-13 12:54:28 +00:00
Claire
a7ba4ba446
Merge commit '26e7fe97714d077930621f9111b7eaad2774df65' into glitch-soc/merge-upstream
2025-11-04 20:38:24 +01:00
Claire
26e7fe9771
Change paste-link-to-quote loading state from generic loading bar to compose placeholder ( #36695 )
2025-11-04 19:20:39 +00:00
Claire
1b795c12e9
Change quote action to error instead of insert link in Private Mentions ( #36721 )
2025-11-04 17:58:50 +00:00
Echo
3ab5ae1e4a
Quote Posts: Add notifications for DMs and private posts ( #36696 )
2025-11-04 16:32:52 +00:00
Claire
8d1208224f
Merge commit 'd1f57822af0da2b2836e33baab5f89469ac6fa25' into glitch-soc/merge-upstream
2025-11-03 21:04:45 +01:00
Claire
bae5877c84
Disable paste-link-to-quote flow when composing Private Mentions ( #36690 )
2025-11-03 13:56:07 +00:00
Claire
6ff4dad89d
Merge commit '055f581ca58b62132c1eff23453031d9df9dbf0e' into glitch-soc/merge-upstream
2025-10-31 18:03:21 +01:00
diondiondion
fcecbf31ed
Show error when submitting empty post rather than failing silently ( #36650 )
2025-10-30 19:29:25 +00:00
Claire
48ec31bec8
Merge commit '4896d2c4c6d3bd6b878c5a075b6611c65d4203b2' into glitch-soc/merge-upstream
...
Conflicts:
- `app/views/settings/preferences/appearance/show.html.haml`:
Upstream changed stuff too close to glitch-soc's theming system changes.
Applied upstream's changes.
- `streaming/index.js`:
Upstream refactored a bunch of stuff where our code was different due to
local-only posts.
Applied upstream's changes while taking care of local-only posts.
2025-10-28 22:10:12 +01:00
diondiondion
e1bd9b944a
chore(deps): update dependency eslint-plugin-jsdoc to v60 ( #36466 )
2025-10-28 15:17:33 +00:00
Echo
85d0cdb5f7
Emoji: Remove final flag ( #36409 )
2025-10-28 11:33:27 +00:00
Eugen Rochko
76053fb4a9
Fix hashtags not being picked up when full-width hash sign is used ( #36103 )
...
Co-authored-by: Claire <claire.github-309c@sitedethib.com >
2025-10-27 17:18:01 +00:00
Claire
302e3fe8be
Merge commit '50743cc35be19deae9356bd21f1143e3a9b4fbb8' into glitch-soc/merge-upstream
2025-10-14 18:01:40 +02:00
Claire
156f031ed0
Fix WebUI mistakenly allowing to attach quotes when editing ( #36464 )
2025-10-14 12:21:13 +00:00
Claire
f800057008
Merge commit 'b8444d9bb7885d75112a3cae74b6a5c711c7d547' into glitch-soc/merge-upstream
2025-10-08 18:07:04 +02:00
diondiondion
474fbb2770
Fetch all replies: Only display "More replies found" prompt when there really are new replies ( #36334 )
2025-10-06 14:13:24 +00:00
Claire
cda07686df
Add feature to automatically attach quote on eligible link past in Web UI composer ( #36364 )
2025-10-06 13:43:20 +00:00
Claire
4053209a05
Merge commit '6d2493ca7c39a5d60edd7109de0c24256f8fff8c' into glitch-soc/merge-upstream
2025-09-25 18:44:23 +02:00
Claire
66686994c1
Fix not being able to author quotes with CW but no text ( #36153 )
...
Co-authored-by: diondiondion <mail@diondiondion.com >
2025-09-25 09:25:00 +00:00
Claire
210786efd8
Merge commit '2664bb628b7bf77b9efa4143423486cf16d17ba7' into glitch-soc/merge-upstream
2025-09-17 18:17:18 +02:00
Claire
2664bb628b
Fix quote with CW but no text being shown without CW ( #36150 )
2025-09-17 12:00:58 +00:00
Claire
06f45a2046
Merge commit 'eb118d85238da8d0583868abab2756bb329742ba' into glitch-soc/merge-upstream
...
Conflicts:
- `yarn.lock`:
Upstream updated dependencies textually adjacent to glitch-soc-only ones.
Updated them as upstream did.
2025-09-10 18:11:12 +02:00
diondiondion
cf20c5db9c
Show hint explaining post visibility when quoting a "quiet public" post ( #36065 )
2025-09-09 12:43:23 +00:00
Claire
1c8990927a
Move quote post fallback removal import-time ( #36055 )
2025-09-08 15:31:36 +00:00
Claire
6abe6cdef5
Merge commit '40242fafee83cf9a6bcb2d0ac1e228827969402f' into glitch-soc/merge-upstream
2025-08-29 18:21:28 +02:00
Kazuki Nagasawa
d93572ea90
Fix 404 error after deleting status from detail view ( #35800 ) ( #35881 )
2025-08-28 20:50:19 +00:00
Claire
884d7996b1
Merge commit '02de05dc272856c77fac5c9e1d84cf585ae20c1e' into glitch-soc/merge-upstream
2025-08-27 18:13:03 +02:00
Claire
02de05dc27
Add ability to list quotes of one's own posts ( #35914 )
2025-08-27 15:38:52 +00:00
Claire
a6a0d982ef
Fix streaming and handling of quoted_update notifications ( #35924 )
2025-08-27 14:53:54 +00:00
diondiondion
4180f754d0
Fix error alerts for deleted quotes ( #35918 )
2025-08-26 16:34:14 +00:00
Claire
e8fe33f273
Merge commit '7aba79ade9bfeb86105aa575bc7156acef78f7da' into glitch-soc/merge-upstream
...
Conflicts:
- `app/views/layouts/application.html.haml`:
Conflict because of glitch-soc's theming system.
Updated the line as upstream did.
2025-08-25 22:15:28 +02:00
Claire
7a76f71d99
Ensure quote policy is displayed as “Just me” when disabled because of visibility ( #35894 )
2025-08-25 13:08:37 +00:00
