Claire
5323f0eeca
[Glitch] Fix incorrect proptypes from react-router-v5 update
...
Port 0ad66175bf
2023-10-24 19:03:16 +02:00
Renaud Chaput
9325cb5759
[Glitch] Convert <Button> to Typescript
...
Port 9d45a444f9
2023-10-24 19:03:16 +02:00
Eugen Rochko
1138d44c7d
[Glitch] Fix missing background behind dismissable banner in web UI
...
Port 33bd8eccd5
2023-10-24 18:46:08 +02:00
Claire
b0c76eaadd
Merge commit '0ad66175bf59a34b03d9ab2347181548d07089ea' into glitch-soc/merge-upstream
...
Conflicts:
- `app/javascript/mastodon/features/compose/components/compose_form.jsx`:
Upstream changed one import, close to a glitch-soc-only import to handle
different max character counts.
Ported upstream's change.
2023-10-24 18:41:20 +02:00
Essem
a2e88f3544
[Glitch] Fix some remote posts getting truncated
...
Port 4d59dfb
2023-10-24 10:19:12 -05:00
Essem
27c641a848
Merge branch 'main' of https://github.com/glitch-soc/mastodon
2023-10-24 10:16:17 -05:00
Claire
15182d1e5e
Fix history handling not properly handling states after update to react-router v5 ( #27526 )
2023-10-24 13:24:57 +00:00
github-actions[bot]
50b7ea810e
New Crowdin Translations (automated) ( #27523 )
...
Co-authored-by: GitHub Actions <noreply@github.com>
2023-10-24 09:51:34 +00:00
たいち ひ
9482810703
Rewrite emoji_unicode_mapping_light to TS ( #25444 )
...
Co-authored-by: taichi.fukuda ひ <taichi.fukuda@systemi.co.jp>
2023-10-24 08:06:14 +00:00
Matt Jankowski
e93a75f1a1
Rails 7.1 update ( #25963 )
2023-10-23 17:58:29 +00:00
Eugen Rochko
d9503a1965
Fix explore page reloading when you navigate back to it in web UI ( #27489 )
2023-10-23 17:07:13 +02:00
Claire
0ad66175bf
Fix incorrect proptypes from react-router-v5 update ( #27507 )
2023-10-23 11:39:53 +02:00
github-actions[bot]
70fd819935
New Crowdin Translations (automated) ( #27490 )
...
Co-authored-by: GitHub Actions <noreply@github.com>
2023-10-23 10:04:54 +02:00
Renaud Chaput
9d45a444f9
Convert <Button> to Typescript ( #27492 )
2023-10-23 09:43:00 +02:00
Renaud Chaput
d6eacb79c6
[Glitch] Upgrade to react-router v5
...
Port 1b70d7ed7c
2023-10-21 22:14:24 +02:00
Claire
245513d630
Merge commit '1b70d7ed7c0fd3a9fcf028bf76b8c62ac8b3897f' into glitch-soc/merge-upstream
2023-10-21 14:33:33 +02:00
Essem
c10194fc82
Merge branch 'main' of https://github.com/glitch-soc/mastodon
2023-10-20 11:48:03 -05:00
github-actions[bot]
284c719f64
New Crowdin Translations (automated) ( #27480 )
...
Co-authored-by: GitHub Actions <noreply@github.com>
2023-10-20 10:11:40 +02:00
Eugen Rochko
33bd8eccd5
Fix missing background behind dismissable banner in web UI ( #27479 )
2023-10-20 04:08:13 +02:00
Renaud Chaput
5d9df170cf
[Glitch] Do not display the navigation banner in the logo container
...
Port 126cd7705d
2023-10-19 20:50:44 +02:00
Claire
cc000c8859
Merge commit '126cd7705dbeca5712da941a72661e26c189658b' into glitch-soc/merge-upstream
2023-10-19 20:48:22 +02:00
Brian Campbell
1a3248dc90
[Glitch] Consider shown and pending status in explore prompt calculation
...
Port f76e5111f0
2023-10-19 20:23:08 +02:00
Renaud Chaput
41f58e945c
[Glitch] The class props should be className
...
Port 10df97c542
2023-10-19 20:23:08 +02:00
Renaud Chaput
1b70d7ed7c
Upgrade to react-router v5 ( #25047 )
...
Co-authored-by: Claire <claire.github-309c@sitedethib.com>
2023-10-19 19:44:55 +02:00
Renaud Chaput
126cd7705d
Do not display the navigation banner in the logo container ( #27476 )
2023-10-19 19:36:08 +02:00
Claire
74fd46d3ab
Merge commit '9f218c9924b883207a3463a29314c92032cf06df' into glitch-soc/merge-upstream
2023-10-19 19:14:04 +02:00
Jeong Arm
68401fc426
[Glitch] Support "in:public" search filter
...
Port ad44d832b8
2023-10-19 18:56:18 +02:00
Essem
7d7d8e0c82
Fix mastomodern bottom bar
2023-10-19 11:13:52 -05:00
github-actions[bot]
1ffd5a98a9
New Crowdin Translations (automated) ( #27465 )
...
Co-authored-by: GitHub Actions <noreply@github.com>
2023-10-19 14:31:25 +02:00
Brian Campbell
f76e5111f0
Consider shown and pending status in explore prompt calculation ( #27466 )
...
Co-authored-by: Brian Campbell <brcampbell@beta.team>
2023-10-19 14:25:57 +02:00
Renaud Chaput
10df97c542
The class props should be className ( #27462 )
2023-10-19 13:22:44 +02:00
github-actions[bot]
4612576c68
New Crowdin Translations (automated) ( #27454 )
...
Co-authored-by: GitHub Actions <noreply@github.com>
2023-10-18 11:08:10 +02:00
Claire
63179f0bf4
Merge commit '5ef26d8fd50081c642b858a82bf0c5431b1c7e83' into glitch-soc/merge-upstream
2023-10-17 21:59:58 +02:00
Stanislas Signoud
8bbbd012d4
[Glitch] Fix missing redirections to make sure /home redirect to the advanced UI
...
Port 935d54124e
2023-10-17 21:48:36 +02:00
Claire
c10a667ac2
Merge commit '935d54124e80e9fe5365c724e5c8827a2b3ed5b3' into glitch-soc/merge-upstream
2023-10-17 21:42:49 +02:00
Claire
b867d4581e
Merge commit 'c91c0175db1cc8b954a977d29472886234ce9586' into glitch-soc/merge-upstream
...
Conflicts:
- `spec/controllers/api/v1/timelines/tag_controller_spec.rb`:
Glitch-soc had a few extra lines in this file to account for a different
default setting. This file got replaced by
`spec/requests/api/v1/timelines/tag_spec.rb`, into which the glitch-soc
additions were moved too.
Additional changes:
- `spec/requests/api/v1/statuses/sources_spec.rb`:
Add glitch-soc-only attribute `content_type`.
2023-10-17 21:35:07 +02:00
Claire
656a41db2a
Merge commit '77098c6f1c25958960df98a1510b28352a39704f' into glitch-soc/merge-upstream
...
Conflicts:
- `README.md`:
Upstream has updated its README, we have a completely different one.
Kept ours.
- `app/views/auth/sessions/two_factor.html.haml`:
Upstream refactored stuff and the conflict is because of glitch-soc's theming
system.
Ported upstream changes while accounting for the different theming system.
2023-10-17 20:59:18 +02:00
Jeong Arm
ad44d832b8
Support "in:public" search filter ( #26976 )
2023-10-17 16:12:03 +02:00
Stanislas Signoud
935d54124e
Fix missing redirections to make sure /home redirect to the advanced UI ( #27378 )
2023-10-17 14:59:07 +02:00
github-actions[bot]
13456efd7b
New Crowdin Translations (automated) ( #27410 )
...
Co-authored-by: GitHub Actions <noreply@github.com>
2023-10-16 11:31:52 +02:00
github-actions[bot]
773d25e8df
New Crowdin Translations (automated) ( #27388 )
...
Co-authored-by: GitHub Actions <noreply@github.com>
2023-10-13 11:01:40 +02:00
Essem
9990da927b
Merge branch 'main' of https://github.com/glitch-soc/mastodon
2023-10-12 13:42:12 -05:00
github-actions[bot]
c348b904a5
New Crowdin Translations (automated) ( #27376 )
...
Co-authored-by: GitHub Actions <noreply@github.com>
2023-10-12 10:07:40 +02:00
Essem
9c0a4a6937
Update mastomodern to 1.8.1
2023-10-11 11:09:27 -05:00
Essem
84ea1a19fa
Merge branch 'main' of https://github.com/glitch-soc/mastodon
2023-10-11 11:07:33 -05:00
github-actions[bot]
f1ae72ba46
New Crowdin Translations (automated) ( #27364 )
...
Co-authored-by: GitHub Actions <noreply@github.com>
2023-10-11 16:37:01 +02:00
Claire
99c72830bc
[Glitch] Fix scroll position in thread view reseting when closing a modal
...
Port 9d1c3d0678
2023-10-10 19:53:59 +02:00
Claire
3735e6f79d
Merge commit '27e84c069112a3d2abfad947642457cc997a261a' into glitch-soc/merge-upstream
2023-10-10 19:53:41 +02:00
Essem
9b73910346
Revert "Update mastomodern to 1.8.0"
...
This reverts commit 0aea24cfb7
2023-10-10 12:25:47 -05:00
Essem
29f2a7d9f4
Merge branch 'main' of https://github.com/glitch-soc/mastodon
2023-10-10 12:24:32 -05:00
Claire
9d1c3d0678
Fix scroll position in thread view reseting when closing a modal ( #27350 )
2023-10-10 11:35:32 +02:00
github-actions[bot]
1a2a4c389f
New Crowdin Translations (automated) ( #27347 )
...
Co-authored-by: GitHub Actions <noreply@github.com>
2023-10-10 10:06:37 +02:00
Claire
05159d2f94
[Glitch] Fix clicking on already-loaded thread scrolling to the top of the thread
...
Port 4c2aca777f
2023-10-09 21:15:59 +02:00
Claire
8ef1a95b1c
Merge commit '4c2aca777f6ae6942d0cf11aee56a925694ccdef' into glitch-soc/merge-upstream
2023-10-09 21:14:57 +02:00
Renaud Chaput
7b325aa81b
[Glitch] Autofix missing comma and indentation in JS files
...
Port 774e1189d2
2023-10-09 21:14:25 +02:00
Claire
4a9cdfb928
Merge commit '774e1189d26fffd914107a4236f6287043c988f8' into glitch-soc/merge-upstream
2023-10-09 21:12:28 +02:00
Claire
b63d526590
[Glitch] Fix clicking on already-opened thread post scrolling to the top of the thread
...
Port c310374a2f
2023-10-09 21:11:44 +02:00
Claire
3da7afdeed
Merge commit 'c310374a2f83a890520ace50e41c1e3d046e15e1' into glitch-soc/merge-upstream
2023-10-09 21:10:47 +02:00
Claire
4c2aca777f
Fix clicking on already-loaded thread scrolling to the top of the thread ( #27338 )
2023-10-09 16:46:09 +02:00
Renaud Chaput
774e1189d2
Change eslint config to autofix missing comma and indentation in JS files ( #26711 )
2023-10-09 13:38:29 +02:00
Claire
c310374a2f
Fix clicking on already-opened thread post scrolling to the top of the thread ( #27331 )
2023-10-09 12:21:02 +02:00
github-actions[bot]
89b48681cf
New Crowdin Translations (automated) ( #27321 )
...
Co-authored-by: GitHub Actions <noreply@github.com>
2023-10-09 10:32:06 +02:00
Claire
967bd543bb
[Glitch] Fix auto-loading-more when not scrolled
...
Port 2b98e2ecd6
2023-10-08 17:34:10 +02:00
Claire
53f5b27bd1
Merge commit '640421f661ee4d7e76a2aab607e7b15687940b6f' into glitch-soc/merge-upstream
2023-10-08 17:30:48 +02:00
Claire
86c9c5afa0
Merge commit '40ba6e119b7457161fd43b449875d0fb9d473c1a' into glitch-soc/merge-upstream
...
Conflicts:
- `app/controllers/concerns/web_app_controller_concern.rb`:
Upstream changed the order of Action Controller filters for web app
controllers.
Glitch-soc has an extra filter due to its theming system.
Changed the order accordingly.
- `app/views/settings/preferences/appearance/show.html.haml`:
Conflict due to an extra newline in glitch-soc.
Removed that newline and applied upstream's changes.
2023-10-08 17:26:43 +02:00
Claire
74c27e33e3
Merge commit '37bbd3c1064380a756b4e821655d7697105f99f5' into glitch-soc/merge-upstream
2023-10-08 17:10:39 +02:00
Michael Stanclift
8eb09c6f72
[Glitch] Keep version string displayed without breakpoints in UI
...
Port 5a437edc7f
2023-10-08 17:09:02 +02:00
Claire
a5dbb1ee5a
Merge commit '5a437edc7f22d5797e5af29d9b450a03eccec304' into glitch-soc/merge-upstream
2023-10-08 17:05:40 +02:00
Claire
e83059fd9d
[Glitch] Fix explore prompt appearing because of posts being received out of order
...
Port d80a819fc6
2023-10-08 17:03:40 +02:00
Claire
e9a181c52c
Merge commit 'e95d25e1013b6328457b81bd98e8d6a841d45ec2' into glitch-soc/merge-upstream
2023-10-08 16:53:05 +02:00
Claire
702d162998
Merge commit '5393be7a21331c8615ffb79c2271db92f6959458' into glitch-soc/merge-upstream
...
Conflicts:
- `app/controllers/auth/registrations_controller.rb`:
Not a real conflict. Upstream removed the `set_instance_presenter` private
method from this class, and glitch-soc has an extra private method right
besides it for the theming system.
Removed `set_instance_presenter` as upstream did.
- `app/controllers/auth/sessions_controller.rb`:
Not a real conflict. Upstream removed the `set_instance_presenter` private
method from this class, and glitch-soc has an extra private method right
besides it for the theming system.
Removed `set_instance_presenter` as upstream did.
2023-10-08 16:48:19 +02:00
Michael Stanclift
cfc0da77ac
[Glitch] Fix retention dashboard not displaying correct month
...
Port 7fddeca190
2023-10-08 16:33:37 +02:00
Claire
19ebf7797e
Merge commit 'e6b903b21e0682c1156ffec583ac2836fda7d657' into glitch-soc/merge-upstream
2023-10-08 16:30:00 +02:00
Essem
0aea24cfb7
Update mastomodern to 1.8.0
2023-10-06 17:39:27 -05:00
Claire
4d59dfb1c6
Fix some remote posts getting truncated ( #27307 )
2023-10-06 12:58:02 +02:00
github-actions[bot]
e0b54ed3e1
New Crowdin Translations (automated) ( #27304 )
...
Co-authored-by: GitHub Actions <noreply@github.com>
2023-10-06 11:49:09 +02:00
Claire
2b98e2ecd6
Fix auto-loading-more when not scrolled ( #27286 )
2023-10-05 16:33:54 +02:00
github-actions[bot]
32ab474472
New Crowdin Translations (automated) ( #27277 )
...
Co-authored-by: GitHub Actions <noreply@github.com>
2023-10-05 13:13:14 +02:00
github-actions[bot]
8e4251f9e7
New Crowdin Translations (automated) ( #27270 )
...
Co-authored-by: GitHub Actions <noreply@github.com>
2023-10-04 10:53:04 +02:00
Claire
37bbd3c106
Fix double scroll bars in some columns in advanced interface ( #27187 )
2023-10-03 13:12:39 +02:00
Michael Stanclift
5a437edc7f
Keep version string displayed without breakpoints in UI ( #26986 )
2023-10-03 11:52:21 +02:00
github-actions[bot]
e95d25e101
New Crowdin Translations (automated) ( #27260 )
...
Co-authored-by: GitHub Actions <noreply@github.com>
2023-10-03 10:47:28 +02:00
github-actions[bot]
ee866ec0e0
New Crowdin Translations (automated) ( #27220 )
...
Co-authored-by: GitHub Actions <noreply@github.com>
2023-10-02 13:35:29 +02:00
Claire
d80a819fc6
Fix explore prompt appearing because of posts being received out of order ( #27211 )
2023-09-29 15:51:36 +02:00
github-actions[bot]
695e42de0d
New Crowdin Translations (automated) ( #27202 )
...
Co-authored-by: GitHub Actions <noreply@github.com>
2023-09-29 10:04:18 +02:00
Claire
1da3c588ca
Fix link handling of mentions in user profiles when logged out ( #27185 )
2023-09-28 15:29:07 +02:00
github-actions[bot]
b93ce7d8b3
New Crowdin Translations (automated) ( #27168 )
...
Co-authored-by: GitHub Actions <noreply@github.com>
2023-09-28 10:44:16 +02:00
Christian Schmidt
6d0767558a
Make notification respect reduce-motion ( #27178 )
2023-09-28 10:39:38 +02:00
Michael Stanclift
7fddeca190
Fix retention dashboard not displaying correct month ( #27180 )
2023-09-28 10:16:15 +02:00
Essem
8d776b9aa5
Merge remote-tracking branch 'upstream/main'
2023-09-26 20:03:35 -05:00
Claire
1eeaa0d84f
[Glitch] Fix width of large text icon buttons
...
Port 38753acaa5
2023-09-26 13:25:01 +02:00
gunchleoc
ca7d16912e
[Glitch] Fix line wrapping of language selection button with long locale codes
...
Port 88fa8e710a
2023-09-26 13:24:29 +02:00
Claire
02e6d9f8f9
[Glitch] Fix explore prompt sometimes showing up when the home TL is loading
...
Port a001ae2f39
2023-09-26 13:20:18 +02:00
Renaud Chaput
919ed0e469
[Glitch] Convert dropdown_menu state to Typescript
...
Port 4b7bc1f07c
2023-09-26 13:19:27 +02:00
Renaud Chaput
b2d67fbe33
[Glitch] Improve modals reducer types
...
Port b93ffb74bb
2023-09-26 13:17:08 +02:00
Claire
abdb58840a
Merge commit '57f592fed50747f3c97718a2761e17bafe6c8698' into glitch-soc/merge-upstream
2023-09-26 13:13:27 +02:00
Renaud Chaput
57f592fed5
Add Typescript types for some API objects ( #26602 )
2023-09-26 11:25:01 +02:00
github-actions[bot]
5ea3e8e765
New Crowdin Translations (automated) ( #27144 )
...
Co-authored-by: GitHub Actions <noreply@github.com>
2023-09-26 10:47:16 +02:00
Claire
a001ae2f39
Fix explore prompt sometimes showing up when the home TL is loading ( #27062 )
2023-09-25 17:07:01 +02:00
Claire
38753acaa5
Fix width of large text icon buttons ( #27127 )
2023-09-25 15:06:57 +02:00
gunchleoc
88fa8e710a
Fix line wrapping of language selection button with long locale codes ( #27100 )
2023-09-25 12:59:37 +02:00
github-actions[bot]
736fe75346
New Crowdin Translations (automated) ( #27080 )
...
Co-authored-by: GitHub Actions <noreply@github.com>
2023-09-25 10:50:09 +02:00
Renaud Chaput
4b7bc1f07c
Convert dropdown_menu state to Typescript ( #25585 )
2023-09-22 18:18:46 +02:00
Renaud Chaput
b93ffb74bb
Improve modals reducer types ( #26610 )
2023-09-22 16:41:50 +02:00
github-actions[bot]
e824585523
New Crowdin Translations (automated) ( #27052 )
...
Co-authored-by: GitHub Actions <noreply@github.com>
2023-09-22 11:06:48 +02:00
Essem
940ee54641
Merge remote-tracking branch 'upstream/main'
2023-09-21 12:33:23 -05:00
Claire
6760e67c64
[Glitch] Fix search results temporarily disappearing while scrolling and loading more results
...
Port 5356ddbcca
2023-09-21 15:14:38 +02:00
Claire
f05985f8ec
Merge branch 'main' into glitch-soc/merge-upstream
...
Conflicts:
- `README.md`:
Upstream changed their README, we have a completely different one.
Kept our version.
2023-09-21 15:12:00 +02:00
Claire
5356ddbcca
Fix search results temporarily disappearing while scrolling and loading more results ( #27014 )
2023-09-21 13:51:21 +02:00
github-actions[bot]
effe4728cf
New Crowdin Translations (automated) ( #27005 )
...
Co-authored-by: GitHub Actions <noreply@github.com>
2023-09-21 11:06:04 +02:00
github-actions[bot]
61fe25fe74
New Crowdin Translations (automated) ( #26988 )
...
Co-authored-by: GitHub Actions <noreply@github.com>
2023-09-20 13:05:56 +02:00
Essem
4e8a66b240
Merge remote-tracking branch 'upstream/main'
2023-09-19 10:15:12 -05:00
Claire
f546b0c999
Merge branch 'main' into glitch-soc/merge-upstream
2023-09-19 17:07:29 +02:00
Essem
1007c16320
Merge remote-tracking branch 'upstream/main'
2023-09-19 10:05:45 -05:00
github-actions[bot]
73ecc4de6e
New Crowdin Translations (automated) ( #26978 )
...
Co-authored-by: GitHub Actions <noreply@github.com>
2023-09-19 16:26:51 +02:00
Claire
22ee4e057d
Merge commit 'a83615edc9fc1ce3363ddcf1fc676806421a5f65' into glitch-soc/merge-upstream
...
Conflicts:
- `streaming/index.js`:
Upstream has added a parameter to `streamFrom`, while glitch-soc had an
extra parameter.
Ported upstream changes.
2023-09-19 12:59:23 +02:00
Claire
1e87575b70
Merge commit '6eb6209d02514c5271238a23601be643c7b9f52d' into glitch-soc/merge-upstream
2023-09-19 12:53:32 +02:00
Claire
70cae19b6b
Fix hashtag bar being sometimes incorrectly hidden ( #26960 )
2023-09-19 12:25:39 +02:00
github-actions[bot]
67eaaa4b90
New Crowdin Translations (automated) ( #26966 )
...
Co-authored-by: GitHub Actions <noreply@github.com>
2023-09-19 10:41:48 +02:00
github-actions[bot]
1b4902fabf
New Crowdin Translations (automated) ( #26913 )
...
Co-authored-by: GitHub Actions <noreply@github.com>
2023-09-18 13:46:07 +02:00
Claire
31dedf4697
[Glitch] Fix Web UI making duplicate search queries when scrolling
...
Port 4c1518a6f3
2023-09-18 12:12:55 +02:00
Claire
f61e29cc7e
[Glitch] Fix error in Web UI when server rules cannot be fetched
...
Port 893755f4cb
2023-09-18 12:11:09 +02:00
Claire
9688c5fcc4
Merge branch 'main' into glitch-soc/merge-upstream
2023-09-18 12:09:37 +02:00
Claire
4c1518a6f3
Fix Web UI making duplicate search queries when scrolling ( #26959 )
2023-09-18 11:20:09 +02:00
Claire
893755f4cb
Fix error in Web UI when server rules cannot be fetched ( #26957 )
2023-09-18 09:51:52 +02:00
Essem
81c06b286f
Merge branch 'main' of https://github.com/glitch-soc/mastodon
2023-09-16 11:27:11 -05:00
Claire
60ecca6acb
Revert tabs background color so they are easier to visually distinguish from contents
2023-09-16 09:50:00 +02:00
Claire
d3f14dd7d4
[Glitch] Fix dismiss button overlapping with text in dismissable banners
...
Port 2a4fcc51fd
2023-09-15 21:48:36 +02:00
Claire
dfc05ec8df
Merge commit '6273416292090b2f6bfda33f070cea325a1759df' into glitch-soc/merge-upstream
...
Conflicts:
- `.github/workflows/build-nightly.yml`:
Upstream modified this file close to a line modified by glitch-soc to
disable the ARMv64 builder (as glitch-soc doesn't have one).
Ported upstream's changes.
- `.github/workflows/build-releases.yml`:
Upstream modified this file close to lines changed by glitch-soc to
change the Docker image repositories used (only ghcr, and based on the
organization's name).
Ported upstream's changes.
2023-09-15 21:43:49 +02:00
Claire
5ed72f668f
Merge commit 'b90383d07388fe8513e59a6deb1a2391146c6561' into glitch-soc/merge-upstream
2023-09-15 21:39:21 +02:00
Claire
cf8b242c4c
[Glitch] Fix notification permissions being requested immediately after login
...
Port 520b570474
2023-09-15 21:33:28 +02:00
Santiago Kozak
0b5903af7c
[Glitch] Fix recent search items not handling overflows correctly
...
Port d2cfcdd09e
2023-09-15 21:31:46 +02:00
Claire
e193c848fe
Merge commit '97e4011c3ce31c6d492d5f103e95a35b6ebdc9bd' into glitch-soc/merge-upstream
...
Conflicts:
- `config/initializers/content_security_policy.rb`:
Upstream added some code to add the Identity Provider's sign-in endpoint to
the `form-action` Content Security Policy directive but our version of the
file is pretty different.
Ported the change.
2023-09-15 21:25:05 +02:00
Eugen Rochko
7384015505
[Glitch] Add recent searches in web UI
...
Port 9b2bc3d1de
2023-09-15 21:15:41 +02:00
Claire
263d601c25
[Glitch] Fix confusing behavior of mute button and volume slider in web UI
...
Port 91040da871
2023-09-15 21:12:53 +02:00
Eugen Rochko
58514651c3
[Glitch] Fix mute button and volume slider feeling disconnected in web UI
...
Port f3a2e15f8e
2023-09-15 21:12:13 +02:00
Eugen Rochko
15c865808a
[Glitch] Change onboarding prompt to use full width of banner in web UI
...
Port 1f141f656d
2023-09-15 21:09:28 +02:00
Claire
08b495d95c
Merge commit 'b1d89071384ef028c97a3d28cf8cf6bc0ca6c4ce' into glitch-soc/merge-upstream
2023-09-15 21:06:45 +02:00
Claire
9f3df3edee
[Glitch] Add some information about Full-text search being disabled in search popout
...
Port 9c1ef8302a
2023-09-15 21:01:40 +02:00
Claire
5d8c65f2a7
Merge commit '398635c0c4987ec44d937e98431ff5dee331ea94' into glitch-soc/merge-upstream
2023-09-15 20:57:40 +02:00
Eugen Rochko
526f457ebc
[Glitch] Add infinite scrolling for search results in web UI
...
Port 5d20733d8d
2023-09-15 20:54:20 +02:00
Eugen Rochko
f7a4d77d90
[Glitch] Add in: to search popout in web UI
...
Port d8bdba2f9f
2023-09-15 20:33:51 +02:00
Claire
3ca94f6d4a
Merge commit '93d051e47d27b5bd10be922a81d4d4eb6c306330' into glitch-soc/merge-upstream
2023-09-15 20:21:40 +02:00
Claire
e5269c6a65
[Glitch] Improve interaction modal error handling
...
Port 548c032dbb
2023-09-15 20:11:18 +02:00
Claire
e14372c2d1
Merge commit '548c032dbb90ae9c06b05fc05724c49d0b552fd9' into glitch-soc/merge-upstream
2023-09-15 20:08:09 +02:00
Claire
2a4fcc51fd
Fix dismiss button overlapping with text in dismissable banners ( #26935 )
2023-09-15 19:53:28 +02:00
Essem
08c8c856b3
Bump client-side max resize resolution to 3840x2160
2023-09-13 21:03:39 -05:00
github-actions[bot]
921c6fe654
New Crowdin Translations (automated) ( #26498 )
...
Co-authored-by: GitHub Actions <noreply@github.com>
2023-09-13 15:10:41 +02:00
Plastikmensch
075ee0b2d4
Fix wrong gradient color on collapsed private mentions ( #2402 )
...
Upstream changed the background color of private mentions, but the gradient used for collapsed toots still used the old color.
Signed-off-by: Plastikmensch <plastikmensch@users.noreply.github.com>
2023-09-13 08:44:40 +02:00
Claire
520b570474
Fix notification permissions being requested immediately after login ( #26472 )
2023-09-12 18:27:01 +02:00
Claire
287520453c
Fix front-end bug when processing relationship-related account actions ( #26902 )
2023-09-12 16:30:03 +02:00
Renaud Chaput
0712cc2b99
Fix Redux types ( #26899 )
2023-09-12 12:18:19 +02:00
Santiago Kozak
d2cfcdd09e
Fix recent search items not handling overflows correctly ( #26893 )
2023-09-12 04:20:57 +02:00
Renaud Chaput
bd06c13204
Convert actions/account_notes into Typescript ( #26601 )
2023-09-11 16:09:22 +02:00
Claire
91040da871
Fix confusing behavior of mute button and volume slider in web UI ( #26860 )
2023-09-08 20:39:29 +02:00
Essem
4d9832b211
Merge remote-tracking branch 'upstream/main'
2023-09-07 08:52:29 -05:00
Eugen Rochko
9b2bc3d1de
Add recent searches in web UI ( #26834 )
2023-09-07 14:56:19 +02:00
Eugen Rochko
f3a2e15f8e
Fix mute button and volume slider feeling disconnected in web UI ( #26827 )
2023-09-07 04:24:24 +02:00
Eugen Rochko
1f141f656d
Change onboarding prompt to use full width of banner in web UI ( #26829 )
2023-09-07 04:24:11 +02:00
Eugen Rochko
398635c0c4
Fix paragraph margins resulting in irregular read-more cut-off in web UI ( #26828 )
2023-09-07 04:24:01 +02:00
Claire
9c1ef8302a
Add some information about Full-text search being disabled in search popout ( #26756 )
2023-09-06 17:23:58 +02:00
Eugen Rochko
d8bdba2f9f
Add in: to search popout in web UI ( #26807 )
2023-09-06 06:46:26 +02:00
Eugen Rochko
9d290c23d2
Remove obfuscation of reply count in web UI ( #26768 )
2023-09-05 23:57:03 +02:00
Eugen Rochko
5d20733d8d
Add infinite scrolling for search results in web UI ( #26784 )
2023-09-05 23:54:24 +02:00
Claire
548c032dbb
Improve interaction modal error handling ( #26795 )
2023-09-05 23:49:48 +02:00
Essem
c57f803db7
Merge remote-tracking branch 'claire/glitch-soc/port-upstream-hashtags'
2023-09-04 19:10:42 -05:00
Essem
b871816f0e
Merge remote-tracking branch 'upstream/main'
2023-09-04 19:00:18 -05:00
Stanislas Signoud
d6f5c27fa9
[Glitch] Fix light mode colors for advanced interface banner
...
Port a106c46478
2023-09-04 18:31:00 +02:00
Claire
e66f961e05
Merge branch 'main' into glitch-soc/merge-upstream
2023-09-04 18:27:46 +02:00
Stanislas Signoud
a106c46478
Fix light mode colors for advanced interface banner ( #26759 )
2023-09-04 10:14:01 +02:00
Plastikmensch
6b0702a3b5
Add recent to search props ( #2394 )
...
The new search popout requires the `recent` prop to be set, otherwise onboarding crashes with "recent is undefined"
Signed-off-by: Plastikmensch <plastikmensch@users.noreply.github.com>
2023-09-03 08:46:30 +02:00
Plastikmensch
abdc6ae28b
Fix onboarding modal always opening page 2
...
When opening the onboarding modal in the webUI, it always opens on page 2, as `handleSwipe` is called on load with 'focus', changing `currentIndex` from 0 to 1.
Signed-off-by: Plastikmensch <plastikmensch@users.noreply.github.com>
2023-09-03 02:47:50 +02:00
Eugen Rochko
04220ff7e8
[Glitch] Fix colors and typography on hashtag bar in web UI
...
Port 10b06436d1
2023-09-02 15:34:20 +02:00
Claire
5c7df20c13
[Glitch] Add admin notifications for new Mastodon versions
...
Port front-end changes from 16681e0f20
2023-09-02 15:20:06 +02:00
Claire
c107512fa6
Merge commit '05093266e6e3c54f9096da9cdcdafdc83703c578' into glitch-soc/merge-upstream
2023-09-02 15:02:29 +02:00
Claire
4371df7fbe
[Glitch] Add authorized_fetch server setting in addition to env var
...
Port SCSS changes from 9e26cd5503
2023-09-02 15:01:37 +02:00
Eugen Rochko
728eb6a153
Fix wrong color on active icons with counters in web UI ( #26767 )
2023-09-02 14:46:26 +02:00
Claire
4ed629cd7e
Merge commit 'be991f1d18006a4820c1e9ca6625bf2bd2bfedac' into glitch-soc/merge-upstream
...
Conflicts:
- `app/models/form/admin_settings.rb`:
Upstream added the notion of overriden settings, while we had extra code for
pseudo-settings (only used to combine flavour and skin in a single select
field).
Ported upstream changes.
- `config/i18n-tasks.yml`:
Upstream added `simple_form.overridden` to `ignore_unused`,
we had `simple_form.glitch_only`.
Added `simple_form.glitch_only` as well.
2023-09-02 14:44:47 +02:00
Claire
807c0591e1
[Glitch] Fix search popout including full-text search instructions when full-text search is disabled
...
Port 6c4c72497a
2023-09-02 13:56:20 +02:00
Santiago Kozak
64e661b930
[Glitch] Allow filter form in profiles directory to wrap
...
Port f1d250135c
2023-09-02 13:55:53 +02:00
Stanislas Signoud
6c05ac4068
[Glitch] Add an explanation banner on switching to single column mode
...
Port 40b69cc1cd
2023-09-02 13:54:33 +02:00
Claire
ac2dae0d11
Merge commit '6c4c72497a5722870e4432ef41dd4c9ec36a8928' into glitch-soc/merge-upstream
...
Conflicts:
- `.github/workflows/build-releases.yml`:
Upstream changed comments close to a line we modified to account for
different container image repositories.
Updated the comments as upstream did.
2023-09-02 13:50:16 +02:00
Claire
f5bd2014e2
[Glitch] Fix sign up steps progress layout in right-to-left locales
...
Port 21ec596dab
2023-09-02 13:42:50 +02:00
Tim Rogers
beb5fcd0dc
[Glitch] Fix bug with reblogged view on Toots only showing latest reblogging accounts
...
Port 74eb7dbf2d
2023-09-02 13:42:15 +02:00
Tim Rogers
871ab84854
[Glitch] Fix bug with favourited view on Toots only showing latest favouriting accounts
...
Port ae6cf33321
2023-09-02 13:39:02 +02:00
Claire
ffb486648c
Merge commit 'cb9f96036cf78835e22aafb30b80717b5a8b7394' into glitch-soc/merge-upstream
2023-09-02 13:34:54 +02:00
Claire
6ee3e382df
Merge commit '0719216368bf3a90fdb7ab27201a0607b63ea203' into glitch-soc/merge-upstream
...
Conflicts:
- `app/javascript/packs/public.jsx`:
Some of the removed dead code was split from this code in
`app/javascript/core/public.js` and `app/javascript/core/settings.js`.
Removed this dead code, and removed `app/javascript/core/public.js`
altogether.
2023-09-02 13:18:16 +02:00
Claire
fbbe9f1c12
Merge commit 'a7d96e6affd4a2da65f09f3f4ffa1b9350bb9a42' into glitch-soc/merge-upstream
2023-09-02 12:20:33 +02:00
Eugen Rochko
cb50d95c06
[Glitch] Add search options to search popout in web UI
...
Port bceb893159
2023-09-02 12:09:07 +02:00
Claire
c8aa3d6d06
Merge commit 'dd72a8d28b4479afdc19ac73cac83609d85b5f9e' into glitch-soc/merge-upstream
2023-09-02 12:02:23 +02:00
Claire
3c7dbf3a16
Merge commit '5694e24bbf9afccbbf1b44d3a405a4e2bc0ff08d' into glitch-soc/merge-upstream
...
Conflicts:
- `.github/workflows/build-nightly.yml`:
Upstream changed the environment variables used for defining the version
number. This change occurs close to lines that were modified in glitch-soc
to account for the different repositories to push to.
Ported upstream changes.
- `.github/workflows/build-push-pr.yml`:
Upstream changed the environment variables used for defining the version
number. This change occurs close to lines that were modified in glitch-soc
to account for the different repositories to push to.
Ported upstream changes.
- `lib/mastodon/version.rb`:
Upstream changed how the version string is built from environment variables.
Adapted the logic to account for the `+glitch` in glitch-soc.
2023-09-02 11:56:09 +02:00
Claire
023673c0d9
[Glitch] Add data-nosnippet attribute to remote posts and local posts with noindex
...
Port c3a42e1280
2023-09-02 11:49:35 +02:00
Claire
670f55e83c
Fix interaction between CWs and hashtag bars
2023-09-02 11:44:58 +02:00
Claire
d05e100f56
Fix hashtag bar styling
2023-09-02 11:44:58 +02:00
Claire
cbf9b0d8b1
[Glitch] Change hashtag bar tags to be de-emphasized
...
Port 613cfd625c
2023-09-02 11:44:58 +02:00
Renaud Chaput
5153b5e862
[Glitch] Better hashtag normalization when processing a post
...
Port 58acaa9ae6
2023-09-02 11:44:58 +02:00
Renaud Chaput
0412a9d775
[Glitch] Remove hashtags from the last line of a status if it only contains hashtags
...
Port 061fd66ee6
2023-09-02 11:44:58 +02:00
Claire
a547453059
[Glitch] Fix case-insensitive comparison of hashtags to do case-folding
...
Port 3ed2bf92d0
2023-09-02 11:44:58 +02:00
Claire
03580d3443
[Glitch] Fix hashtag bar sometimes including tags that appear in the post's body
...
Port f0862bcf98
2023-09-02 11:44:58 +02:00
Claire
58cfd200a5
[Glitch] Add display of out-of-band hashtags in the web interface
...
Port df6e719898
2023-09-02 11:44:58 +02:00
