mastodon

mirror of https://framagit.org/tykayn/mastodon.git synced 2023-08-25 08:33:12 +02:00

History

Thibaut Girka 9748f074a3 Merge branch 'master' into glitch-soc/merge-upstream

Conflicts:
- app/controllers/api/v1/timelines/public_controller.rb
- app/lib/feed_manager.rb
- app/models/status.rb
- app/services/precompute_feed_service.rb
- app/workers/feed_insert_worker.rb
- spec/models/status_spec.rb

All conflicts are due to upstream refactoring feed management and us having
local-only toots on top of that. Rewrote local-only toots management for
upstream's changes.

2020-09-08 16:26:47 +02:00

aliases

Fix account aliases page (#13452 )

2020-04-13 06:41:43 +02:00

applications

Various fixes and improvements (#12878 )

2020-01-20 15:55:03 +01:00

deletes

Fix 2FA challenge and password challenge for non-database users (#11831 )

2019-09-15 21:08:39 +02:00

exports

Use different strings on exports page (#12569 )