Claire
7ea3c6a039
Merge commit 'e91c7645905972d9663a0d944b133ff24670bce2' into glitch-soc/merge-4.5
2025-11-05 10:02:33 +01:00
Claire
cfdd9396c0
Change paste-link-to-quote loading state from generic loading bar to compose placeholder ( #36695 )
2025-11-05 09:59:00 +01:00
Echo
5bae08d1ff
Quote Posts: Add notifications for DMs and private posts ( #36696 )
2025-11-05 09:59:00 +01:00
Claire
5f5e6ca031
Merge commit 'af4c372ab22b636742833592235d18418604fcc1' into glitch-soc/merge-4.5
2025-10-31 16:04:05 +01:00
diondiondion
214d59bd37
Show error when submitting empty post rather than failing silently ( #36650 )
2025-10-31 14:09:36 +01:00
Claire
f800057008
Merge commit 'b8444d9bb7885d75112a3cae74b6a5c711c7d547' into glitch-soc/merge-upstream
2025-10-08 18:07:04 +02:00
Echo
0c1ca6c969
Emoji: Statuses ( #36393 )
2025-10-08 14:18:11 +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
b15b07606c
Merge commit '28be5a199f685b9fb26742c4d78ddca53df05d57' into glitch-soc/merge-upstream
2025-09-24 18:26:13 +02:00
Claire
e1f7847b64
Remove the outgoing_quotes feature flag, making the feature unconditional ( #36130 )
2025-09-24 08:58:08 +00:00
Claire
9f97df84da
Merge commit '45a996f12b04f88e0774bc6d6b52452ce39b612f' into glitch-soc/merge-upstream
2025-09-11 21:20:15 +02:00
diondiondion
84d1ba980b
Allow removing deleted quotes from composer ( #36080 )
2025-09-11 14:44:20 +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
7ddb8814e1
Change description of “Quiet public” ( #36032 )
2025-09-05 18:35:34 +00:00
Claire
5cac4dfb5c
Merge commit 'abe5413638043a52e4fcbb5f16aefd14e76bf96c' into glitch-soc/merge-upstream
2025-08-22 22:52:55 +02:00
Echo
f85f0eee1b
Composer quote improvements ( #35835 )
...
Co-authored-by: Claire <claire.github-309c@sitedethib.com >
Co-authored-by: diondiondion <mail@diondiondion.com >
2025-08-21 14:07:31 +00:00
Claire
71cee3e472
Merge commit 'f16f8b51b863d3fcadd17753004adbf8962ead01' into glitch-soc/merge-upstream
...
Conflicts:
- `yarn.lock`:
Upstream updated a dependency adjacent to one that is only in glitch-soc.
Updated as upstream did.
2025-08-19 18:46:12 +02:00
Echo
f16f8b51b8
Move language and visibility buttons above CW field ( #35824 )
2025-08-19 15:29:10 +00:00
Echo
d4b2e7f771
Composer Quote UI ( #35805 )
...
Co-authored-by: diondiondion <mail@diondiondion.com >
2025-08-18 16:52:28 +00:00
Claire
4d9150735a
Merge commit '651e51a82eba542c4d8c3fec5edd16420ea1ff3e' into glitch-soc/merge-upstream
...
Conflicts:
- `yarn.lock`:
Upstream updated a dependency textually adjacent to a glitch-soc-specific one.
Updated the dependency as upstream did.
2025-08-17 20:52:34 +02:00
Echo
651e51a82e
Allow editing status quote policy ( #35762 )
2025-08-14 15:04:32 +00:00
Echo
49a6e4cbb5
Move composer buttons to top ( #35749 )
2025-08-13 14:09:45 +00:00
Echo
7cf53dbf63
Redirect on success for standalone compose ( #35763 )
2025-08-13 13:52:29 +00:00
Claire
63d3f28b20
Fix reply indicator displaying wrong avatar in rare cases ( #35756 )
2025-08-12 16:16:03 +00:00
Claire
45d79427c4
Merge commit '0af2c4829ff86cf84ed9e7804d023f31e805542b' into glitch-soc/merge-upstream
...
Conflicts:
- `vite.config.mts`:
Conflict because of differently-named theme plugins.
Updated to go with upstream's changes.
2025-07-23 12:08:59 +02:00
diondiondion
ee21f72211
fix: Don't submit post when pressing Enter in CW field ( #35445 )
2025-07-21 15:57:20 +00:00
diondiondion
4de5cbd6f5
refactor: Replace react-hotkeys with custom hook ( #35425 )
2025-07-21 14:43:38 +00:00
Claire
3efc857fbc
Merge commit '8ee6cee36e313fcc39763210dfcd3b871b47cacb' into glitch-soc/merge-upstream
2025-07-08 16:41:01 +02:00
diondiondion
b5eebd4d2b
fix: Fix can't skip search field by tabbing ( #35281 )
2025-07-07 15:10:51 +00:00
Claire
93bdb16817
Merge commit '8ba1487f30685fff4555a7537d3e6c765c73a07c' into glitch-soc/merge-upstream
...
Conflicts:
- `spec/models/concerns/account/interactions_spec.rb`:
Conflict due to glitch-soc having modified specs ages ago.
The covered code is the same as upstream, though.
Took upstream's version of the specs.
- `spec/models/status_spec.rb`:
Conflict because glitch-soc tests for an extra glitch-soc-specific
method.
Added upstream's changes while keeping the glitch-soc method.
2025-06-24 22:43:43 +02:00
Claire
d8b0beb70d
Merge commit 'b9b1500fc516ea31ab21441737c600f9b571a07d' into glitch-soc/merge-upstream
2025-06-24 21:44:33 +02:00
diondiondion
8ba1487f30
fix: Fix inaccessible "Clear search" button ( #35152 )
2025-06-24 14:36:05 +00:00
diondiondion
644da36336
feat: More obvious loading state when submitting a post ( #35153 )
2025-06-24 14:08:48 +00:00
diondiondion
d28a4428b5
refactor: Use new main menu as "Getting started" column in Advanced Web UI ( #35117 )
2025-06-23 09:59:47 +00:00
Claire
0bb83dfe7d
Merge commit '69f298731e523f7f2e97ddd6a559dfb485d4495c' into glitch-soc/merge-upstream
2025-06-16 21:07:55 +02:00
diondiondion
69f298731e
fix: Fix glitchy iOS media attachment drag interactions ( #35057 )
2025-06-16 15:37:04 +00:00
Claire
86a7a1ef3b
Merge commit '3aed93711c0118ab68fa09f4d3ac2635cb3344b8' into glitch-soc/merge-upstream
2025-06-11 22:52:21 +02:00
Echo
3aed93711c
Make React Spring respect animation preferences ( #35018 )
2025-06-11 16:51:55 +00:00
Eugen Rochko
f53bb4cd7d
Add "More" to the sidebar menu with links to mutes, blocks, and so on ( #34987 )
2025-06-11 16:12:04 +00:00
Eugen Rochko
a13b33d851
Change navigation layout on small screens in web UI ( #34910 )
2025-06-11 11:55:43 +00:00
Claire
564d74ea36
Merge commit 'd887790e86124493df850e9bc52e1e059207b523' into glitch-soc/merge-upstream
2025-06-06 18:16:52 +02:00
PGray
076005eae2
fix: update search column input on param change ( #34951 )
2025-06-06 12:25:38 +00:00
Claire
06b1f8bd85
Merge commit '8224178e8ca9746f97ce341179d2c636fa22a082' into glitch-soc/merge-upstream
...
Conflicts:
- `app/models/trends/statuses.rb`:
Upstream added a condition where glitch-soc had changes on the same line.
Adapted upstream's changes.
2025-06-02 20:05:43 +02:00
Eugen Rochko
c77158c8b7
Fix nested buttons in search popout in web UI ( #34871 )
2025-06-02 12:21:31 +00:00
Claire
5321a553d5
Merge commit 'aa04efb92a47cf27c1aafb2aeb21584e91c526ac' into glitch-soc/merge-upstream
...
Conflicts:
- `app/models/user_settings.rb`:
Not a real conflict, upstream added a setting on a line adjacent to a
glitch-soc-only line.
Added upstream's new setting.
2025-05-14 13:38:23 +02:00
Echo
545e8fbd0c
Fix emoji bundle size ( #34677 )
2025-05-14 06:39:05 +00:00
Claire
ff07676aee
Merge commit '24c25ec4f503eb1b27b4e417d15ea62b5b9ee9fb' into glitch-soc/merge-upstream
2025-05-03 18:03:42 +02:00
Claire
3ec3814f8e
Merge commit '715cbee93d419e26cf952bf7fc70f9c1cc217d8b' into glitch-soc/merge-upstream
2025-05-03 17:37:26 +02:00
Eugen Rochko
79013c730d
Add endorsed accounts to profiles in web UI ( #34568 )
2025-04-29 12:14:22 +00:00