3b56d69896
Merge branch 'emoji-reactions-base' into develop
2025-09-21 19:01:32 +02:00
Claire
06f45a2046
Merge commit ' eb118d8523' 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
377e870348
Improve accessibility of visibility modal dropdowns ( #36068 )
2025-09-09 17:44:43 +00:00
diondiondion
66d73fc213
Lighten up modal background colours in light mode ( #36069 )
2025-09-09 17:43:36 +00:00
diondiondion
c0af4581aa
Visibility dialog: Add visual dropdown indicator to Dropdown component ( #36052 )
2025-09-08 12:53:23 +00:00
diondiondion
0153b49ef7
Visibility modal: Match dropdown width to button ( #36054 )
2025-09-08 12:43:38 +00:00
diondiondion
a5fbe2f5c1
Fix missing icons and subtitle in mobile boost/quote menu ( #36038 )
2025-09-08 08:50:46 +00:00
Claire
6fc9febb47
Merge commit ' 1b664cf20d' into glitch-soc/merge-upstream
2025-09-05 20:03:42 +02:00
diondiondion
e7c30cd072
Add first-time user education hint about quote removal on Quote notifications ( #35986 )
2025-09-04 13:01:12 +00:00
diondiondion
bc952ebde9
Add new plain (text-only) button variant ( #36002 )
2025-09-03 12:34:29 +00:00
Claire
d5b959a2ca
Merge commit ' 75fca715e9' into glitch-soc/merge-upstream
...
Conflicts:
- `app/views/settings/preferences/other/show.html.haml`:
Upstream moved some preferences to a new category, while glitch-soc had an
extra preference there.
Moved the extra preference like upstream did to the new category.
2025-09-02 19:07:51 +02:00
Emelia Smith
2138f3e40f
Move 'add more' inside table toolbar on reports ( #35963 )
2025-09-02 07:54:58 +00:00
Emelia Smith
314d5f0d7a
Fix batch table toolbar displaying under status media ( #35962 )
2025-09-01 16:02:31 +00:00
Emelia Smith
15401e6988
Support displaying polls in Admin UI ( #35933 )
...
Co-authored-by: Claire <claire.github-309c@sitedethib.com>
2025-09-01 14:59:03 +00:00
Claire
03e07d88d7
Merge commit ' d880f397df' into glitch-soc/merge-upstream
2025-08-28 20:23:39 +02:00
Claire
b6cd32281f
Accomodate longer text in quote/reblog dropdown ( #35930 )
2025-08-27 17:20:02 +00:00
Claire
e8fe33f273
Merge commit ' 7aba79ade9' 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
diondiondion
94ad088482
Fix broken custom radio buttons & checkboxes in modals ( #35891 )
2025-08-25 09:12:46 +00:00
Claire
5cac4dfb5c
Merge commit ' abe5413638' into glitch-soc/merge-upstream
2025-08-22 22:52:55 +02:00
Claire
02134172f1
Merge commit ' e770303968' into glitch-soc/merge-upstream
...
Conflicts:
- `.rubocop_todo.yml`:
Glitch-soc had different overrides, but upstream simply disabled the rules.
Disabled them as well.
- `app/serializers/initial_state_serializer.rb`:
Not really a conflict, again because of a rubocop comment.
2025-08-22 22:33:11 +02:00
Echo
4df50b9c7e
Visibility Modal fixes ( #35865 )
2025-08-22 12:34:37 +00:00
diondiondion
a1c7b853ec
Improve feed item focus outlines ( #35864 )
2025-08-22 12:10:07 +00:00
diondiondion
118c30fbc7
Improvements for keyboard navigation in feeds ( #35853 )
2025-08-22 09:57:39 +00:00
diondiondion
511e10df34
Fix layout shift caused by "Who to follow" widget ( #35861 )
2025-08-22 09:44:10 +00:00
Emelia Smith
4f494781c1
Refactor to reuse the one status partial across moderation tools ( #35644 )
2025-08-21 14:51:11 +00: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
45ec4c93c0
Fix display of quotes in threads in WebUI ( #35834 )
2025-08-20 14:39:58 +00:00
Echo
8268323d7f
Status quote button ( #35822 )
2025-08-20 10:09:57 +00:00
Claire
71cee3e472
Merge commit ' f16f8b51b8' 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
Claire
4ffcf7f7ed
Merge commit ' 255d8f3f8c' into glitch-soc/merge-upstream
2025-08-18 22:05:19 +02:00
Echo
d4b2e7f771
Composer Quote UI ( #35805 )
...
Co-authored-by: diondiondion <mail@diondiondion.com>
2025-08-18 16:52:28 +00:00
Alan
95111e88e3
Update color alpha blending to use Sass color functions ( #35787 )
2025-08-18 15:55:38 +00:00
Claire
4d9150735a
Merge commit ' 651e51a82e' 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
renovate[bot]
ac0581fd22
Update devDependencies (non-major) ( #35660 )
...
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
Co-authored-by: Renaud Chaput <renchap@gmail.com>
2025-08-14 08:36:38 +00:00
Echo
49a6e4cbb5
Move composer buttons to top ( #35749 )
2025-08-13 14:09:45 +00:00
3f5041fd60
Merge branch 'emoji-reactions-base' into develop
2025-08-12 22:12:00 +02:00
Claire
e53421b548
Merge commit ' e5826777b6' into glitch-soc/merge-upstream
...
Conflicts:
- `config/settings.yml`:
Not a real conflict, upstream removed settings that are identical in glitch-soc
but textually adjacent to glitch-soc-only settings.
Removed what upstream removed.
2025-07-30 20:05:45 +02:00
Eugen Rochko
92bf55afd0
Change design of quote posts in web UI ( #35584 )
2025-07-30 15:53:42 +00:00
Claire
63af7ecb1f
Merge commit ' 7d3ef27a8d' into glitch-soc/merge-upstream
2025-07-23 18:43:56 +02:00
diondiondion
d36236cbcd
fix: Fix glitchy status keyboard navigation ( #35455 )
2025-07-23 07:39:36 +00:00
Claire
5ff0039d7b
Merge commit ' fab95b8dae' into glitch-soc/merge-upstream
2025-07-22 23:17:48 +02:00
diondiondion
3771f9e04b
fix: Fix quote posts styling on notifications page ( #35411 )
2025-07-17 17:28:30 +00:00
Claire
d6ce7de2d3
Merge commit ' 331599fa2b' into glitch-soc/merge-upstream
...
Conflicts:
- `.github/ISSUE_TEMPLATE/1.web_bug_report.yml`:
We don't use the github features that upstream does, so kept our version.
- `.github/ISSUE_TEMPLATE/2.server_bug_report.yml`:
We don't use the github features that upstream does, so kept our version.
2025-07-16 21:31:28 +02:00
diondiondion
558b9c90a6
fix: Fix selected item in poll select menus is unreadable in Firefox ( #35402 )
2025-07-16 12:03:39 +00:00
Claire
eeffe580d8
Merge commit ' 74fc4dbacf' into glitch-soc/merge-upstream
2025-07-15 18:19:32 +02:00
diondiondion
74fc4dbacf
refactor: Only remove pointer-events when necessary ( #35390 )
2025-07-15 15:57:31 +00:00
diondiondion
82a6ff091f
fix: Improve Dropdown component accessibility ( #35373 )
2025-07-15 07:52:34 +00:00
a27da8140b
Merge branch 'upstream-main' into develop
2025-07-10 17:40:47 +02:00
