3g0st
/
mastodon-docker-playground
forked from treehouse/mastodon
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
16,279 Commits
8 Branches
0 Tags
183 MiB
Commit Graph

16279 Commits (4a18d8e642d1374f9bee36a956910d2e6602ebd9)

Author SHA1 Message Date
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
Ariadne Conill 152f5c7983 app: api: base_controller: allow API access to be configurable 2022-11-06 19:13:50 +00:00
Ariadne Conill 7ceda772e4 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 8fb8a2667a Merge branch 'rebase/4.0.0rc1' 2022-11-06 18:23:41 +00:00
kouhai dev 6b7b80a892 update account request question prompt 2022-11-06 18:22:00 +00:00
Ariadne Conill a82113dbd9 vanilla: emoji: use 63x63 grid for emoji 2022-11-06 18:21:57 +00:00
Ariadne Conill 728ed66f8a glitch: emoji: set sprite sheet to 63x63 2022-11-06 18:21:52 +00:00
Ariadne Conill 117d2ed9c7 dockerfile: implement emoji-mart patch 2022-11-06 18:20:15 +00:00
Ariadne Conill 4c38a2d32c update emoji-mart sprite sheet for emoji 13.1 2022-11-06 18:20:15 +00:00
Ariadne Conill c01750a3dd add emoji 13.1 data for emoji-mart 2022-11-06 18:20:15 +00: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
kouhai dev 0ae6ca72de update account request question prompt 2022-11-06 01:36:06 -07: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