Commit Graph

2022 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 0be6da42d3 Change glitch-soc composer classes to match upstream 2 years ago
Eugen Rochko c199387558 [Glitch] Fix colors in light theme
Port 20aa8881dc to glitch-soc
2 years ago
Eugen Rochko cbfa5ad5dd [Glitch] Fix wrong colors in the high-contrast theme
Port 1c3192df6b to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2 years ago
Eugen Rochko c883799a1f [Glitch] Change design of link footer
Port 2d9a85db6e to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2 years ago
Eugen Rochko d29172a682 [Glitch] Fix missing interpolation of domain in disabled account banner in web UI
Port a442f481f8 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
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
Eugen Rochko 0437159056 [Glitch] Fix showing profile's featured tags on individual statuses
Port bfafb114a2 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2 years ago
Claire fa293f03fa [Glitch] Fix handling of duplicate and out-of-order notifications in WebUI
Port 7c8e2b9859 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2 years ago
Eugen Rochko 01e0cb1cd5 [Glitch] Add assets from Twemoji 14.0
Port e02812d5b6 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2 years ago
Sunny Ripert 8368f4857c [Glitch] Fix JavaScript console warning when loading notifications
Port 887976814a to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2 years ago
Sunny Ripert 93ccb4a29e [Glitch] Fix JavaScript console error on upload editing status
Port c95d9aab56 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2 years ago
Eugen Rochko 81334e2bfb [Glitch] Fix limited account hint referencing "your" server when logged out
Port 139ea4c981 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2 years ago
Claire 6b498fae46 [Glitch] Fix being unable to withdraw follow request when confirmation modal is disabled (#19687)
Port cbb440bbc2 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2 years ago
Claire e42875d195 [Glitch] Fix edits not being immediately reflected
Port 74d40c7d8f to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2 years ago
Jeremy Kescher 9dafedaecd
Remove misc duplicate declarations 2 years ago
Jeremy Kescher 5ab1ac972b
Show about tab if explore tab wouldn't show any statuses 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
Jeremy Kescher 96afc222d2
Merge remote-tracking branch 'upstream/main' into develop 2 years ago
prplecake 34ba7612d1
Fix 'App settings' label visible in sidebar on mobile UI (#1888) 2 years ago
Jeremy Kescher 9c8fb2d475
Improve min poll options, expose value in API 2 years ago
Jeremy Kescher 22427cd43c
Merge remote-tracking branch 'upstream/main'
# Conflicts:
#	app/javascript/flavours/glitch/features/ui/components/link_footer.js
#	app/javascript/flavours/glitch/features/ui/components/onboarding_modal.js
2 years ago
prplecake fc340c9154
Change ul, ol margin-left to 2em (#1879) 2 years ago
prplecake c199556f64
Fix 'App settings' link in basic web UI (#1880) 2 years ago
Jeremy Kescher 41885c8715
Remove/update old "tootsuite" references, except those needed for Docker (#1860) 2 years ago
Jeremy Kescher 7f6215984b
Merge remote-tracking branch 'upstream/main' into develop
# Conflicts:
#	.github/workflows/build-image.yml
2 years ago
Eugen Rochko 8048874a3a [Glitch] Fix sidebar and tabs on settings on small screens in admin UI
Port ad83e64795 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2 years ago
Eugen Rochko ebfe393e9c [Glitch] Fix upload progress not communicating processing phase in web UI
Port 30ef110224 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2 years ago
Eugen Rochko eb307ec1bd [Glitch] Fix logged out search and changed logged-in search placeholder
Port 55af04b253 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2 years ago
Claire eee36267d6 Merge branch 'main' into glitch-soc/merge-upstream
Conflicts:
- `app/javascript/mastodon/locales/ja.json`:
  Upstream change too close to a glitch-soc-specific string.
  The glitch-soc-specific string should not have been in this file, so it
  has been moved to `app/javascript/flavours/glitch/locales/ja.js`.
- `app/javascript/packs/public.js`:
  Upstream refactored a part, that as usual is split and duplicated in various
  pack files. Updated those pack files accordingly.
- `app/views/layouts/application.html.haml`:
  Upstream fixed custom.css path in a different way than we did, went with
  upstream's change.
2 years ago
Eugen Rochko 8814a1b949 [Glitch] Fix closed registrations message not appearing in web UI
Port 5fa340931e to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2 years ago
Eugen Rochko 9f6c175550 [Glitch] Fix number of uses being shown again on trending hashtags in web UI
Port 923f06a07c to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2 years ago
Claire 2cb3dd9364 [Glitch] Change admin announcement edition interface to use datetime-local
Port d9d722d74b to glitch-soc

Co-authored-by: Eugen Rochko <eugen@zeonfederated.com>
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2 years ago
Robert Laurenz 047a2f1f1b [Glitch] fix(component): adjust style of counter button to fix overflow issue
Port 10922294ff to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2 years ago
Claire 592147b902 Remove local settings items that make no sense anymore 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 89fdfb8fe6 [Glitch] Fix redirecting to `/publish` when compose form is visible in web UI
Port 5452af2188 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2 years ago
Eugen Rochko 80b53623e1 [Glitch] Change settings area to be separated into categories in admin UI
Port 7c152acb2c to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2 years ago
Eugen Rochko 58e2b0973d [Glitch] Fix media, following and followers tabs in web UI
Port 73de39e632 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2 years ago
Eugen Rochko c9d3c7d63a [Glitch] Fix too many featured tags causing navigation panel scroll in web UI
Port 23d367f544 to glitch-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 2cea6e5564 [Glitch] Remove volume number from hashtags in web UI
Port c55219efa8 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2 years ago
Takeshi Umeda 8be350cc82 [Glitch] Add featured tags selector for WebUI
Port 4c7b5fb6c1 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2 years ago
Eugen Rochko a2942fd0b8 [Glitch] Fix `nofollow` rel being removed in web UI
Port 9757c917da 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 05c1dd9114 [Glitch] Add closed registrations modal
Port 2277913f3f to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2 years ago
Eugen Rochko ce27c6502b [Glitch] Fix notifications about deleted reports not being also deleted
Port d2eb726962 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2 years ago
Eugen Rochko 5dfb7ba35c [Glitch] Fix missing delete and redraft link in web UI
Port 371d969403 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2 years ago
Eugen Rochko b36c58b99e [Glitch] Change post editing to be enabled in web UI
Port 8ebff0efcb to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2 years ago