djsundog/tootlab-mastodon
1
0
Fork 0
mirror of https://github.com/glitch-soc/mastodon.git synced 2025-01-16 04:32:57 -05:00
Code Issues Packages Projects Releases Wiki Activity
18,456 Commits 69 Branches 21 Tags 410 MiB
Commit Graph

2327 Commits

Author SHA1 Message Date
atsuchan
6df9d388e7
Update Flavour 'ja' Translation (#1911) 2022-11-10 17:26:28 +01:00
Eugen Rochko
c4d2c72924 [Glitch] Add option to open original page in dropdowns of remote content in web UI 
Port ef582dc4f2fe53b08988faf8d51f567ac32e5b93 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2022-11-10 11:06:56 +01:00
Sasha Sorokin
099b3011aa [Glitch] Remove aria-pressed where it's redundant 
Port d055d751720b7494ba990a43434b73e17596b5e8 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2022-11-10 10:25:43 +01:00
Eugen Rochko
65b6c4f6df [Glitch] Change larger reblogs/favourites numbers to be shortened in web UI 
Port 7bdb2433f1a6e0b6a5e4df068003ac6e2e296048 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2022-11-10 10:15:21 +01:00
Effy Elden
c722c4cce8 [Glitch] Remove unused timeline_container to fix linter errors 
Port 8fdbb4d00d371e7a900bec3a262216d95a784d52 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2022-11-10 09:54:19 +01:00
Eugen Rochko
41ea39903d [Glitch] Fix confusing wording in interaction modal in web UI 
Port 16122761c5eca0f25f17968a208a24ddd99e073e to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2022-11-10 09:53:06 +01:00
Eugen Rochko
d3a29a136c [Glitch] Fix profile header being cut off in light theme in web UI 
Port e37e8deb0ff207d36bb359ce395e2888dacc216d to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2022-11-10 09:51:46 +01:00
Claire
9b6d6a919f [Glitch] Fix redrafting a currently-editing post not leaving edit mode 
Port 782b6835f786385c41c6455f2a251d1925b19eb5 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2022-11-08 16:26:25 +01:00
Claire
fe1b694128 [Glitch] Fix opening the language picker scrolling the single-column view to the top 
Port 608343c135c087ab7fa9bd401dce8a705720fdb8 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2022-11-08 15:49:09 +01:00
Zach Flanders
6eac1cfccd [Glitch] Fix spoiler buttons css not rendering correct color in light theme 
Port 0beb095a4bfbcce55acb016eaaa54b5e93a56023 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2022-11-08 15:47:48 +01:00
Claire
2bc22be66c [Glitch] Add aria-expanded to content warning toggle button 
Port 622f603ac73e40a9e41c254fa90079eeecfe1e02 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2022-11-07 20:04:31 +01:00
Claire
c493c967d6
Fix light theme issues with the favourite modal and some background colors (#1902) 
* Fix favourite modal styling in glitch-soc light theme

* Fix unnecessary difference between glitch-soc's light theme and upstream's
 2022-11-07 10:34:18 +01:00
Sunny Ripert
7ba13dddfa [Glitch] Fix double button to clear emoji search input 
Port 4b7f32a2a668b7068ede7ac8eb2ac087883ba213 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 ffe735344bb47ad2af743ad97729db9ea9c11f60 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 34c269310d2017c3164d57c1e8631f9423092ee3 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 20aa8881dc98264e5875fa37fc2dbf18e3f2baac to glitch-soc
 2022-11-06 17:29:04 +01:00
Eugen Rochko
cbfa5ad5dd [Glitch] Fix wrong colors in the high-contrast theme 
Port 1c3192df6bf48eb4c3613f2a8744c809f6eeeec0 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 2d9a85db6efe0c9ccfda1420551ce3d6025bc27e 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 a442f481f850d857544eafdd0725142ed8656552 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 312d616371096235f1f317041300b8220c447613 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 bfafb114a2135b1f21ba7e6d54ee13e8da75b629 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 7c8e2b9859f2e206110accb74d19ec4591d79780 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 e02812d5b63b4909fff9c0c7246e80745c4c703e 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 887976814a2639a666896ae94b14c64e2834e26d 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 c95d9aab56dcde8c183f15d565cd1e8746d42c48 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 139ea4c981f563e51d80ec3ec407d6265e29cb70 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 cbb440bbc2de7c805f687c886b32ab7dbafde07f 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 74d40c7d8fac3ccc263af29c622f4481e18e8c59 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 ad83e64795361dc9d5990a9dae4f91a3642109a0 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 30ef11022487364256656efee3cee92db2c839b2 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 55af04b253435ae771b69c8b7cfe3fc7e3b18033 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 5fa340931e2bd39a4bcccc9a97ad58e13a2d56ab 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 923f06a07c851b25b989412f341f87f8b8fff42f 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 d9d722d74b2cb9bf30fa4cc98af6ddbeca003ebc 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 10922294ffd2c83e155f020896318d16f3764e8d 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 267978d4fe0eaee92f64d505df2a4a07d22f582c 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 5452af2188ba65c9f934280b65a2040c8cc9e718 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 7c152acb2cc545a87610de349a94e14f45fbed5d 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 73de39e6323460792ef8982555e5cfdaefb5a29b 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 23d367f544485eaeed888c707012a8282bbb5806 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 aefa9253d61def572396c18a8d2ac3cc706ffa2e 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 c55219efa811b3c6347774bec1b174d325e5f300 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 4c7b5fb6c1787438ef130d9aecd5d0a4d54d08a9 to glitch-soc

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