CSDUMMI
1ebdd46242
Add direct link to the Single-Sign On provider if there is only one sign up method available ( #26083 )
2023-08-03 16:43:15 +02:00
Christian Schmidt
8da99ffb0d
Add alt text for preview card thumbnails ( #26184 )
2023-08-03 15:41:51 +02:00
Christian Schmidt
ecb00fa5ac
Add alt text for preview card thumbnails ( #26184 )
2023-08-03 15:41:51 +02:00
Eugen Rochko
9a214a414e
Change design of role badges in web UI ( #26281 )
...
Co-authored-by: Claire <claire.github-309c@sitedethib.com>
2023-08-02 17:24:32 +02:00
Eugen Rochko
2cbdff97ce
Change design of role badges in web UI ( #26281 )
...
Co-authored-by: Claire <claire.github-309c@sitedethib.com>
2023-08-02 17:24:32 +02:00
Claire
1fd3d95e65
Change interaction modal input to disable browser spell-checking, capitalization and autocomplete ( #26267 )
2023-08-01 17:11:30 +02:00
Claire
71fd70335a
Change interaction modal input to disable browser spell-checking, capitalization and autocomplete ( #26267 )
2023-08-01 17:11:30 +02:00
Claire
84bc751433
Merge commit '6a19d5ce9942686e0cda1a9decec349d0a1f4e26' into glitch-soc/merge-upstream
...
Conflicts:
- `app/controllers/authorize_interactions_controller.rb`:
Small conflict due to our theming system.
- `streaming/index.js`:
Upstream refactored part of the streaming server.
We had some extra logic for handling local-only posts.
Applied the refactor.
2023-07-30 16:11:55 +02:00
Claire
92fa9d34b0
Merge commit '3554c527954441fd924586a49c7d99a89101ac7e' into glitch-soc/merge-upstream
...
Conflicts:
- `app/controllers/authorize_interactions_controller.rb`:
Small conflict due to our theming system.
- `streaming/index.js`:
Upstream refactored part of the streaming server.
We had some extra logic for handling local-only posts.
Applied the refactor.
2023-07-30 16:11:55 +02:00
Claire
68d080177a
Merge commit 'eb1139fd42203ad966810f7f7ed6b55949ac7e8a' into glitch-soc/merge-upstream
2023-07-30 15:54:34 +02:00
Claire
454d8567d4
Merge commit '1814990a3d117555153321216fa593e4d9e84de3' into glitch-soc/merge-upstream
2023-07-30 15:54:34 +02:00
Claire
f55959ebd9
Merge commit '1d29569d89c81b439c6a1d86c8f85cc48a9649c8' into glitch-soc/merge-upstream
...
Conflicts:
- `db/schema.rb`:
Upstream regenerated the schema file using Rails 7, the conflicts are
caused by our extra columns.
Applied upstream's changes, but keeping our extra columns.
2023-07-30 14:58:56 +02:00
Claire
bd349cb850
Merge commit 'ce1f35d7e213327549b960bb64f63c67a141ea40' into glitch-soc/merge-upstream
...
Conflicts:
- `db/schema.rb`:
Upstream regenerated the schema file using Rails 7, the conflicts are
caused by our extra columns.
Applied upstream's changes, but keeping our extra columns.
2023-07-30 14:58:56 +02:00
Claire
1039fce896
Merge commit '5a5d8a97579bf2da481871588425734678019f52' into glitch-soc/merge-upstream
2023-07-30 14:33:28 +02:00
Claire
b2515feb29
Merge commit 'cfd50f30bb5dda4dd90e1ad01f3e62c99135c36f' into glitch-soc/merge-upstream
2023-07-30 14:33:28 +02:00
Claire
cb4ffdea8b
Merge commit '1d3f8af23a23c2d3d8399d7b4367de69b72e269a' into glitch-soc/merge-upstream
...
Conflicts:
- `config/initializers/content_security_policy.rb`:
Upstream fixed an issue that was not present in glitch-soc.
Kept our version.
2023-07-30 13:49:35 +02:00
Claire
42f36aa55a
Merge commit '5b457961fc1189a71599dc6c06b3f159b195a455' into glitch-soc/merge-upstream
...
Conflicts:
- `config/initializers/content_security_policy.rb`:
Upstream fixed an issue that was not present in glitch-soc.
Kept our version.
2023-07-30 13:49:35 +02:00
Claire
2f3f1d75fa
Merge commit '58b52b7a33717406faa8d988b7c05efa52f46f6a' into glitch-soc/merge-upstream
...
Conflicts:
- `app/models/account.rb`:
Upstream added new validations close to lines on which glitch-soc had
modified validations to handle custom limits set through environment
variables.
Ported upstream changes.
- `config/initializers/content_security_policy.rb`:
Upstream added `AZURE_ALIAS_HOST`. Glitch-soc's version of the file is
completely different.
Added `AZURE_ALIAS_HOST` to our version of the file.
2023-07-30 13:15:01 +02:00
Claire
993d0a9950
Merge commit '1e3b19230a48174acf524cf1a9f5a498e220ea7d' into glitch-soc/merge-upstream
...
Conflicts:
- `app/models/account.rb`:
Upstream added new validations close to lines on which glitch-soc had
modified validations to handle custom limits set through environment
variables.
Ported upstream changes.
- `config/initializers/content_security_policy.rb`:
Upstream added `AZURE_ALIAS_HOST`. Glitch-soc's version of the file is
completely different.
Added `AZURE_ALIAS_HOST` to our version of the file.
2023-07-30 13:15:01 +02:00
Eugen Rochko
b49ab86b01
Change aspect ratios on link previews in web UI ( #26250 )
2023-07-30 03:35:17 +02:00
Eugen Rochko
d4807a5e64
Change aspect ratios on link previews in web UI ( #26250 )
2023-07-30 03:35:17 +02:00
Plastikmensch
0ec4833397
Fix public TL not indicating new toots when onlyRemote
is enabled ( #26247 )
...
Signed-off-by: Plastikmensch <plastikmensch@users.noreply.github.com>
2023-07-29 20:18:38 +02:00
Plastikmensch
4d3a129212
Fix public TL not indicating new toots when onlyRemote
is enabled ( #26247 )
...
Signed-off-by: Plastikmensch <plastikmensch@users.noreply.github.com>
2023-07-29 20:18:38 +02:00
Claire
fc10002966
Change the wording of the dismissable explore prompt ( #25917 )
2023-07-27 16:51:02 +02:00
Claire
a4ec187a20
Change the wording of the dismissable explore prompt ( #25917 )
2023-07-27 16:51:02 +02:00
Claire
7c911ce842
Fix emoji picker button scrolling with textarea content in single-column view ( #25304 )
2023-07-27 16:20:33 +02:00
Claire
bbea052935
Fix emoji picker button scrolling with textarea content in single-column view ( #25304 )
2023-07-27 16:20:33 +02:00
Claire
20809d5d8c
Change interaction modal in web UI ( #26075 )
...
Co-authored-by: Eugen Rochko <eugen@zeonfederated.com>
2023-07-27 16:11:17 +02:00
Claire
b4e739ff0f
Change interaction modal in web UI ( #26075 )
...
Co-authored-by: Eugen Rochko <eugen@zeonfederated.com>
2023-07-27 16:11:17 +02:00
Claire
03ccbb053b
Add role badges to the WebUI ( #25649 )
2023-07-27 16:05:24 +02:00
Claire
1e4ccc655a
Add role badges to the WebUI ( #25649 )
2023-07-27 16:05:24 +02:00
Christian Schmidt
aa8d37c422
Fix missing GIF badge in account gallery ( #26166 )
2023-07-26 03:33:31 +02:00
Christian Schmidt
a4b69bec2e
Fix missing GIF badge in account gallery ( #26166 )
2023-07-26 03:33:31 +02:00
Eugen Rochko
b977a84e19
Add published date and author to news on the explore screen in web UI ( #26155 )
2023-07-25 00:57:15 +02:00
Eugen Rochko
f826a95f6e
Add published date and author to news on the explore screen in web UI ( #26155 )
2023-07-25 00:57:15 +02:00
Christian Schmidt
6ac7dcf180
Fix lang
for UI texts in link preview ( #26149 )
2023-07-24 23:01:31 +02:00
Christian Schmidt
4299208487
Fix lang
for UI texts in link preview ( #26149 )
2023-07-24 23:01:31 +02:00
Eugen Rochko
a90d7ac141
Fix missing action label on sensitive videos and embeds in web UI ( #26135 )
2023-07-24 22:04:38 +02:00
Eugen Rochko
714a20697f
Fix missing action label on sensitive videos and embeds in web UI ( #26135 )
2023-07-24 22:04:38 +02:00
Christian Schmidt
bfa1f2a86f
Add lang
attribute to trending links ( #26111 )
2023-07-24 13:48:23 +02:00
Christian Schmidt
76fce34ebb
Add lang
attribute to trending links ( #26111 )
2023-07-24 13:48:23 +02:00
Eugen Rochko
9015e5b194
Change design of link previews in web UI ( #26136 )
2023-07-24 13:47:28 +02:00
Eugen Rochko
6b2952d1dd
Change design of link previews in web UI ( #26136 )
2023-07-24 13:47:28 +02:00
Eugen Rochko
1c28a202fe
Remove 16:9 cropping from web UI ( #26132 )
2023-07-24 13:46:55 +02:00
Eugen Rochko
4d01d1a1ee
Remove 16:9 cropping from web UI ( #26132 )
2023-07-24 13:46:55 +02:00
Eugen Rochko
e7dec5699c
Remove back button from bookmarks, favourites and lists screens in web UI ( #26126 )
2023-07-23 17:55:20 +02:00
Eugen Rochko
5e8cbb5f82
Remove back button from bookmarks, favourites and lists screens in web UI ( #26126 )
2023-07-23 17:55:20 +02:00
gunchleoc
257fadcec4
Replace 'favourite' by 'favorite' for American English ( #26009 )
2023-07-21 19:09:13 +02:00
gunchleoc
217ef7f2af
Replace 'favourite' by 'favorite' for American English ( #26009 )
2023-07-21 19:09:13 +02:00
Trevor Wolf
e1c5bed7b4
change focus ui for keyboard only input ( #25935 )
2023-07-21 13:20:14 +02:00
Trevor Wolf
59478a1b46
change focus ui for keyboard only input ( #25935 )
2023-07-21 13:20:14 +02:00
Claire
70b4eb5baa
Change thread view to scroll to the selected post rather than the post being replied to ( #24685 )
2023-07-21 13:14:30 +02:00
Claire
e4ea80d808
Change thread view to scroll to the selected post rather than the post being replied to ( #24685 )
2023-07-21 13:14:30 +02:00
Stanislas Signoud
cf170761e7
Fix a missing redirection on getting-started in multi column mode ( #26070 )
2023-07-20 14:46:02 +02:00
Stanislas Signoud
586b1c9dca
Fix a missing redirection on getting-started in multi column mode ( #26070 )
2023-07-20 14:46:02 +02:00
Claire
cb70bb8665
Merge branch 'main' into glitch-soc/merge-upstream
...
Conflicts:
- `app/views/admin/settings/appearance/show.html.haml`:
Upstream enforced an uniform code style around lambdas, and glitch-soc
had a different lambda due to its theming system.
Applied the same code style changes.
- `app/views/settings/preferences/appearance/show.html.haml`:
Upstream enforced an uniform code style around lambdas, and glitch-soc
removed some code just after the lambda.
Applied the same code style changes.
2023-07-17 19:02:23 +02:00
Claire
c04f2d0cf7
Merge branch 'main' into glitch-soc/merge-upstream
...
Conflicts:
- `app/views/admin/settings/appearance/show.html.haml`:
Upstream enforced an uniform code style around lambdas, and glitch-soc
had a different lambda due to its theming system.
Applied the same code style changes.
- `app/views/settings/preferences/appearance/show.html.haml`:
Upstream enforced an uniform code style around lambdas, and glitch-soc
removed some code just after the lambda.
Applied the same code style changes.
2023-07-17 19:02:23 +02:00
Claire
80fa2baa3d
Fix “Back” button sometimes redirecting out of Mastodon ( #25281 )
2023-07-17 17:32:46 +02:00
Claire
a442a1d1c6
Fix “Back” button sometimes redirecting out of Mastodon ( #25281 )
2023-07-17 17:32:46 +02:00
Claire
efa6d4416c
Merge commit '528a8d0cbeaad7d73fc0dc310d4199701e0353a3' into glitch-soc/merge-upstream
2023-07-13 22:40:15 +02:00
Claire
d9adda1a99
Merge commit '71db616fed817893d0efa363f0e7dbfcf23866a0' into glitch-soc/merge-upstream
2023-07-13 22:40:15 +02:00
Claire
528a8d0cbe
Change “About” and “Privacy policy” links to open in a new tab in advanced interface ( #25973 )
2023-07-13 17:59:15 +02:00
Claire
71db616fed
Change “About” and “Privacy policy” links to open in a new tab in advanced interface ( #25973 )
2023-07-13 17:59:15 +02:00
Stanislas Signoud
663e9484e2
Change links in multi-column mode so tabs are open in single-column mode ( #25893 )
2023-07-13 17:18:09 +02:00
Stanislas Signoud
5fad7bd58a
Change links in multi-column mode so tabs are open in single-column mode ( #25893 )
2023-07-13 17:18:09 +02:00
Claire
618eb10d18
Fix embed dropdown menu item for unauthenticated users ( #25964 )
2023-07-13 15:53:03 +02:00
Claire
41f65edb21
Fix embed dropdown menu item for unauthenticated users ( #25964 )
2023-07-13 15:53:03 +02:00
Claire
3c714ea3d2
Merge commit 'fc6d89573cc6d07b8b82c096d1ee04c5f7909460' into glitch-soc/merge-upstream
2023-07-13 14:22:20 +02:00
Claire
25571b18ed
Merge commit '5a3f174d561cbdc79a597cd2b9502ed058d372da' into glitch-soc/merge-upstream
2023-07-13 14:22:20 +02:00
Renaud Chaput
0e07aadfda
[Glitch] Convert Home timeline components to Typescript
...
Port f8302ec345
to glitch-soc
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2023-07-13 14:21:08 +02:00
Renaud Chaput
447ab7ab24
[Glitch] Convert Home timeline components to Typescript
...
Port a75138d073
to glitch-soc
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2023-07-13 14:21:08 +02:00
Claire
794ee87771
Merge commit '789459cea386e47870d457aa79a221392930095d' into glitch-soc/merge-upstream
2023-07-13 14:02:28 +02:00
Claire
177497b367
Merge commit '3ed9b55cb3987e3d32c56f857cb6903ca8bec3d4' into glitch-soc/merge-upstream
2023-07-13 14:02:28 +02:00
Claire
268e955aef
Merge commit '9094a65fd45f713bc66adf477c674ef7d33803a0' into glitch-soc/merge-upstream
...
Conflicts:
- `app/javascript/styles/fonts/roboto-mono.scss`:
Upstream updated the linter, which changed a few linter rules.
Some of those changed lines are different in glitch-soc because we use
different paths for the assets.
Applied the same style rules on our version of the file.
- `app/javascript/styles/fonts/roboto.scss`:
Upstream updated the linter, which changed a few linter rules.
Some of those changed lines are different in glitch-soc because we use
different paths for the assets.
Applied the same style rules on our version of the file.
2023-07-13 13:49:58 +02:00
Claire
95a1fde6b6
Merge commit '73b64b89170cb72854a1709186c62ce31f476889' into glitch-soc/merge-upstream
...
Conflicts:
- `app/javascript/styles/fonts/roboto-mono.scss`:
Upstream updated the linter, which changed a few linter rules.
Some of those changed lines are different in glitch-soc because we use
different paths for the assets.
Applied the same style rules on our version of the file.
- `app/javascript/styles/fonts/roboto.scss`:
Upstream updated the linter, which changed a few linter rules.
Some of those changed lines are different in glitch-soc because we use
different paths for the assets.
Applied the same style rules on our version of the file.
2023-07-13 13:49:58 +02:00
Renaud Chaput
a09ed92a77
Upgrade to typescript-eslint
v6 ( #25904 )
2023-07-13 11:49:16 +02:00
Renaud Chaput
a7253075d1
Upgrade to typescript-eslint
v6 ( #25904 )
2023-07-13 11:49:16 +02:00
Renaud Chaput
f8302ec345
Convert Home timeline components to Typescript ( #25583 )
2023-07-13 11:28:55 +02:00
Renaud Chaput
a75138d073
Convert Home timeline components to Typescript ( #25583 )
2023-07-13 11:28:55 +02:00
Renaud Chaput
9094a65fd4
Upgrade to Prettier 3 ( #25902 )
2023-07-13 11:26:45 +02:00
Renaud Chaput
73b64b8917
Upgrade to Prettier 3 ( #25902 )
2023-07-13 11:26:45 +02:00
Claire
2189682f8f
Merge commit '29c29410d2b5386dddcb12bdb413c7b3d078dbc5' into glitch-soc/merge-upstream
2023-07-12 15:44:33 +02:00
Claire
075887e1d6
Merge commit 'ea10febd257b5b729a50aeb3218389763f5f4b97' into glitch-soc/merge-upstream
2023-07-12 15:44:33 +02:00
Claire
63ca7222d6
Merge commit 'e75e734ac2d972ee82d344ebb7632a26d0746cb7' into glitch-soc/merge-upstream
...
Conflicts:
- `app/serializers/initial_state_serializer.rb`:
Upstream renamed an initial state parameter, where we had extra ones.
Renamed as upstream did.
- `app/workers/feed_insert_worker.rb`:
Upstream wrapped database query in a block, we had extra database
queries because of the DM timeline.
Moved everything in the block.
2023-07-12 15:27:32 +02:00
Claire
82eebd0482
Merge commit '41a505513fb36f7c28c8d8a4270d5ee192169462' into glitch-soc/merge-upstream
...
Conflicts:
- `app/serializers/initial_state_serializer.rb`:
Upstream renamed an initial state parameter, where we had extra ones.
Renamed as upstream did.
- `app/workers/feed_insert_worker.rb`:
Upstream wrapped database query in a block, we had extra database
queries because of the DM timeline.
Moved everything in the block.
2023-07-12 15:27:32 +02:00
Claire
8a27e68050
Merge commit '9203ab410c09efbd9facf202f2570cdd0def8de0' into glitch-soc/merge-upstream
2023-07-12 15:00:41 +02:00
Claire
7e54a30f06
Merge commit '4534498a8e43f59980ee56e9938efab8580c78c8' into glitch-soc/merge-upstream
2023-07-12 15:00:41 +02:00
Claire
a64181f28b
Fix import order inconsistencies ( #2289 )
2023-07-12 15:00:10 +02:00
Claire
67055b0343
Fix import order inconsistencies ( #2289 )
2023-07-12 15:00:10 +02:00
Trevor Wolf
29c29410d2
fix buttons showing inconsistent styles ( #25903 )
2023-07-11 12:26:09 +02:00
Trevor Wolf
ea10febd25
fix buttons showing inconsistent styles ( #25903 )
2023-07-11 12:26:09 +02:00
Claire
047d44611b
Fix filters not applying to explore tab ( #25887 )
2023-07-10 19:33:07 +02:00
Claire
af54bf52c8
Fix filters not applying to explore tab ( #25887 )
2023-07-10 19:33:07 +02:00
Claire
66693177ff
Add forward_to_domains
parameter to POST /api/v1/reports
( #25866 )
2023-07-10 18:26:56 +02:00
Claire
c27b82a437
Add forward_to_domains
parameter to POST /api/v1/reports
( #25866 )
2023-07-10 18:26:56 +02:00
Eugen Rochko
703ff75549
Add toast with option to open post after publishing in web UI ( #25564 )
2023-07-08 20:01:08 +02:00
Eugen Rochko
a7ca33ad96
Add toast with option to open post after publishing in web UI ( #25564 )
2023-07-08 20:01:08 +02:00
Eugen Rochko
3df957104a
Fix dropdowns being disabled for logged out users in web UI ( #25714 )
2023-07-08 20:00:52 +02:00
Eugen Rochko
a8edbcf963
Fix dropdowns being disabled for logged out users in web UI ( #25714 )
2023-07-08 20:00:52 +02:00
Eugen Rochko
9f5eab728b
Fix explore page being inaccessible when opted-out of trends in web UI ( #25716 )
2023-07-08 20:00:12 +02:00
Eugen Rochko
ceeb2b8c41
Fix explore page being inaccessible when opted-out of trends in web UI ( #25716 )
2023-07-08 20:00:12 +02:00
Renaud Chaput
9203ab410c
Convert <DismissableBanner>
to Typescript ( #25582 )
2023-07-08 11:12:20 +02:00
Renaud Chaput
4534498a8e
Convert <DismissableBanner>
to Typescript ( #25582 )
2023-07-08 11:12:20 +02:00
alfe
b5c5e2bf36
Rewrite <ShortNumber />
as FC and TS ( #25492 )
2023-07-08 11:11:58 +02:00
alfe
20e85c0e83
Rewrite <ShortNumber />
as FC and TS ( #25492 )
2023-07-08 11:11:58 +02:00
fusagiko / takayamaki
4106a801a0
simplify counters ( #25541 )
2023-07-08 11:11:22 +02:00
fusagiko / takayamaki
e0d230fb37
simplify counters ( #25541 )
2023-07-08 11:11:22 +02:00
Kouhai
234f7cc84e
th: Merge remote-tracking branch 'glitch/main'
...
fixes: CVE-2023-36459
fixes: CVE-2023-36460
fixes: CVE-2023-36461
fixes: CVE-2023-36462
fixes: GHSA-55j9-c3mp-6fcq
fixes: GHSA-9928-3cp5-93fm
fixes: GHSA-9pxv-6qvf-pjwc
fixes: GHSA-ccm4-vgcc-73hp
2023-07-06 12:12:21 -07:00
Claire
784f2f35bc
Merge branch 'main' into glitch-soc/merge-upstream
2023-07-05 12:01:26 +02:00
Claire
5de49e74d4
Merge branch 'main' into glitch-soc/merge-upstream
2023-07-05 12:01:26 +02:00
Eugen Rochko
90911f4396
Add canonical link tags in web UI ( #25715 )
2023-07-05 11:25:27 +02:00
Eugen Rochko
000b835803
Add canonical link tags in web UI ( #25715 )
2023-07-05 11:25:27 +02:00
Kouhai
fa0f31a8fb
th: merge glitch again (lol)
2023-07-05 01:14:10 -07:00
mogaminsk
f3ca8aede9
Fix local live feeds does not expand ( #25694 )
2023-07-04 00:37:57 +02:00
mogaminsk
6268188543
Fix local live feeds does not expand ( #25694 )
2023-07-04 00:37:57 +02:00
Eugen Rochko
80fee1403f
Change labels of live feeds tabs in web UI ( #25683 )
2023-07-03 22:57:18 +02:00
Eugen Rochko
54a10523e2
Change labels of live feeds tabs in web UI ( #25683 )
2023-07-03 22:57:18 +02:00
Claire
0a6bc158bd
Merge branch 'main' into glitch-soc/merge-upstream
2023-07-02 11:49:08 +02:00
Claire
44e98a2740
Merge branch 'main' into glitch-soc/merge-upstream
2023-07-02 11:49:08 +02:00
mogaminsk
ee22b32aef
Prevent duplicate concurrent calls of /api/*/instance
in web UI ( #25663 )
2023-07-02 11:12:16 +02:00
mogaminsk
5b46345459
Prevent duplicate concurrent calls of /api/*/instance
in web UI ( #25663 )
2023-07-02 11:12:16 +02:00
Eugen Rochko
f504aded26
Change dropdown icon above compose form from ellipsis to bars in web UI ( #25661 )
2023-07-02 10:39:55 +02:00
Eugen Rochko
0512537eb6
Change dropdown icon above compose form from ellipsis to bars in web UI ( #25661 )
2023-07-02 10:39:55 +02:00
Claire
6ca66c8cad
Change local and federated timelines to be in a single firehose column ( #25641 )
2023-07-02 00:05:10 +02:00
Claire
cea9db5a0b
Change local and federated timelines to be in a single firehose column ( #25641 )
2023-07-02 00:05:10 +02:00
Claire
1408b62211
Fix onboarding prompt being displayed because of disconnection gaps ( #25617 )
2023-06-30 16:32:12 +02:00
Claire
9934949fc4
Fix onboarding prompt being displayed because of disconnection gaps ( #25617 )
2023-06-30 16:32:12 +02:00
Claire
7a47a52cd3
Remove the search button from UI header when logged out ( #25631 )
2023-06-28 14:57:51 +02:00
Claire
285a691936
Remove the search button from UI header when logged out ( #25631 )
2023-06-28 14:57:51 +02:00
Claire
ea57f8e3af
Merge branch 'main' into glitch-soc/merge-upstream
2023-06-27 13:15:41 +02:00
Claire
80a5c16ae1
Merge branch 'main' into glitch-soc/merge-upstream
2023-06-27 13:15:41 +02:00
Renaud Chaput
ff9ed824db
Improve dismissable banner buttons when they dont fit on 1 line ( #25580 )
...
Co-authored-by: Claire <claire.github-309c@sitedethib.com>
2023-06-26 12:31:48 +02:00
Renaud Chaput
ae30a60b1f
Improve dismissable banner buttons when they dont fit on 1 line ( #25580 )
...
Co-authored-by: Claire <claire.github-309c@sitedethib.com>
2023-06-26 12:31:48 +02:00
Eugen Rochko
66c513511c
Fix onboarding prompt flashing while home feed is loading in web UI ( #25579 )
2023-06-26 05:26:54 +02:00
Eugen Rochko
65aa04647a
Fix onboarding prompt flashing while home feed is loading in web UI ( #25579 )
2023-06-26 05:26:54 +02:00
Eugen Rochko
1924660c5b
Fix search not being easily findable on smaller screens in web UI ( #25576 )
2023-06-26 05:26:41 +02:00
Eugen Rochko
2b78c07ef1
Fix search not being easily findable on smaller screens in web UI ( #25576 )
2023-06-26 05:26:41 +02:00
Claire
b7af3115a7
Merge commit '3d50947e62272e3da4365e0b751e4e45c1d9bac6' into glitch-soc/merge-upstream
...
Conflicts:
- `app/models/user_settings.rb`:
Upstream added a constraint on a setting textually close
to glitch-soc-only settings.
Applied upstream's change.
- `lib/sanitize_ext/sanitize_config.rb`:
Upstream added support for the `translate` attribute on a few elements,
where glitch-soc had a different set of allowed elements and attributes.
Extended glitch-soc's allowed attributes with `translate` as upstream did.
- `spec/validators/status_length_validator_spec.rb`:
Upstream refactored to use RSpec's `instance_double` instead of `double`,
but glitch-soc had changes to tests due to configurable max toot chars.
Applied upstream's changes while keeping tests against configurable max
toot chars.
2023-06-25 14:27:38 +02:00
Claire
178e151019
Merge commit '55e7c08a83547424024bac311d5459cb82cf6dae' into glitch-soc/merge-upstream
...
Conflicts:
- `app/models/user_settings.rb`:
Upstream added a constraint on a setting textually close
to glitch-soc-only settings.
Applied upstream's change.
- `lib/sanitize_ext/sanitize_config.rb`:
Upstream added support for the `translate` attribute on a few elements,
where glitch-soc had a different set of allowed elements and attributes.
Extended glitch-soc's allowed attributes with `translate` as upstream did.
- `spec/validators/status_length_validator_spec.rb`:
Upstream refactored to use RSpec's `instance_double` instead of `double`,
but glitch-soc had changes to tests due to configurable max toot chars.
Applied upstream's changes while keeping tests against configurable max
toot chars.
2023-06-25 14:27:38 +02:00
Eugen Rochko
1caf3a3933
Change labels and styles on the onboarding screen in web UI ( #25559 )
2023-06-23 16:34:27 +02:00
Eugen Rochko
a985d587e1
Change labels and styles on the onboarding screen in web UI ( #25559 )
2023-06-23 16:34:27 +02:00
Claire
7acdf21c77
Remove unique accounts condition from Home onboarding prompt ( #25556 )
2023-06-23 14:44:54 +02:00
Claire
0842a68532
Remove unique accounts condition from Home onboarding prompt ( #25556 )
2023-06-23 14:44:54 +02:00
Eugen Rochko
ad92c48d71
Add onboarding prompt when home feed too slow in web UI ( #25267 )
2023-06-22 23:48:40 +02:00
Eugen Rochko
00ec43914a
Add onboarding prompt when home feed too slow in web UI ( #25267 )
2023-06-22 23:48:40 +02:00
Claire
9a27d4ec36
Fix j/k keyboard shortcuts on some status lists ( #25554 )
2023-06-22 17:54:43 +02:00
Claire
a8c1c8bd37
Fix j/k keyboard shortcuts on some status lists ( #25554 )
2023-06-22 17:54:43 +02:00
mogaminsk
e87a2c676c
Fix custom signup URL may not loaded ( #25531 )
2023-06-22 12:10:49 +02:00
mogaminsk
8d2c26834f
Fix custom signup URL may not loaded ( #25531 )
2023-06-22 12:10:49 +02:00
Ian
a56475866f
Change emoji picker icon ( #25479 )
2023-06-21 17:58:00 +02:00