mirrors
/
donphan
mirror of https://github.com/Siphonay/mastodon
1
0
Fork 0
Code Releases Activity
19,670 Commits 2 Branches 16 Tags 298 MiB
Commit Graph

19670 Commits

Author SHA1 Message Date
Claire 21df2a68ac Hide followers count when hidden by instance or user 2023-12-02 17:38:07 +01:00
Claire 09062d393f Fix more styling issues 2023-12-02 17:38:07 +01:00
Claire 28d4f3ab70 Fix account component styling wrt. upstream 2023-12-02 17:05:54 +01:00
fusagiko / takayamaki dc917cfcdf [Glitch] Fix account.jsx imports (#25541) 
Port remaining part of e0d230fb37,
20e85c0e83 and
9d45a444f9 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2023-12-02 16:59:40 +01:00
Eugen Rochko 17372a3ec0 [Glitch] Change labels and styles on the onboarding screen in `Account` component 
Partial port of a985d587e1 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2023-12-02 16:59:40 +01:00
Eugen Rochko 0421b44f22 [Glitch] Change follow button in account row to be more obvious in web UI (#24956) 
Port 0ddc895282 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2023-12-02 16:59:40 +01:00
Claire f1691eca55 [Glitch] Fix overflow behavior of account rows 
Port 5fae2de454 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2023-12-02 16:59:40 +01:00
Renaud Chaput 98a7b95058 [Glitch] Update inconsistent `defaultMessage` in `Account` component 
Partial port of e58c36d308 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2023-12-02 16:59:40 +01:00
Claire b047b981cd [Glitch] Enforce import order with ESLint 
Port d27216dc46 to glitch-soc
 2023-12-02 16:59:40 +01:00
Emelia Smith b8cbaba283 [Glitch] Split `EmptyAccount` out of `Account` component 
Partial port of b8a2430642 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2023-12-02 16:59:40 +01:00
Claire 32ec0d2472 [Glitch] Fix verified badge in account lists potentially including rel="me" links 
Port 55e7c08a83 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2023-12-02 16:59:40 +01:00
Renaud Chaput e7ec2641a0 [Glitch] Fix linting issues with VerifiedBadge component 
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2023-12-02 16:59:40 +01:00
fusagiko / takayamaki 2efb22f455 [Glitch] Rewrite VerifiedBadge component as function component 
Port 140aa6b054 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2023-12-02 16:59:40 +01:00
Eugen Rochko 00db5c8ade [Glitch] Split VerifiedBadge from Account component 
Partial port of 0461f83320 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2023-12-02 16:59:40 +01:00
Eugen Rochko e0aba64a64 [Glitch] Fix regressions from change in account row design in web UI 
Port 46483ae849

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2023-12-02 16:59:40 +01:00
Eugen Rochko a262f990f8 Change design of account rows in web UI (#24247) 
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2023-12-02 16:59:40 +01:00
Claire 73a94c3b3f
Fix self-destruct page not using theme styles (#2490) 2023-12-02 14:54:35 +01:00
Plastikmensch 5b0382abc5
Remove redundant asset preload (#2488) 
* Remove redundant asset preload

preloading these is already handled by glitch-soc theming system, meaning glitch packs get preloaded and if the user is signed in, vanilla packs.

The theming system preloads these unconditionally though.

Signed-off-by: Plastikmensch <plastikmensch@users.noreply.github.com>

* Remove preload of getting started

This matches upstreams preloads

Signed-off-by: Plastikmensch <plastikmensch@users.noreply.github.com>

---------

Signed-off-by: Plastikmensch <plastikmensch@users.noreply.github.com>
 2023-12-02 14:54:26 +01:00
Claire 660372d130
Revert recent CSP changes (#2485) 
* Revert "Fix image and media loading when using external storage server"

This reverts commit 6cfa0245ca.

* Revert "Change glitch-soc's CSP config to match upstream's closer (#2474)"

This reverts commit d59196e170.
 2023-11-26 15:32:35 +01:00
Jeong Arm b3581d1e2f
Fix @rails/ujs import on public.jsx (#2482) 
Related: 8a131fb7bc
 2023-11-24 17:40:31 +01:00
Claire a21fe8687e
Merge pull request #2480 from ClearlyClaire/glitch-soc/fixes/csp 
Fix image and media loading when using external storage server
 2023-11-21 17:36:09 +01:00
Claire 6cfa0245ca Fix image and media loading when using external storage server 
Fixes #2479
 2023-11-21 13:45:29 +01:00
Claire 769ab0ce47
Merge pull request #2475 from ClearlyClaire/glitch-soc/cleanup 
Further reduce differences with upstream
 2023-11-20 13:39:56 +01:00
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 d59196e170
Change glitch-soc's CSP config to match upstream's closer (#2474) 2023-11-20 13:02:49 +01:00
Claire c34a3a83e1
Merge pull request #2471 from ClearlyClaire/glitch-soc/cleanup 
Clean up some more and reduce unwarranted differences with upstream further
 2023-11-19 21:05:34 +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 7f5b164326
Merge pull request #2470 from ClearlyClaire/glitch-soc/cleanup 
Clean up some more and reduce unwarranted differences with upstream further
 2023-11-16 17:49:36 +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 61df4f9cbf
Merge pull request #2469 from ClearlyClaire/glitch-soc/fixes/compose-form-checkbox 
[Glitch] Change compose form checkbox to native input with `appearance: none`
 2023-11-15 20:27:37 +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 7a877ae3d8
Merge pull request #2467 from ClearlyClaire/glitch-soc/cleanup 
Misc cleanup and backports
 2023-11-15 17:14:14 +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