about summary refs log tree commit diff
AgeCommit message (Collapse)Author
2022-11-07Merge pull request #1899 from ClearlyClaire/glitch-soc/merge-upstreamClaire
Merge upstream changes
2022-11-07[Glitch] Fix double button to clear emoji search inputSunny Ripert
Port 4b7f32a2a668b7068ede7ac8eb2ac087883ba213 to glitch-soc Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2022-11-07[Glitch] Fix JavaScript console error on Getting Started columnSunny Ripert
Port ffe735344bb47ad2af743ad97729db9ea9c11f60 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[Glitch] Fix console log error on column settings loadSunny Ripert
Port 34c269310d2017c3164d57c1e8631f9423092ee3 to glitch-soc Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2022-11-07Merge branch 'main' into glitch-soc/merge-upstreamClaire
2022-11-07Tag the OTP field with autocomplete for password managers (#19946)Chris Rose
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-07Fix double button to clear emoji search input (#19888)Sunny Ripert
2022-11-07Add null check on application in dispute viewer (#19851)Jeremy Kescher
2022-11-07Fix JavaScript console error on Getting Started column (#19891)Sunny Ripert
* 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-07Fix console log error on column settings load (#19886)Sunny Ripert
2022-11-07Fix crash in legacy filter creation controller (#19878)Claire
2022-11-07Skip Webfinger cache during migrations as well (#19883)nightpool
2022-11-07allow /api/v1/streaming to be used as per documentation (#19896)Rob Petti
2022-11-07Set autocomplete attr for email field on signup page (#19833)rcombs
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-06Merge pull request #1892 from ClearlyClaire/glitch-soc/merge-upstreamClaire
Merge upstream changes
2022-11-06Fix status cache hydration discrepancyClaire
2022-11-06Change glitch-soc composer classes to match upstreamClaire
2022-11-06[Glitch] Fix colors in light themeEugen Rochko
Port 20aa8881dc98264e5875fa37fc2dbf18e3f2baac to glitch-soc
2022-11-06[Glitch] Fix wrong colors in the high-contrast themeEugen Rochko
Port 1c3192df6bf48eb4c3613f2a8744c809f6eeeec0 to glitch-soc Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2022-11-06[Glitch] Change design of link footerEugen Rochko
Port 2d9a85db6efe0c9ccfda1420551ce3d6025bc27e to glitch-soc Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2022-11-06[Glitch] Fix missing interpolation of domain in disabled account banner in ↵Eugen Rochko
web UI Port a442f481f850d857544eafdd0725142ed8656552 to glitch-soc Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2022-11-06[Glitch] Change sign-in banner to reflect disabled or moved account statusClaire
Port 312d616371096235f1f317041300b8220c447613 to glitch-soc Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2022-11-06[Glitch] Fix showing profile's featured tags on individual statusesEugen Rochko
Port bfafb114a2135b1f21ba7e6d54ee13e8da75b629 to glitch-soc Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2022-11-06[Glitch] Fix handling of duplicate and out-of-order notifications in WebUIClaire
Port 7c8e2b9859f2e206110accb74d19ec4591d79780 to glitch-soc Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2022-11-06Update SECURITY.md (#19869)Yamagishi Kazutoshi
2022-11-06[Glitch] Add assets from Twemoji 14.0Eugen Rochko
Port e02812d5b63b4909fff9c0c7246e80745c4c703e to glitch-soc Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2022-11-06[Glitch] Fix JavaScript console warning when loading notificationsSunny Ripert
Port 887976814a2639a666896ae94b14c64e2834e26d to glitch-soc Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2022-11-06[Glitch] Fix JavaScript console error on upload editing statusSunny Ripert
Port c95d9aab56dcde8c183f15d565cd1e8746d42c48 to glitch-soc Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2022-11-06[Glitch] Fix limited account hint referencing "your" server when logged outEugen Rochko
Port 139ea4c981f563e51d80ec3ec407d6265e29cb70 to glitch-soc Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2022-11-06[Glitch] Fix being unable to withdraw follow request when confirmation modal ↵Claire
is disabled (#19687) Port cbb440bbc2de7c805f687c886b32ab7dbafde07f to glitch-soc Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2022-11-06[Glitch] Fix edits not being immediately reflectedClaire
Port 74d40c7d8fac3ccc263af29c622f4481e18e8c59 to glitch-soc Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2022-11-06Merge branch 'main' into glitch-soc/merge-upstreamClaire
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-06Bump version to 4.0.0rc2 (#19831)Eugen Rochko
2022-11-06Fix not using GIN index for account search queries (#19830)Eugen Rochko
2022-11-05Update changelog for 4.0.0rc1 (#19814)Eugen Rochko
2022-11-05Change design of new list form in web UI (#19801)Eugen Rochko
2022-11-05version emoji-mart (#19715)Justin Thomas
* version emoji-mart * add lock file
2022-11-05Fix missing string in admin UI (#19809)Eugen Rochko
2022-11-05Heroku fix (#19807)Hayden
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-05Change `AUTHORIZED_FETCH` to not block unauthenticated REST API access (#19803)Eugen Rochko
New environment variable `DISALLOW_UNAUTHENTICATED_API_ACCESS`
2022-11-05Fix indexing scheduler trying to index when Elasticsearch is disabled (#19805)Eugen Rochko
Fix #19646
2022-11-05Fix n+1 queries when rendering initial state JSON (#19795)Eugen Rochko
2022-11-05helm: Add documentation to run tootctl commands (#19791)Moritz Hedtke
2022-11-05Fix rendering empty avatar in web UI (#19798)Eugen Rochko
2022-11-05Fix missing interpolation of domain in disabled account banner in web UI ↵Eugen Rochko
(#19788)
2022-11-05Change design of moved account banner in web UI (#19790)Eugen Rochko
2022-11-05Remove word-break:keep-all from Dismissable banner message (#19799)eai04191
2022-11-05Change sign-in banner to reflect disabled or moved account status (#19773)Claire
2022-11-05Add S3 existing secret to sidekiq (#19778)Alex Nordlund
2022-11-05Remove broken link references to bug bounty program (#19779)Yarden Shoham
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>
generated by cgit-pink (git 2.37.1) at 2024-07-10 20:46:06 +0000