treehouse
/
mastodon
20
8
Fork 5
Code Issues 32 Pull Requests Projects 1 Releases Wiki Activity
16,275 Commits
12 Branches
15 Tags
760 MiB
Commit Graph

16275 Commits (3af10ecac01baa84e6bd777daa808dd1260d1b33)

Author SHA1 Message Date
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 461d06bec8 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
nightpool 149a8246d2 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
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
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 dev 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 03aa732d5c 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
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
Yamagishi Kazutoshi 597e4949eb Update SECURITY.md (#19869) 2022-11-06 16:13:53 +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
Claire 20fb459dee 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 eb1ef52ba9 th: update account request question prompt 2022-11-06 01:36:06 -07:00
Eugen Rochko cdbd1a8bb3 Bump version to 4.0.0rc2 (#19831) 2022-11-06 06:59:56 +01:00
Eugen Rochko b2cf46ee21 Fix not using GIN index for account search queries (#19830) 2022-11-06 06:16:34 +01:00
Eugen Rochko 0a4ba36af4 Update changelog for 4.0.0rc1 (#19814) 2022-11-05 23:24:07 +01:00
Eugen Rochko 786b5a7c49 Change design of new list form in web UI (#19801) 2022-11-05 23:06:32 +01:00
Justin Thomas 7c32172454 version emoji-mart (#19715) 
* version emoji-mart

* add lock file
 2022-11-05 23:02:41 +01:00
Eugen Rochko c0086c9da8 Fix missing string in admin UI (#19809) 2022-11-05 23:00:48 +01:00
Hayden 5d1a6a6b8b 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 b38a465476 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 4c6f7ee8ca Fix indexing scheduler trying to index when Elasticsearch is disabled (#19805) 
Fix #19646
 2022-11-05 22:31:52 +01:00
Eugen Rochko d67659a2cd Fix n+1 queries when rendering initial state JSON (#19795) 2022-11-05 21:51:01 +01:00
Moritz Hedtke 661c42fc52 helm: Add documentation to run tootctl commands (#19791) 2022-11-05 21:19:25 +01:00
Eugen Rochko 90902371b0 Fix rendering empty avatar in web UI (#19798) 2022-11-05 21:18:57 +01:00
Eugen Rochko 8742e0000e Fix missing interpolation of domain in disabled account banner in web UI (#19788) 2022-11-05 21:11:35 +01:00
Eugen Rochko 716696cd80 Change design of moved account banner in web UI (#19790) 2022-11-05 21:11:24 +01:00
eai04191 afb6763712 Remove word-break:keep-all from Dismissable banner message (#19799) 2022-11-05 21:03:58 +01:00
Claire 3d24ef2967 Change sign-in banner to reflect disabled or moved account status (#19773) 2022-11-05 18:28:13 +01:00