Claire
525919c04f
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
1a71d95760
[Glitch] Fix closed registrations message not appearing in web UI
...
Port 528f96e769
to glitch-soc
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2 years ago
Eugen Rochko
96e921ff5e
[Glitch] Fix number of uses being shown again on trending hashtags in web UI
...
Port c7f1ae40b5
to glitch-soc
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2 years ago
Claire
b1875bdb6f
[Glitch] Change admin announcement edition interface to use datetime-local
...
Port 9cb523d3be
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
c7f3efb312
[Glitch] fix(component): adjust style of counter button to fix overflow issue
...
Port 21aa2217de
to glitch-soc
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2 years ago
Claire
9e071d5c78
Remove local settings items that make no sense anymore
2 years ago
Claire
f1d9278d0a
[Glitch] Remove navigation links to /explore when trends are disabled
...
Port 4a6fb0ea2a
to glithc-soc
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2 years ago
Eugen Rochko
97e7443443
[Glitch] Fix redirecting to `/publish` when compose form is visible in web UI
...
Port 2e0f4c286f
to glitch-soc
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2 years ago
Eugen Rochko
7d3b787d05
[Glitch] Change settings area to be separated into categories in admin UI
...
Port 2130895196
to glitch-soc
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2 years ago
Eugen Rochko
2caae26da9
[Glitch] Fix media, following and followers tabs in web UI
...
Port 14b27b92e2
to glitch-soc
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2 years ago
Eugen Rochko
6ecd6364be
[Glitch] Fix too many featured tags causing navigation panel scroll in web UI
...
Port a51d8075b6
to glitch-soc
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2 years ago
Eugen Rochko
e06a095eb4
[Glitch] Change featured hashtags to be displayed in navigation panel
...
Port 6ab724918b
to glitch-soc
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2 years ago
Eugen Rochko
ad94457784
[Glitch] Remove volume number from hashtags in web UI
...
Port 93ef719ce2
to glitch-soc
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2 years ago
Takeshi Umeda
87d3b61bb6
[Glitch] Add featured tags selector for WebUI
...
Port 3e88e7ba20
to glitch-soc
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2 years ago
Eugen Rochko
ccdf8b587f
[Glitch] Fix `nofollow` rel being removed in web UI
...
Port b01fad5dbd
to glitch-soc
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2 years ago
Eugen Rochko
3c8f8ed8e3
[Glitch] Change floating action button to be a button in header in web UI
...
Port 370f2609b8
to glitch-soc
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2 years ago
Claire
535bd4712c
[Glitch] Add closed registrations modal
...
Port d94b1c682a
to glitch-soc
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2 years ago
Eugen Rochko
62ab234587
[Glitch] Fix notifications about deleted reports not being also deleted
...
Port 35b5120c5d
to glitch-soc
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2 years ago
Eugen Rochko
358012fefd
[Glitch] Fix missing delete and redraft link in web UI
...
Port 4b0d58f0ad
to glitch-soc
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2 years ago
Eugen Rochko
60bd9718cf
[Glitch] Change post editing to be enabled in web UI
...
Port 85fc370638
to glitch-soc
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2 years ago
Eugen Rochko
76e6e35a52
[Glitch] Add ability to view previous edits of a status in admin UI
...
Port 3e5588bf70
to glitch-soc
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2 years ago
Claire
5cf02124ed
[Glitch] Fix WebUI notification settings for new user and new report notifications
...
Port 0e682bbe24
to glitch-soc
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2 years ago
Eugen Rochko
354ebf9483
[Glitch] Fix language dropdown causing zoom on mobile devices in web UI
...
Port aa2d04e53e
to glitch-soc
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2 years ago
Eugen Rochko
a27d108cea
[Glitch] Add error boundary around routes in web UI
...
Port daaa66a2c2
to glitch-soc
Co-authored-by: Yamagishi Kazutoshi <ykzts@desire.sh>
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2 years ago
Eugen Rochko
7ed4c4db9e
[Glitch] Fix reply not opening compose page on certain screen sizes in web UI
...
Port 01980c975b
to glitch-soc
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2 years ago
Eugen Rochko
f3c3f1f244
[Glitch] Fix error when rendering limited account in web UI
...
Port a041d3cb27
to glitch-soc
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2 years ago
Claire
e90ba7df8f
[Glitch] Change landing page to be /about instead of /explore when trends are disabled
...
Port f272594be6
to glitch-soc
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2 years ago
Eugen Rochko
a916c471d1
[Glitch] Fix case-sensitive look-up for profiles in web UI
...
Port e700e95246
to glitch-soc
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2 years ago
Eugen Rochko
1f9f465931
[Glitch] Fix error on profile in web UI
...
Port 8e0daf2214
to glitch-soc
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2 years ago
prplecake
8a6d6ae4fc
[Glitch] Don't use "unfollow language" when cancelling follow requests
...
Port 2690a13d0e
to glitch-soc
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2 years ago
Claire
37879eb72e
fixup! [Glitch] Fix logged-out web UI on smaller screens
2 years ago
Claire
3462b81094
fixup! [Glitch] Change public accounts pages to mount the web UI
2 years ago
Claire
3e360ed0b4
fixup! [Glitch] Fix intermediary responsive layout, accessibility on navigation in web UI
2 years ago
Eugen Rochko
104af53947
[Glitch] Change public accounts pages to mount the web UI
...
Port 0fdfbe555e
to glitch-soc
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2 years ago
Eugen Rochko
b8c9d74210
[Glitch] Fix missing rules in report modal in web UI
...
Port 0b84d15288
to glitch-soc
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2 years ago
Eugen Rochko
ca506459b7
[Glitch] Fix error while server rules are loading in report modal in web UI
...
Port 3e88e7ba20
to glitch-soc
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2 years ago
Yamagishi Kazutoshi
32716cf0d3
[Glitch] Fix missing `isCancel`
...
Port 14bae3580b
to glitch-soc
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2 years ago
Yamagishi Kazutoshi
935359fcc7
[Glitch] Replace `CancelToken` to `AbortSignal`
...
Port 4266397139
to glitch-soc
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2 years ago
Eugen Rochko
5f44aae001
[Glitch] Change about page to be mounted in the web UI
...
Port e376f33207
to glitch-soc
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2 years ago
Yamagishi Kazutoshi
9e32bcc0d8
[Glitch] Redirect non-logged-in user to owner statuses on single user mode
...
Port f84bee7d78
to glitch-soc
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2 years ago
Yamagishi Kazutoshi
f25dd7d44e
[Glitch] Hide list panel from nav bar in mobile layout
...
Port bccb0db26b
to glitch-soc
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2 years ago
Yamagishi Kazutoshi
f801b65abf
[Glitch] Fix `ColumnLink` labels not disappearing in mobile UI
...
Port 595d5744ae
to glitch-soc
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2 years ago
Yamagishi Kazutoshi
f9c8ac8dd1
[Glitch] Fix fedi/local timeline nav link always hide
...
Port fca4e2c284
to glitch-soc
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2 years ago
Eugen Rochko
47700a2f99
[Glitch] Fix intermediary responsive layout, accessibility on navigation in web UI
...
Port e13d9e178c
to glitch-soc
Co-authored-by: Yamagishi Kazutoshi <ykzts@desire.sh>
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2 years ago
Eugen Rochko
579cb88392
[Glitch] Add dismissable hints to various timelines in web UI
...
Port aa2b4d5c4c
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
6fcc2e5969
[Glitch] Add title to pages with missing title in Web UI
...
Port 9762fe2475
to glitch-soc
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2 years ago
Yamagishi Kazutoshi
0094109575
[Glitch] Remove timeline preview link from nav panel when not signed-in
...
Port c312e0180b
to glitch-soc
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2 years ago
Eugen Rochko
d80c810243
[Glitch] Change privacy policy to be rendered in web UI, add REST API
...
Port 378e00b59c
to glitch-soc
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2 years ago
Eugen Rochko
197fa15990
[Glitch] Add server rules to sign-up flow
...
Port 448d8ae2df
to glitch-soc
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2 years ago
Eugen Rochko
d8338794a1
[Glitch] Fix logged-out web UI on smaller screens
...
Port 2d634b669b
to glitch-soc
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2 years ago