665e9129fe
Merge commit 'e0648a916ab81925545504173bf4f43ec64d4f3c' into glitch-soc/merge-upstream
...
Conflicts:
- `app/models/custom_emoji.rb`:
An upstream refactor touched lines adjacent to ones modified in glitch-soc.
Ported upstream's changes.
2024-09-16 21:08:58 +02:00
efb0e2c34b
Fix horizontal scrollbar on who to follow carousel in web UI ( #31912 )
2024-09-16 12:08:37 +00:00
83b553c7d1
Merge commit '0226bbe5165a53658b29e46ddbef6a10507fdc8c' into glitch-soc/merge-upstream
2024-09-12 21:32:39 +02:00
3465d39494
Merge commit '24ef8255b3f9b44cb54f49bc78fe3382a7070b1a' into glitch-soc/merge-upstream
...
Conflicts:
- `app/helpers/accounts_helper.rb`:
Upstream removed a helper, textually adjacent to a glitch-soc-only one.
Not really a conflict.
Removed the helper as upstream did.
- `app/views/layouts/embedded.html.haml`:
Conflicts due to theming system.
Adapted upstream's change to our theming system.
- `app/views/statuses/_simple_status.html.haml`:
Removed upstream, but we had local changes.
Removed as upstream did.
2024-09-12 20:05:08 +02:00
90d7a4bac4
Merge commit 'a27f7f4e561c9d2fe21d984059603d2f500c005b' into glitch-soc/merge-upstream
2024-09-12 17:22:06 +02:00
a269ff9253
Fix review history and action modal styling ( #31864 )
2024-09-12 14:18:43 +00:00
24ef8255b3
Change design of embed modal in web UI ( #31801 )
2024-09-12 12:54:16 +00:00
10e2b87774
Merge commit '0c3c06f7cc50c9207a44f56e184ce6a41f953171' into glitch-soc/merge-upstream
2024-09-12 12:09:21 +02:00
3d46f47817
Change embedded posts to use web UI ( #31766 )
...
Co-authored-by: Claire <claire.github-309c@sitedethib.com>
2024-09-12 09:41:19 +00:00
b240bad61a
Merge commit '5260233b81c301cf7b0c79b179858748b693460b' into glitch-soc/merge-upstream
2024-09-11 20:58:35 +02:00
a3215c0f88
Change inner borders in media galleries in web UI ( #31852 )
2024-09-11 07:29:18 +00:00
e09f9f885e
Fix alt text modal styling ( #31844 )
2024-09-10 17:33:55 +00:00
e0c27a5047
Add ability to manage which websites can credit you in link previews ( #31819 )
2024-09-10 12:00:40 +00:00
3929e3c6d2
Change design of hide media button in web UI ( #31807 )
2024-09-10 09:29:17 +00:00
a021dee642
Change labels on thread indicators in web UI ( #31806 )
2024-09-09 15:28:54 +00:00
1a0ef0c526
Merge commit '5acec087caed4a2fdf0fd8ed11f891222496f321' into glitch-soc/merge-upstream
2024-09-05 20:36:25 +02:00
bc435c63bd
Change width of columns in advanced web UI ( #31762 )
2024-09-05 14:57:53 +00:00
b4b639ee4a
Fix radio checkbox visibility in Report dialogs ( #31752 )
2024-09-05 12:34:13 +00:00
b265a654d7
Fix wrong width on content warnings and filters in web UI ( #31761 )
2024-09-05 09:46:11 +00:00
ec4c49082e
Change design of unread conversations in web UI ( #31763 )
2024-09-05 09:39:59 +00:00
fef055db96
Merge commit 'c9ea91f8683cd5c0cfac14071a17e3956ac6d3b0' into glitch-soc/merge-upstream
...
Conflicts:
- `spec/requests/api/v1/timelines/tag_spec.rb`:
Upstream refactored this file, while we had a change to switch a default setting.
Updated as upstream did.
- `spec/views/statuses/show.html.haml_spec.rb`:
Upstream refactored this file, while we stubbed different methods.
Updated as upstream did, and updated the stubs accordingly.
2024-09-03 21:51:53 +02:00
0437dd9e77
Fix radio buttons styling in web UI ( #31723 )
2024-09-03 11:37:09 +00:00
6f35e93f72
Merge commit '02633d6ebbe944a8769c8f2229fa9e0d6c7d1142' into glitch-soc/merge-upstream
2024-08-31 16:06:04 +02:00
3ddeaca863
Change background color of notifications on private messages ( #31657 )
2024-08-30 09:42:48 +00:00
94d8cdc494
Merge commit '04f0468016b450ace8e0ce707b4c21aa18b51262' into glitch-soc/merge-upstream
2024-08-27 20:00:07 +02:00
29b9642b31
Change design of boost modal in web UI ( #31555 )
2024-08-26 17:12:17 +00:00
532b53eece
Fix assets build issue due to slightly different webpack config
2024-08-22 22:23:06 +02:00
dc70ef25b2
Merge commit 'e08d22724d9baf6c639466507c2b117788e5b8de' into glitch-soc/merge-upstream
2024-08-22 22:09:10 +02:00
e08d22724d
Fix missing CSS in moderation interface ( #31550 )
2024-08-22 18:57:22 +00:00
18556d3e9b
Merge commit '98237207e67697abffc6b141f2388e3d8c925260' into glitch-soc/merge-upstream
...
Conflicts:
- `app/helpers/application_helper.rb`:
Upstream refactored some helpers and moved them in another file.
Not a real conflict, but glitch-soc had adjacent glitch-only definitions.
Kept glitch-soc definitions where they are and moved upstream ones
as upstream did.
2024-08-22 19:54:20 +02:00
500f4925a5
Change how content warnings and filters are displayed in web UI ( #31365 )
2024-08-22 17:12:35 +00:00
376088f6da
Add button to view the Hashtag on the instance from Hashtags in Moderation UI ( #31533 )
2024-08-22 08:42:33 +00:00
fa2e758152
Merge commit '2da687a28b509025343d3d8ca17753de9b128e8f' into glitch-soc/merge-upstream
2024-08-21 20:32:02 +02:00
2da687a28b
Remove dead CSS code ( #31527 )
2024-08-21 17:05:02 +00:00
0cec9077a4
Merge commit 'edeae945c0c9d6318d489ab720587621545063d0' into glitch-soc/merge-upstream
...
Conflicts:
- `spec/requests/api/v2/instance_spec.rb`:
Upstream added a test for a new attribute, next to a line we modified
in glitch-soc because of a different default value.
Updated as upstream's did, keeping glitch-soc's default value.
2024-08-21 18:44:21 +02:00
edeae945c0
Remove fontawesome leftovers ( #31525 )
2024-08-21 15:55:35 +00:00
e48a64d3b5
Fix distracting and confusing always-showing scrollbar track in boost confirmation modal ( #31524 )
2024-08-21 10:25:14 +00:00
b06c7b6b5a
Change hints for missing remote content in web UI ( #31516 )
2024-08-21 07:08:58 +00:00
f5c0c32edd
Merge commit '9ba7c90151463a6e4f7952317253fe8c113e9b0a' into glitch-soc/merge-upstream
...
Conflicts:
- `app/javascript/material-icons/400-24px/chat.svg`:
Glitch-soc used this one but not upstream.
Upstream pulled a presumably more up-to-date version of the file.
Switched to upstream's version.
- `app/views/layouts/application.html.haml`:
Upstream removed use of font-awesome.
I hope we are ready.
- `app/views/layouts/embedded.html.haml`:
Upstream removed use of font-awesome.
I hope we are ready.
- `app/views/layouts/error.html.haml`:
Upstream removed use of font-awesome.
I hope we are ready.
2024-08-20 18:31:50 +02:00
4016fd5128
Update CSS color variables to match our latest design system ( #31510 )
2024-08-20 15:56:44 +00:00
05b4380051
Fix margin in follow notification in web UI ( #31508 )
2024-08-20 14:03:09 +00:00
fa2e7b1708
Migrate fontawesome->material in more views ( #31360 )
2024-08-20 11:52:45 +00:00
2f01f5f4ea
Harmonize persistent scrollbar styles ( #31445 )
2024-08-20 07:48:51 +00:00
98bf2fc27c
Improve the list selection UI for notification requests ( #31457 )
2024-08-19 22:11:58 +00:00
3ea00508ac
Merge commit '2d589a5ed445b474ab7cec27b0db2a331ed7bd49' into glitch-soc/merge-upstream
2024-08-16 20:06:59 +02:00
32a78e56e0
Add a follow button & follower count on follow notifications ( #31433 )
2024-08-16 10:00:59 +00:00
9f2775830c
Merge commit '5d04e297755c4a8b4e908f706d272520521341d4' into glitch-soc/merge-upstream
2024-08-15 21:58:04 +02:00
9194197de5
Modify profile directory page image borders ( #31391 )
2024-08-14 19:23:45 +00:00
169b35869f
Merge commit 'a1ddaa9ee96ab1d05f4e37f3472b0418e0d5628e' into glitch-soc/merge-upstream
2024-08-14 21:17:43 +02:00
a1ddaa9ee9
Fix removal of border from account listing ( #31432 )
2024-08-14 17:09:23 +00:00
Claire
Eugen Rochko
Michael Stanclift
Emelia Smith
Renaud Chaput
Matt Jankowski