Thibaut Girka 444796b69b Merge branch 'master' into glitch-soc/merge-upstream ...

Conflicts:
- app/controllers/application_controller.rb
- app/controllers/auth/confirmations_controller.rb
- app/controllers/auth/sessions_controller.rb
- app/controllers/settings/deletes_controller.rb
- app/controllers/settings/two_factor_authentication/recovery_codes_controller.rb

2019-07-23 10:51:07 +02:00

..

v1

Merge branch 'master' into glitch-soc/merge-upstream

2019-07-23 10:51:07 +02:00

v2

Add type, limit, offset, min_id, max_id, account_id to search API (#10091)

2019-02-26 15:21:36 +01:00

web

Fix web push notifications for polls (#10864)

2019-05-28 00:26:08 +02:00

base_controller.rb

Change unconfirmed user login behaviour (#11375)

2019-07-22 10:48:50 +02:00

oembed_controller.rb

Update status embeds (#4742)

2017-08-30 10:23:43 +02:00

proofs_controller.rb

Refactor controllers for statuses, accounts, and more (#11249)

2019-07-08 12:03:45 +02:00