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

1965 Commits

Author SHA1 Message Date
Sunny Ripert
7ba13dddfa [Glitch] Fix double button to clear emoji search input
Port 4b7f32a2a6 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2022-11-07 07:55:44 +01:00
Sunny Ripert
71e68dac4e [Glitch] Fix JavaScript console error on Getting Started column
Port ffe735344b to glitch-soc

Co-authored-by: Ilias Tsangaris <iliastsangaris@gmail.com>

Co-authored-by: Ilias Tsangaris <iliastsangaris@gmail.com>
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2022-11-07 07:54:18 +01:00
Sunny Ripert
d13a2f7901 [Glitch] Fix console log error on column settings load
Port 34c269310d to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2022-11-07 07:53:20 +01:00
Claire
0be6da42d3 Change glitch-soc composer classes to match upstream 2022-11-06 17:29:04 +01:00
Eugen Rochko
c199387558 [Glitch] Fix colors in light theme
Port 20aa8881dc to glitch-soc
2022-11-06 17:29:04 +01:00
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>
2022-11-06 17:29:04 +01:00
Eugen Rochko
c883799a1f [Glitch] Change design of link footer
Port 2d9a85db6e to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2022-11-06 17:29:04 +01:00
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>
2022-11-06 17:29:04 +01:00
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>
2022-11-06 17:29:04 +01:00
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>
2022-11-06 17:29:04 +01:00
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>
2022-11-06 17:29:04 +01:00
Eugen Rochko
01e0cb1cd5 [Glitch] Add assets from Twemoji 14.0
Port e02812d5b6 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2022-11-06 10:50:23 +01:00
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>
2022-11-06 10:47:31 +01:00
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>
2022-11-06 10:46:03 +01:00
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>
2022-11-06 10:45:00 +01:00
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>
2022-11-06 10:43:18 +01:00
Claire
e42875d195 [Glitch] Fix edits not being immediately reflected
Port 74d40c7d8f to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2022-11-06 10:42:15 +01:00
prplecake
34ba7612d1
Fix 'App settings' label visible in sidebar on mobile UI (#1888) 2022-11-05 08:12:04 +01:00
prplecake
fc340c9154
Change ul, ol margin-left to 2em (#1879) 2022-11-01 09:41:58 +01:00
prplecake
c199556f64
Fix 'App settings' link in basic web UI (#1880) 2022-11-01 09:38:55 +01:00
Jeremy Kescher
41885c8715
Remove/update old "tootsuite" references, except those needed for Docker (#1860) 2022-11-01 09:38:05 +01:00
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>
2022-10-30 18:32:20 +01:00
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>
2022-10-30 18:30:58 +01:00
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>
2022-10-30 18:24:57 +01:00
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.
2022-10-30 18:15:28 +01:00
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>
2022-10-28 19:49:45 +02:00
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>
2022-10-28 19:49:45 +02:00
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>
2022-10-28 19:49:45 +02:00
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>
2022-10-28 19:49:45 +02:00
Claire
592147b902 Remove local settings items that make no sense anymore 2022-10-28 19:30:51 +02:00
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>
2022-10-28 19:26:28 +02:00
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>
2022-10-28 19:26:28 +02:00
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>
2022-10-28 19:24:02 +02:00
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>
2022-10-28 19:24:02 +02:00
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>
2022-10-28 19:24:02 +02:00
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>
2022-10-28 19:24:02 +02:00
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>
2022-10-28 19:24:02 +02:00
Takeshi Umeda
8be350cc82 [Glitch] Add featured tags selector for WebUI
Port 4c7b5fb6c1 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2022-10-28 19:24:02 +02:00
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>
2022-10-28 19:24:02 +02:00
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>
2022-10-28 19:24:02 +02:00
Claire
05c1dd9114 [Glitch] Add closed registrations modal
Port 2277913f3f to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2022-10-28 19:24:02 +02:00
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>
2022-10-28 19:24:02 +02:00
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>
2022-10-28 19:24:02 +02:00
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>
2022-10-28 19:24:02 +02:00
Eugen Rochko
2d731dbde6 [Glitch] Add ability to view previous edits of a status in admin UI
Port f8ca3bb2a1 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2022-10-28 19:24:02 +02:00
Claire
d9f182e5f3 [Glitch] Fix WebUI notification settings for new user and new report notifications
Port dd76bbf8b7 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2022-10-28 19:24:02 +02:00
Eugen Rochko
bfa47eb7d6 [Glitch] Fix language dropdown causing zoom on mobile devices in web UI
Port 3ad0a2ae3d to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2022-10-28 19:24:02 +02:00
Eugen Rochko
1315c149c0 [Glitch] Add error boundary around routes in web UI
Port a43a823768 to glitch-soc

Co-authored-by: Yamagishi Kazutoshi <ykzts@desire.sh>
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2022-10-28 19:24:02 +02:00
Eugen Rochko
92385da9c3 [Glitch] Fix reply not opening compose page on certain screen sizes in web UI
Port 56efa8d22f to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2022-10-28 19:24:02 +02:00
Eugen Rochko
7d3acb1f2c [Glitch] Fix error when rendering limited account in web UI
Port 73a48318a1 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2022-10-28 19:24:02 +02:00