tykayn d96d645e0f Merge branch 'master' of https://github.com/tootsuite/mastodon ... Signed-off-by: Baptiste Lemoine <contact@cipherbliss.com> # Conflicts: # yarn.lock		2021-01-13 14:45:58 +01:00
..
controllers	Merge branch 'master' of https://github.com/tootsuite/mastodon	2021-01-13 14:45:58 +01:00
fabricators	merge master	2020-11-01 09:55:09 +01:00
features	Add submit button to the top of preferences pages (#13068)	2020-03-08 16:04:03 +01:00
fixtures	Add import/export feature for bookmarks (#14956)	2020-11-19 17:48:13 +01:00
helpers	Merge branch 'master' of https://github.com/tootsuite/mastodon 24 dec 2020	2020-12-24 16:38:36 +01:00
lib	rename replies_policy enumerables (#15304)	2020-12-09 04:34:17 +01:00
mailers	refactor: add email previews for WebAuthn emails (#14658)	2020-08-25 01:21:11 +02:00
models	Merge branch 'master' of https://github.com/tootsuite/mastodon	2021-01-13 14:45:58 +01:00
policies	Add support for reversible suspensions through ActivityPub (#14989)	2020-11-08 00:28:39 +01:00
presenters	Admission-based registrations mode (#10250)	2019-03-14 05:28:30 +01:00
requests	⚡ merge with gh master	2019-12-02 16:35:37 +01:00
routing	prototype for groups	2019-08-27 17:05:17 +02:00
serializers/activitypub	Fix account URI in UpdatePollSerializer (#11194)	2019-06-27 19:41:55 +02:00
services	Improve account deletion performances further (#15407)	2020-12-22 23:57:46 +01:00
support	Fix base64-encoded file uploads not being possible (#12748)	2020-01-04 01:54:07 +01:00
validators	Improve email address validation (#14565)	2020-08-12 12:40:25 +02:00
views	prototype for groups	2019-08-27 17:05:17 +02:00
workers	Fix being able to import more than allowed number of follows (#15384)	2020-12-26 23:52:46 +01:00
rails_helper.rb	Add WebAuthn as an alternative 2FA method (#14466)	2020-08-24 16:46:27 +02:00
spec_helper.rb	Move rspec examples to tmp dir (#12539)	2019-12-02 19:55:08 +01:00