1
0
mirror of https://github.com/funamitech/mastodon synced 2024-12-12 13:48:35 +09:00
Commit Graph

2510 Commits

Author SHA1 Message Date
Claire
f00fcda785 Reduce differences with upstream in Account component 2023-11-20 13:24:02 +01:00
Claire
9ab1aa15e9 Change ReplyIndicator implementation and markup to match upstream's 2023-11-20 13:24:02 +01:00
Claire
d3ae5b21d2 Reduce code and markup discrepancies on reply indicator 2023-11-16 18:33:16 +01:00
Claire
e023acfd00 Remove unnecessary proptype discrepancy 2023-11-16 17:57:13 +01:00
Claire
36f25ea067 Fix more import discrepancies 2023-11-15 22:50:23 +01:00
Claire
4101057b9a Fix various code discrepancies 2023-11-15 22:50:23 +01:00
Claire
09a5a78527 Fix discrepancy for autosuggest-emoji class 2023-11-15 22:50:23 +01:00
Claire
f69f1e9429 Fix code discrepancies with upstream 2023-11-15 21:52:19 +01:00
Claire
d358a3cc61
Merge pull request #2468 from ClearlyClaire/glitch-soc/cleanup
Clean up some more and reduce unwarranted differences with upstream further
2023-11-15 21:49:50 +01:00
Claire
0d877a3076 [Glitch] Change compose form checkbox to native input with appearance: none
Port d3b4d4d4f3 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2023-11-15 17:20:44 +01:00
Claire
e7b3598f04 No need to have a separate localStorage key for home instance 2023-11-15 17:16:21 +01:00
Claire
0c727a6790 Fix more import style discrepancies 2023-11-15 17:16:21 +01:00
Claire
50eb673494 Fix some markup discrepancies 2023-11-15 17:16:21 +01:00
Claire
349579e318 Fix more code discrepancies 2023-11-15 17:16:21 +01:00
Claire
1023c2f90b Fix more whitespace and comment discrepancies 2023-11-15 17:16:21 +01:00
Claire
7e5d00720b
Merge pull request #2391 from ClearlyClaire/glitch-soc/port-upstream-hashtags
Port upstream's hashtag handling to glitch-soc
2023-11-15 17:15:21 +01:00
Claire
cd3a636b7f [Glitch] Fix some remote posts getting truncated
Port 4d59dfb1c6 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2023-11-15 12:59:06 +01:00
Eugen Rochko
6a8623588a [Glitch] Fix colors and typography on hashtag bar in web UI
Port 10b06436d1 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2023-11-15 12:56:58 +01:00
Claire
c226d00490 Fix interaction between CWs and hashtag bars 2023-11-15 12:56:58 +01:00
Claire
7ae45676c8 Fix hashtag bar styling 2023-11-15 12:56:58 +01:00
Claire
45690b01d1 [Glitch] Change hashtag bar tags to be de-emphasized
Port 613cfd625c to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2023-11-15 12:56:58 +01:00
Renaud Chaput
fc514fa8c6 [Glitch] Better hashtag normalization when processing a post
Port 58acaa9ae6 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2023-11-15 12:56:58 +01:00
Renaud Chaput
18462ee4b6 [Glitch] Remove hashtags from the last line of a status if it only contains hashtags
Port 061fd66ee6 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2023-11-15 12:56:58 +01:00
Claire
2ce03420d6 [Glitch] Fix case-insensitive comparison of hashtags to do case-folding
Port 3ed2bf92d0 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2023-11-15 12:56:58 +01:00
Claire
fe8d9f6221 [Glitch] Fix hashtag bar sometimes including tags that appear in the post's body
Port f0862bcf98

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2023-11-15 12:56:58 +01:00
Claire
a81ed84453 [Glitch] Add display of out-of-band hashtags in the web interface
Port df6e719898 to glitch-soc

Co-authored-by: Eugen Rochko <eugen@zeonfederated.com>
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2023-11-15 12:56:58 +01:00
Claire
3b210e093a Fix more code style discrepancies 2023-11-15 12:53:21 +01:00
Claire
542d95c2bc Fix import style discrepancy 2023-11-15 12:53:21 +01:00
Claire
8b24a9a507 Fix missed relative import discrepancy 2023-11-15 12:53:21 +01:00
Claire
b1f0457cb8 Fix whitespace and comment discrepancies 2023-11-15 12:53:21 +01:00
Eugen Rochko
08ac91c40b [Glitch] Fix follow relationships not loading after notifications fetch
Port 4f7f6b3922 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2023-11-15 12:53:21 +01:00
Eugen Rochko
103c0ca4f7 [Glitch] Hide loading bar on status interactions
Port eb2425b53b to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2023-11-15 12:53:21 +01:00
Claire
21653beb30 Reduce more unwarranted differences with upstream 2023-11-15 12:53:21 +01:00
Claire
7b922c2d90 Reduce unwarranted differences with upstream
Ports part of 0758b00bfd and 897199910f
2023-11-15 12:53:21 +01:00
Claire
2f61b65b1e Remove dead code 2023-11-15 12:53:11 +01:00
Claire
9bbb0f13e0
Fix inconsistent React imports in JSX files (#2466) 2023-11-15 12:52:30 +01:00
Claire
a97b722ad5
Reduce differences with upstream due to import style (#2465)
Fix relative / VS absolute style imports, and fix whitespace discrepancies
2023-11-15 12:01:51 +01:00
Claire
f7d3b74e03
Merge pull request #2389 from glitch-soc/i18n/crowdin/translations
New Crowdin Translations (automated)
2023-11-15 09:42:30 +01:00
neatchee
bd6da814b5 Fix recurring "switch to advanced interface" warning by adding missing class to the navigation-panel__banner element 2023-11-13 13:20:51 -08:00
GitHub Actions
46a28fc41f New Crowdin translations 2023-11-11 04:27:29 +00:00
Renaud Chaput
85d4846d8a [Glitch] Fix <ColumnBackButtonSlim>
Port cb92cdf9af to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2023-10-25 12:22:59 +02:00
Claire
8123e86623 [Glitch] Fix double scroll bars in some columns in advanced interface
Port 37bbd3c106 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2023-10-24 20:46:11 +02:00
Claire
b73e4b59fc [Glitch] Fix history handling not properly handling states after update to react-router v5
Port 15182d1e5e to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2023-10-24 20:34:30 +02:00
たいち ひ
c6f990997d [Glitch] Rewrite emoji_unicode_mapping_light to TS
Port 9482810703 to glitch-soc

Co-authored-by: taichi.fukuda ひ <taichi.fukuda@systemi.co.jp>
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2023-10-24 20:33:55 +02:00
Claire
8a131fb7bc Fix @rails/ujs imports 2023-10-24 20:23:31 +02:00
Claire
4b0fb764c3 Merge commit 'e93a75f1a11d6dfdcbd39dbdc22526c5508ad881' into glitch-soc/merge-upstream
Conflicts and ported changes:
- updated `@rails/ujs` imports
2023-10-24 19:59:19 +02:00
Eugen Rochko
69ea596e55 [Glitch] Fix explore page reloading when you navigate back to it in web UI
Port d9503a1965 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2023-10-24 19:22:39 +02:00
Claire
5323f0eeca [Glitch] Fix incorrect proptypes from react-router-v5 update
Port 0ad66175bf to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2023-10-24 19:03:16 +02:00
Renaud Chaput
9325cb5759 [Glitch] Convert <Button> to Typescript
Port 9d45a444f9 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2023-10-24 19:03:16 +02:00
Eugen Rochko
1138d44c7d [Glitch] Fix missing background behind dismissable banner in web UI
Port 33bd8eccd5 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2023-10-24 18:46:08 +02:00