Commit Graph

16216 Commits

Author SHA1 Message Date
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
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
6c0a6097ff Merge branch 'main' into glitch-soc/merge-upstream 2022-11-07 07:50:47 +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
4b7f32a2a6
Fix double button to clear emoji search input (#19888) 2022-11-07 03:40:54 +01:00
Jeremy Kescher
02a34252ba
Add null check on application in dispute viewer (#19851) 2022-11-07 03:40:17 +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
34c269310d
Fix console log error on column settings load (#19886) 2022-11-07 03:39:48 +01:00
Claire
4cb2323458
Fix crash in legacy filter creation controller (#19878) 2022-11-07 03:38:53 +01:00
nightpool
54f0f1b9ef
Skip Webfinger cache during migrations as well (#19883) 2022-11-07 03:31:38 +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
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
Claire
54101563bb
Merge pull request #1892 from ClearlyClaire/glitch-soc/merge-upstream
Merge upstream changes
2022-11-06 18:49:46 +01:00
Claire
21d6bc1689 Fix status cache hydration discrepancy 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
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
Yamagishi Kazutoshi
bd220c32f1
Update SECURITY.md (#19869) 2022-11-06 16:13:53 +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
Claire
0ad919b192 Merge branch 'main' into glitch-soc/merge-upstream
Conflicts:
- `app/javascript/mastodon/features/compose/components/poll_form.js`:
  glitch-soc change because of having changed the default number of
  available poll options.
  Applied upstream's changes while keeping glitch-soc's default number of
  poll options.
- `public/oops.png`:
  We had a minor graphics change, probably not worth diverging from upstream.
  Took upstream version.
2022-11-06 09:50:41 +01:00
Eugen Rochko
5187e4e758
Bump version to 4.0.0rc2 (#19831) 2022-11-06 06:59:56 +01:00
Eugen Rochko
3151b260e2
Fix not using GIN index for account search queries (#19830) 2022-11-06 06:16:34 +01:00
Eugen Rochko
58fc889c6f
Update changelog for 4.0.0rc1 (#19814) 2022-11-05 23:24:07 +01:00
Eugen Rochko
ca8d52c2a4
Change design of new list form in web UI (#19801) 2022-11-05 23:06:32 +01:00
Justin Thomas
18ac5f1cc8
version emoji-mart (#19715)
* version emoji-mart

* add lock file
2022-11-05 23:02:41 +01:00
Eugen Rochko
b5b1a202cc
Fix missing string in admin UI (#19809) 2022-11-05 23:00:48 +01:00
Hayden
c8bf6192e4
Heroku fix (#19807)
Currently building on Heroku fails with a package error for libidn11. Since Mastodon uses idn-ruby 0.1.2 we should upgrade to libidn12
2022-11-05 22:57:58 +01:00
Eugen Rochko
3a41fccc43
Change AUTHORIZED_FETCH to not block unauthenticated REST API access (#19803)
New environment variable `DISALLOW_UNAUTHENTICATED_API_ACCESS`
2022-11-05 22:56:03 +01:00
Eugen Rochko
d0c9ac3919
Fix indexing scheduler trying to index when Elasticsearch is disabled (#19805)
Fix #19646
2022-11-05 22:31:52 +01:00
Eugen Rochko
d54e7ee61e
Fix n+1 queries when rendering initial state JSON (#19795) 2022-11-05 21:51:01 +01:00
Moritz Hedtke
c64be9758f
helm: Add documentation to run tootctl commands (#19791) 2022-11-05 21:19:25 +01:00
Eugen Rochko
d1de7fb7fa
Fix rendering empty avatar in web UI (#19798) 2022-11-05 21:18:57 +01:00
Eugen Rochko
a442f481f8
Fix missing interpolation of domain in disabled account banner in web UI (#19788) 2022-11-05 21:11:35 +01:00
Eugen Rochko
7c65f52692
Change design of moved account banner in web UI (#19790) 2022-11-05 21:11:24 +01:00
eai04191
30e786225e
Remove word-break:keep-all from Dismissable banner message (#19799) 2022-11-05 21:03:58 +01:00
Claire
312d616371
Change sign-in banner to reflect disabled or moved account status (#19773) 2022-11-05 18:28:13 +01:00
Alex Nordlund
0498b106c9
Add S3 existing secret to sidekiq (#19778) 2022-11-05 17:29:20 +01:00
Yarden Shoham
29604763d7
Remove broken link references to bug bounty program (#19779)
The link https://app.intigriti.com/programs/mastodon/mastodonio/detail no longer works

* Closes #19491

Signed-off-by: Yarden Shoham <hrsi88@gmail.com>

Signed-off-by: Yarden Shoham <hrsi88@gmail.com>
2022-11-05 17:27:44 +01:00