Commit graph

38492 commits

Author SHA1 Message Date
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
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
Claire
74b407fc3f Merge pull request #1899 from ClearlyClaire/glitch-soc/merge-upstream
Merge upstream changes
2022-11-07 08:31:36 +01:00
Claire
b67e0c94a6
Merge pull request #1899 from ClearlyClaire/glitch-soc/merge-upstream
Merge upstream changes
2022-11-07 08:31:36 +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
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
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
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
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
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
495243d9ae Merge branch 'main' into glitch-soc/merge-upstream 2022-11-07 07:50:47 +01:00
Claire
6c0a6097ff Merge branch 'main' into glitch-soc/merge-upstream 2022-11-07 07:50:47 +01:00
Chris Rose
42657c0728 Tag the OTP field with autocomplete for password managers (#19946)
This is modeled on #19833, and based on the attribute values documented
in https://developer.apple.com/documentation/security/password_autofill/enabling_password_autofill_on_an_html_input_element?language=objc
2022-11-07 03:57:16 +01:00
Chris Rose
a70e2cd649
Tag the OTP field with autocomplete for password managers (#19946)
This is modeled on #19833, and based on the attribute values documented
in https://developer.apple.com/documentation/security/password_autofill/enabling_password_autofill_on_an_html_input_element?language=objc
2022-11-07 03:57:16 +01:00
Sunny Ripert
bfad78e194 Fix double button to clear emoji search input (#19888) 2022-11-07 03:40:54 +01:00
Sunny Ripert
4b7f32a2a6
Fix double button to clear emoji search input (#19888) 2022-11-07 03:40:54 +01:00
Jeremy Kescher
3b6c7c4878 Add null check on application in dispute viewer (#19851) 2022-11-07 03:40:17 +01:00
Jeremy Kescher
02a34252ba
Add null check on application in dispute viewer (#19851) 2022-11-07 03:40:17 +01:00
Sunny Ripert
99cf3cdb63 Fix JavaScript console error on Getting Started column (#19891)
* Fix JavaScript console error on Getting Started column

* Update app/javascript/mastodon/components/column_header.js

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

Co-authored-by: Ilias Tsangaris <iliastsangaris@gmail.com>
2022-11-07 03:40:04 +01:00
Sunny Ripert
ffe735344b
Fix JavaScript console error on Getting Started column (#19891)
* Fix JavaScript console error on Getting Started column

* Update app/javascript/mastodon/components/column_header.js

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

Co-authored-by: Ilias Tsangaris <iliastsangaris@gmail.com>
2022-11-07 03:40:04 +01:00
Sunny Ripert
461d06bec8 Fix console log error on column settings load (#19886) 2022-11-07 03:39:48 +01:00
Sunny Ripert
34c269310d
Fix console log error on column settings load (#19886) 2022-11-07 03:39:48 +01:00
Claire
bfb8121e94 Fix crash in legacy filter creation controller (#19878) 2022-11-07 03:38:53 +01:00
Claire
4cb2323458
Fix crash in legacy filter creation controller (#19878) 2022-11-07 03:38:53 +01:00
nightpool
149a8246d2 Skip Webfinger cache during migrations as well (#19883) 2022-11-07 03:31:38 +01:00
nightpool
54f0f1b9ef
Skip Webfinger cache during migrations as well (#19883) 2022-11-07 03:31:38 +01:00
Rob Petti
9cc859808e allow /api/v1/streaming to be used as per documentation (#19896) 2022-11-07 03:16:44 +01:00
Rob Petti
8c81db5a41
allow /api/v1/streaming to be used as per documentation (#19896) 2022-11-07 03:16:44 +01:00
rcombs
edb86217c9 Set autocomplete attr for email field on signup page (#19833)
The email address will be used as the "username" for sign-in purposes, so it's the value that should be stored in password managers. We can inform the password manager of this by setting `autocomplete="email"`. Without this hint, password managers may instead store the `username` field, which isn't valid for sign-in (this happens with iCloud Keychain in Safari, for instance).
2022-11-07 03:16:10 +01:00
rcombs
e53fc34e9a
Set autocomplete attr for email field on signup page (#19833)
The email address will be used as the "username" for sign-in purposes, so it's the value that should be stored in password managers. We can inform the password manager of this by setting `autocomplete="email"`. Without this hint, password managers may instead store the `username` field, which isn't valid for sign-in (this happens with iCloud Keychain in Safari, for instance).
2022-11-07 03:16:10 +01:00
Ariadne Conill
5b92324e54 th: app: api: base_controller: allow API access to be configurable 2022-11-06 19:13:50 +00:00
Ariadne Conill
9ee65200fd th: locales: fix YAML quoting issue
Psych::SyntaxError: (/opt/mastodon/config/locales/simple_form.en.yml): mapping values are not allowed in this context at line 102 column 103
2022-11-06 18:43:54 +00:00
Ariadne Conill
dfa1d7b22e Merge branch 'rebase/4.0.0rc1' 2022-11-06 18:23:41 +00:00
Kouhai
ced3e4e27c th: update account request question prompt 2022-11-06 18:22:00 +00:00
Ariadne Conill
697b1f4a2d th: vanilla: emoji: use 63x63 grid for emoji 2022-11-06 18:21:57 +00:00
Ariadne Conill
5ab9afa33f th: glitch: emoji: set sprite sheet to 63x63 2022-11-06 18:21:52 +00:00
Ariadne Conill
b17c429263 th: dockerfile: implement emoji-mart patch 2022-11-06 18:20:15 +00:00
Ariadne Conill
5ac86a2097 th: update emoji-mart sprite sheet for emoji 13.1 2022-11-06 18:20:15 +00:00
Ariadne Conill
e79855991e th: add emoji 13.1 data for emoji-mart 2022-11-06 18:20:15 +00:00
Claire
c18d61eff4 Merge pull request #1892 from ClearlyClaire/glitch-soc/merge-upstream
Merge upstream changes
2022-11-06 18:49:46 +01:00
Claire
54101563bb
Merge pull request #1892 from ClearlyClaire/glitch-soc/merge-upstream
Merge upstream changes
2022-11-06 18:49:46 +01:00
Claire
03aa732d5c Fix status cache hydration discrepancy 2022-11-06 17:29:04 +01:00
Claire
21d6bc1689 Fix status cache hydration discrepancy 2022-11-06 17:29:04 +01:00
Claire
ba394a191b Change glitch-soc composer classes to match upstream 2022-11-06 17:29:04 +01:00
Claire
0be6da42d3 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
c199387558 [Glitch] Fix colors in light theme
Port 20aa8881dc 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
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
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