Commit graph

1985 commits

Author SHA1 Message Date
Claire
efa93f0b5a Merge pull request #1917 from ClearlyClaire/glitch-soc/fixes/not-recommended-label
Fix “not recommended” label being shown as “recommended”
2022-11-12 11:10:39 +01:00
Claire
33596cc371 Change "Allow trends without prior review' setting to include statuses
Port SCSS changes from ecddc06474 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2022-11-12 10:59:17 +01:00
Claire
bef72dcabb Fix styling of advanced options dropdown (#1916)
Fixes #1914
2022-11-12 09:59:28 +01:00
atsuchan
f39f4f4296 Update Flavour 'ja' Translation (#1911) 2022-11-10 17:26:28 +01:00
Eugen Rochko
3b3886e80b [Glitch] Add option to open original page in dropdowns of remote content in web UI
Port 3ff5a02f65 to glitch-soc

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

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

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

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

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

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

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

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

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

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2022-11-07 20:04:31 +01:00
Claire
55e949369e 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
7ef1d0fa29 [Glitch] Fix double button to clear emoji search input
Port bfad78e194 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2022-11-07 07:55:44 +01:00
Sunny Ripert
906cbff923 [Glitch] Fix JavaScript console error on Getting Started column
Port 99cf3cdb63 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
5baaa9f8a6 [Glitch] Fix console log error on column settings load
Port 461d06bec8 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2022-11-07 07:53:20 +01:00
Claire
ba394a191b Change glitch-soc composer classes to match upstream 2022-11-06 17:29:04 +01:00
Eugen Rochko
81e313a1be [Glitch] Fix colors in light theme
Port f8def1f6b1 to glitch-soc
2022-11-06 17:29:04 +01:00
Eugen Rochko
896f2a3b16 [Glitch] Fix wrong colors in the high-contrast theme
Port 3cd8f07e90 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2022-11-06 17:29:04 +01:00
Eugen Rochko
df921b23a9 [Glitch] Change design of link footer
Port 0b91816814 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2022-11-06 17:29:04 +01:00
Eugen Rochko
7cc6e34cc4 [Glitch] Fix missing interpolation of domain in disabled account banner in web UI
Port 8742e0000e to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2022-11-06 17:29:04 +01:00
Claire
3eec8f7152 [Glitch] Change sign-in banner to reflect disabled or moved account status
Port 3d24ef2967 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2022-11-06 17:29:04 +01:00
Eugen Rochko
0082653909 [Glitch] Fix showing profile's featured tags on individual statuses
Port 51e5229712 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2022-11-06 17:29:04 +01:00
Claire
5b9b797f64 [Glitch] Fix handling of duplicate and out-of-order notifications in WebUI
Port 7e4afba7c6 to glitch-soc

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

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2022-11-06 10:50:23 +01:00
Sunny Ripert
1f7d23bdd8 [Glitch] Fix JavaScript console warning when loading notifications
Port c91962983f to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2022-11-06 10:47:31 +01:00
Sunny Ripert
1ad7f63551 [Glitch] Fix JavaScript console error on upload editing status
Port 343099eafa to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2022-11-06 10:46:03 +01:00
Eugen Rochko
8a2d0a928f [Glitch] Fix limited account hint referencing "your" server when logged out
Port bd9c4ec16d to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2022-11-06 10:45:00 +01:00
Claire
850e8e5f3c [Glitch] Fix being unable to withdraw follow request when confirmation modal is disabled (#19687)
Port b0d4b7d956 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2022-11-06 10:43:18 +01:00
Claire
3fc27d62fd [Glitch] Fix edits not being immediately reflected
Port 2674759f9c to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2022-11-06 10:42:15 +01:00
prplecake
b6e72884ca Fix 'App settings' label visible in sidebar on mobile UI (#1888) 2022-11-05 08:12:04 +01:00
prplecake
71e4e22f9f Change ul, ol margin-left to 2em (#1879) 2022-11-01 09:41:58 +01:00
prplecake
e8e547b23d Fix 'App settings' link in basic web UI (#1880) 2022-11-01 09:38:55 +01:00
Jeremy Kescher
f00756b79e Remove/update old "tootsuite" references, except those needed for Docker (#1860) 2022-11-01 09:38:05 +01:00
Eugen Rochko
974c21ac09 [Glitch] Fix sidebar and tabs on settings on small screens in admin UI
Port 361a2a3516 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2022-10-30 18:32:20 +01:00
Eugen Rochko
b12ffe1fbf [Glitch] Fix upload progress not communicating processing phase in web UI
Port 89ef2cf044 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2022-10-30 18:30:58 +01:00
Eugen Rochko
a1fed002e8 [Glitch] Fix logged out search and changed logged-in search placeholder
Port 973d496b86 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2022-10-30 18:24:57 +01:00
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.
2022-10-30 18:15:28 +01:00
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>
2022-10-28 19:49:45 +02:00
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>
2022-10-28 19:49:45 +02:00
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>
2022-10-28 19:49:45 +02:00
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>
2022-10-28 19:49:45 +02:00
Claire
9e071d5c78 Remove local settings items that make no sense anymore 2022-10-28 19:30:51 +02:00
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>
2022-10-28 19:26:28 +02:00
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>
2022-10-28 19:26:28 +02:00
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>
2022-10-28 19:24:02 +02:00
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>
2022-10-28 19:24:02 +02:00
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>
2022-10-28 19:24:02 +02:00