Baptiste Lemoine aff743695a Merge branch 'master' of https://github.com/tootsuite/mastodon ... # Conflicts: # app/javascript/mastodon/components/status_action_bar.js # app/javascript/mastodon/features/account/components/header.js # config/webpack/production.js # db/schema.rb # yarn.lock		2020-09-21 14:36:15 +02:00
..
controllers	Merge branch 'master' of https://github.com/tootsuite/mastodon	2020-09-21 14:36:15 +02:00
fabricators	Merge branch 'master' of https://github.com/tootsuite/mastodon	2020-09-21 14:36:15 +02:00
features	Add submit button to the top of preferences pages (#13068)	2020-03-08 16:04:03 +01:00
fixtures	Add noopener and/or noreferrer (#12202)	2019-10-24 22:44:42 +02:00
helpers	🐛 add icons in dropdown menu, fix style for this dropdown	2020-04-09 17:33:58 +02:00
lib	Refactor feed manager (#14761)	2020-09-08 03:41:16 +02: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	2020-09-21 14:36:15 +02:00
policies	Change admin UI for hashtags and add back whitelisted trends (#11490)	2019-08-05 19:54:29 +02: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	Add option to be notified when a followed user posts (#13546)	2020-09-18 17:26:45 +02: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	Add option to be notified when a followed user posts (#13546)	2020-09-18 17:26:45 +02: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