Commit Graph

34 Commits (03f50f2f00a129da0cc021369b975ecfccf1327f)

Author SHA1 Message Date
Jeremy Kescher 03f50f2f00
Merge remote-tracking branch 'upstream/main' into develop
# Conflicts:
#	app/javascript/flavours/glitch/features/ui/components/link_footer.js
#	lib/mastodon/version.rb
#	public/avatars/original/missing.png
2 years ago
Claire b6c0ef70a2 [Glitch] Change sign-in banner to reflect disabled or moved account status
Port 312d616371 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2 years ago
Jeremy Kescher b0be4764b4
Keep showing explore tab, only statuses are hidden 2 years ago
Jeremy Kescher da8c3bed5c
Don't show trending statuses in public web UI 2 years ago
prplecake c199556f64
Fix 'App settings' link in basic web UI (#1880) 2 years ago
Claire f405ad69b3 [Glitch] Remove navigation links to /explore when trends are disabled
Port 267978d4fe to glithc-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2 years ago
Eugen Rochko 7bb1b917b2 [Glitch] Change featured hashtags to be displayed in navigation panel
Port aefa9253d6 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2 years ago
Eugen Rochko e9ccee38a7 [Glitch] Change floating action button to be a button in header in web UI
Port 1fd6460b02 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2 years ago
Claire 89e9ec8ae2 fixup! [Glitch] Fix intermediary responsive layout, accessibility on navigation in web UI 2 years ago
Yamagishi Kazutoshi 1850166de9 [Glitch] Hide list panel from nav bar in mobile layout
Port d787343325 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2 years ago
Yamagishi Kazutoshi 492ceeceb0 [Glitch] Fix fedi/local timeline nav link always hide
Port d3f1a010e5 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2 years ago
Eugen Rochko c36f28ba77 [Glitch] Fix intermediary responsive layout, accessibility on navigation in web UI
Port 0765324622 to glitch-soc

Co-authored-by: Yamagishi Kazutoshi <ykzts@desire.sh>
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2 years ago
Yamagishi Kazutoshi 8491a3532d [Glitch] Remove timeline preview link from nav panel when not signed-in
Port e82467ca41 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2 years ago
Eugen Rochko 206e9593ac [Glitch] Fix logged-out web UI on smaller screens
Port e2b561e3a5 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2 years ago
Claire d3879c07b1 Rename flavours/glitch/util into flavours/glitch/utils 2 years ago
Claire 26b687160b Move flavours/glitch/util/initial_state to flavours/glitch/initial_state 2 years ago
Eugen Rochko 0ff1d62c7a [Glitch] Add logged-out access to the web UI
Port part of 43b5d5e38d to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2 years ago
Claire d4f13b9041 Change “Explore” tab to only provide search when trends are disabled 2 years ago
mayaeh 815bf3753a [Glitch] Change the "Explore" icon from fa-globe to fa-hashtag
Port e38a01c41a to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2 years ago
Eugen Rochko c1fbef0965 [Glitch] Remove profile directory link from main navigation panel
Port 54d4ece743 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2 years ago
Eugen Rochko 058b74dc0a [Glitch] Add explore page to web UI
Port d4592bbfcd to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2 years ago
Eugen Rochko a7f6524c6b [Glitch] Change routing paths to use usernames in web UI
Port 52e5c07948 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
3 years ago
Thibaut Girka f154d9d6e9 Use upstream's Icon component
Rework the codebase to avoid unnecessary differences with upstream
5 years ago
mayaeh dea2b234c9 [Glitch] Integrate translation strings for the Profile Directory.
Port 1f22b8197c to glitch-soc

Signed-off-by: Thibaut Girka <thib@sitedethib.com>
5 years ago
Eugen Rochko 8b630f7e54 [Glitch] Add trends UI with admin and user settings
Port 9072fe5ab6 to glitch-soc

Signed-off-by: Thibaut Girka <thib@sitedethib.com>
5 years ago
Thibaut Girka e519b47da6 Update backend links and fix hardcoded ones 5 years ago
Eugen Rochko 7fe2120dd5 [Glitch] Add profile directory to web UI
Port cb447b28c4 to glitch-soc

Signed-off-by: Thibaut Girka <thib@sitedethib.com>
5 years ago
ThibG d1edbfaed3 [Glitch] Only show profile directory link when it's enabled
Port 1b4dcc3f78 to glitch-soc

Signed-off-by: Thibaut Girka <thib@sitedethib.com>
5 years ago
Thibaut Girka 44b1a39682 Replace link to favourites with link to bookmarks 5 years ago
Thibaut Girka 9400ec43cc Fix navigation panel 5 years ago
Thibaut Girka 7fd8797d20 Add app settings link to single-column mode 5 years ago
Eugen Rochko a5398c3df8 [Glitch] Add profile directory link to single column navigation panel
Port 6077eca240 to glitch-soc

Signed-off-by: Thibaut Girka <thib@sitedethib.com>
5 years ago
Eugen Rochko ff88387a4a [Glitch] Improvements to the single column layout
Port 0e445ebb13 to glitch-soc

Signed-off-by: Thibaut Girka <thib@sitedethib.com>
5 years ago
Eugen Rochko d99a661f08 [Glitch] Add responsive panels to the single-column layout
Port 1e5532e693 to glitch-soc

Signed-off-by: Thibaut Girka <thib@sitedethib.com>
5 years ago