Commit Graph

16355 Commits (03f50f2f00a129da0cc021369b975ecfccf1327f)
 

Author SHA1 Message Date
Jeremy Kescher 03f50f2f00
Merge remote-tracking branch 'upstream/main' into develop
# Conflicts:
#	app/javascript/flavours/glitch/features/ui/components/link_footer.js
#	lib/mastodon/version.rb
#	public/avatars/original/missing.png
2 years ago
Claire 54101563bb
Merge pull request #1892 from ClearlyClaire/glitch-soc/merge-upstream
Merge upstream changes
2 years ago
Claire 21d6bc1689 Fix status cache hydration discrepancy 2 years ago
Claire 0be6da42d3 Change glitch-soc composer classes to match upstream 2 years ago
Eugen Rochko c199387558 [Glitch] Fix colors in light theme
Port 20aa8881dc to glitch-soc
2 years ago
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>
2 years ago
Eugen Rochko c883799a1f [Glitch] Change design of link footer
Port 2d9a85db6e to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2 years ago
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>
2 years ago
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>
2 years ago
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>
2 years ago
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>
2 years ago
Jeremy Kescher d869072fcd
change null check in dispute viewer to be unless 2 years ago
Jeremy Kescher 996267fc8b
Fix vanilla flavor being broken due to incorrect imports 2 years ago
Jeremy Kescher c2e83b1354
Add null check on application in dispute viewer 2 years ago
Eugen Rochko 01e0cb1cd5 [Glitch] Add assets from Twemoji 14.0
Port e02812d5b6 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2 years ago
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>
2 years ago
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>
2 years ago
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>
2 years ago
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>
2 years ago
Claire e42875d195 [Glitch] Fix edits not being immediately reflected
Port 74d40c7d8f to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2 years ago
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.
2 years ago
Eugen Rochko 5187e4e758
Bump version to 4.0.0rc2 (#19831) 2 years ago
Eugen Rochko 3151b260e2
Fix not using GIN index for account search queries (#19830) 2 years ago
Jeremy Kescher e326d44f29
Add missing require_auth? in StatusController 2 years ago
Jeremy Kescher 52f9449b3d
Update outdated link to source 2 years ago
Jeremy Kescher 9dafedaecd
Remove misc duplicate declarations 2 years ago
Jeremy Kescher 5ab1ac972b
Show about tab if explore tab wouldn't show any statuses 2 years ago
Jeremy Kescher b0be4764b4
Keep showing explore tab, only statuses are hidden 2 years ago
Jeremy Kescher 7e0108bccd
Fix wrong "only" target in previous commit 2 years ago
Jeremy Kescher da8c3bed5c
Don't show trending statuses in public web UI 2 years ago
Jeremy Kescher 41f1a81ab7
Change AUTHORIZED_FETCH to not block unauthenticated REST API access
Port of vanilla commit: https://github.com/mastodon/mastodon/pull/19803
2 years ago
Eugen Rochko 58fc889c6f
Update changelog for 4.0.0rc1 (#19814) 2 years ago
Eugen Rochko ca8d52c2a4
Change design of new list form in web UI (#19801) 2 years ago
Justin Thomas 18ac5f1cc8
version emoji-mart (#19715)
* version emoji-mart

* add lock file
2 years ago
Eugen Rochko b5b1a202cc
Fix missing string in admin UI (#19809) 2 years ago
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
2 years ago
Eugen Rochko 3a41fccc43
Change `AUTHORIZED_FETCH` to not block unauthenticated REST API access (#19803)
New environment variable `DISALLOW_UNAUTHENTICATED_API_ACCESS`
2 years ago
Eugen Rochko d0c9ac3919
Fix indexing scheduler trying to index when Elasticsearch is disabled (#19805)
Fix #19646
2 years ago
Eugen Rochko d54e7ee61e
Fix n+1 queries when rendering initial state JSON (#19795) 2 years ago
Moritz Hedtke c64be9758f
helm: Add documentation to run tootctl commands (#19791) 2 years ago
Eugen Rochko d1de7fb7fa
Fix rendering empty avatar in web UI (#19798) 2 years ago
Eugen Rochko a442f481f8
Fix missing interpolation of domain in disabled account banner in web UI (#19788) 2 years ago
Eugen Rochko 7c65f52692
Change design of moved account banner in web UI (#19790) 2 years ago
eai04191 30e786225e
Remove word-break:keep-all from Dismissable banner message (#19799) 2 years ago
Claire 312d616371
Change sign-in banner to reflect disabled or moved account status (#19773) 2 years ago
Alex Nordlund 0498b106c9
Add S3 existing secret to sidekiq (#19778) 2 years ago
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>
2 years ago
Sunny Ripert 887976814a
Fix JavaScript console warning when loading notifications (#19772) 2 years ago
Sunny Ripert c95d9aab56
Fix JavaScript console error on upload editing status (#19769) 2 years ago
Claire 9616f5bb22
Fix compose form submission reloading web interface (#19762)
* Fix compose form submission reloading web interface

Fix regression introduced by #19742

* Fix various compose form buttons being handled like submit buttons

* Fix coding style issue

* Fix missing onClick prop check
2 years ago