Claire
72affd6b45
Merge commit 'a863e68d174b176dc350d8e3472c010cd37b7807' into glitch-soc/merge-upstream
...
Conflicts:
- `app/models/trends/statuses.rb`:
Conflict because of glitch-soc's setting to allow CWs in trends.
Kept glitch-soc's setting but followed upstream's refactor.
- `docker-compose.yml`:
Conflict because of upstream VS glitch-soc repos.
Updated version number as upstream did, but kept glitch-soc repos.
2025-07-24 18:10:38 +02:00
Claire
a863e68d17
Add restrictions on which quote posts can trend ( #35507 )
2025-07-24 15:45:12 +00:00
renovate[bot]
847b37552a
chore(deps): update dependency httplog to v1.7.2 ( #35506 )
...
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
2025-07-24 15:08:50 +00:00
Echo
dfaca794bf
Force modern emoji experimental to be dev mode only ( #35505 )
2025-07-24 14:55:00 +00:00
diondiondion
6fc77a545b
fix: Fix TypeError on pages with empty feeds ( #35504 )
2025-07-24 14:30:56 +00:00
renovate[bot]
c871c7398e
fix(deps): update dependency @vitejs/plugin-react to v4.7.0 ( #35421 )
...
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
2025-07-24 09:00:32 +00:00
Mayank
8baed8b90e
remove redundant title text from media modal images in web UI ( #35468 )
2025-07-24 08:58:22 +00:00
David Roetzel
8a1c43bf3b
Use default for preselected default privacy post setting ( #35422 )
2025-07-24 08:23:41 +00:00
Matt Jankowski
5c01ccc31f
Set flash options via redirect where possible ( #35370 )
2025-07-24 08:03:28 +00:00
renovate[bot]
67be8208db
chore(deps): update dependency haml_lint to v0.65.1 ( #35497 )
...
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
2025-07-24 07:52:34 +00:00
David Roetzel
7d136feccf
Bump version to v4.4.2 ( #35498 )
2025-07-24 07:51:56 +00:00
Matt Jankowski
e54e96d61f
Extract params hash for api/v1/push/subscriptions#create ( #35475 )
2025-07-24 07:49:20 +00:00
github-actions[bot]
469304359a
New Crowdin Translations (automated) ( #35495 )
...
Co-authored-by: GitHub Actions <noreply@github.com >
2025-07-24 07:49:09 +00:00
Matt Jankowski
290e36d7e8
Finish migration of api/web/push_subscriptions controller->request spec ( #35482 )
2025-07-24 07:46:09 +00:00
Matt Jankowski
4241ce9888
Silence json key duplicate warning from api/web/push_subscriptions ( #35481 )
2025-07-24 07:33:53 +00:00
Echo
7f9ad7eabf
Enables cross-origin Web Workers ( #35483 )
2025-07-24 07:14:27 +00:00
Claire
a6794c066d
Fix “Expand this post” link including user @undefined ( #35478 )
2025-07-23 23:09:24 +00:00
Claire
dfdd844882
Merge pull request #3141 from ClearlyClaire/glitch-soc/merge-upstream
...
Merge upstream changes up to 7d3ef27a8d
2025-07-23 20:58:41 +02:00
Echo
afa217da97
[Glitch] Fix accidentally instantiating Web Worker
...
Port 7d3ef27a8dclaire.github-309c@sitedethib.com >
2025-07-23 19:05:46 +02:00
Echo
8a8453e3b1
[Glitch] Emoji Rendering
...
Port 760d00b7f7claire.github-309c@sitedethib.com >
2025-07-23 19:05:04 +02:00
Eugen Rochko
a8432560ba
[Glitch] Add button to load new replies in web UI
...
Port 14a781fa24claire.github-309c@sitedethib.com >
2025-07-23 18:49:25 +02:00
diondiondion
d9c1e45739
[Glitch] fix: Fix glitchy status keyboard navigation
...
Port d36236cbcdclaire.github-309c@sitedethib.com >
2025-07-23 18:45:47 +02:00
Claire
63af7ecb1f
Merge commit '7d3ef27a8dc8fb281bae959b245d3db63aa82260' into glitch-soc/merge-upstream
2025-07-23 18:43:56 +02:00
Echo
7d3ef27a8d
Fix accidentally instantiating Web Worker ( #35473 )
2025-07-23 14:01:45 +00:00
Eugen Rochko
14a781fa24
Add button to load new replies in web UI ( #35210 )
2025-07-23 13:42:07 +00:00
Claire
a93a67a4d9
Merge pull request #3138 from ClearlyClaire/glitch-soc/merge-upstream
...
Merge upstream changes up to 0af2c4829f
2025-07-23 13:58:43 +02:00
Claire
d69c5f1a6e
Fix glitch assets not being found
2025-07-23 12:48:45 +02:00
diondiondion
26ba2db53f
[Glitch] fix: Don't submit post when pressing Enter in CW field
...
Port ee21f72211claire.github-309c@sitedethib.com >
2025-07-23 12:28:15 +02:00
diondiondion
0ae7c7e406
[Glitch] refactor: Replace react-hotkeys with custom hook
...
Port 4de5cbd6f5claire.github-309c@sitedethib.com >
2025-07-23 12:22:42 +02:00
Claire
105315a2e3
Rename GlitchThemes plugin on import to reduce changes with upstream
2025-07-23 12:10:29 +02: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
renovate[bot]
cec26d58c8
chore(deps): update dependency json-ld-preloaded to v3.3.2 ( #35470 )
...
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
2025-07-23 08:13:04 +00:00
renovate[bot]
593cdae404
fix(deps): update dependency axios to v1.11.0 ( #35471 )
...
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
2025-07-23 08:12:16 +00:00
Matt Jankowski
d2ef9ac04a
Use report_range method in admin/tags to generate reporting period ( #35465 )
2025-07-23 08:02:07 +00:00
Matt Jankowski
d065ec9298
Combine assignment params in admin/accounts#batch action ( #35463 )
2025-07-23 07:59:14 +00:00
Matt Jankowski
b19131202f
Extract constants for captcha directives/sources ( #35439 )
2025-07-23 07:55:54 +00:00
Matt Jankowski
70058ae49d
Add Form::BaseBatch class for "batch form update" objects ( #35458 )
2025-07-23 07:50:35 +00:00
renovate[bot]
62a23b1985
chore(deps): update dependency rspec-sidekiq to v5.2.0 ( #35436 )
...
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
2025-07-23 07:42:48 +00:00
renovate[bot]
6917cd2f40
chore(deps): update dependency propshaft to v1.2.1 ( #35451 )
...
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
2025-07-23 07:40:24 +00:00
diondiondion
d36236cbcd
fix: Fix glitchy status keyboard navigation ( #35455 )
2025-07-23 07:39:36 +00:00
Claire
b3809ffa31
Merge pull request #3137 from ClearlyClaire/glitch-soc/merge-upstream
...
Merge upstream changes up to fab95b8dae
2025-07-22 23:53:05 +02:00
diondiondion
82f1bb4191
[Glitch] fix: Fix quote posts styling on notifications page
...
Port 3771f9e04bclaire.github-309c@sitedethib.com >
2025-07-22 23:20:30 +02:00
diondiondion
40de31ddad
[Glitch] refactor: Disable useDrag hook when main menu is not openable
...
Port a842b14c84claire.github-309c@sitedethib.com >
2025-07-22 23:20:11 +02:00
diondiondion
696ad9d414
[Glitch] fix: Add lang attribute to current composer language in alt text modal
...
Port 138746bdccclaire.github-309c@sitedethib.com >
2025-07-22 23:19:55 +02:00
Claire
5ff0039d7b
Merge commit 'fab95b8dae3db411318638804a01675dd5b38a01' into glitch-soc/merge-upstream
2025-07-22 23:17:48 +02:00
Claire
889c0b3a1f
Merge commit '9e6a9efe101b36291897ae9fd4dbc5163a6cef38' into glitch-soc/merge-upstream
...
Conflicts:
- `package.json`:
Upstream added/updated dependency adjacent to glitch-soc-only dependency.
Updated as upstream did.
- `vite.config.mts`:
Upstream reworked the config file while using a different plugin for themes.
Adapted upstream's changes.
- `yarn.lock`:
Same as `package.json`
2025-07-22 23:07:30 +02:00
Echo
760d00b7f7
Emoji Rendering ( #35424 )
2025-07-22 14:43:15 +00:00
Echo
0af2c4829f
Creates Vite plugin to generate assets file ( #35454 )
2025-07-22 13:58:04 +00:00
github-actions[bot]
be3dc5b508
New Crowdin Translations (automated) ( #35453 )
...
Co-authored-by: GitHub Actions <noreply@github.com >
2025-07-22 10:10:37 +00:00
Claire
9c9bca713b
Merge pull request #3136 from ClearlyClaire/glitch-soc/merge-upstream
...
Merge upstream changes up to 19626ad89f
2025-07-21 22:40:28 +02:00
