Thibaut Girka 65e994b29b Merge branch 'master' into glitch-soc/merge-upstream ...

Conflicts:
- app/controllers/directories_controller.rb
- app/controllers/settings/applications_controller.rb
- app/controllers/settings/base_controller.rb
- app/controllers/settings/deletes_controller.rb
- app/controllers/settings/exports_controller.rb
- app/controllers/settings/follower_domains_controller.rb
- app/controllers/settings/imports_controller.rb
- app/controllers/settings/migrations_controller.rb
- app/controllers/settings/notifications_controller.rb
- app/controllers/settings/preferences_controller.rb
- app/controllers/settings/sessions_controller.rb
- app/controllers/settings/two_factor_authentication/confirmations_controller.rb
- app/controllers/settings/two_factor_authentication/recovery_codes_controller.rb
- app/controllers/settings/two_factor_authentications_controller.rb

Conflicts were due to some refactoring already made in glitch-soc
when introducing flavours.

2018-12-15 10:45:53 +01:00

..

about

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

2018-10-08 13:51:33 +02:00

accounts

Make avatar and headers respect auto_play_gif (#9515)

2018-12-14 20:34:18 +01:00

admin

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

2018-12-15 10:45:53 +01:00

admin_mailer

Show remote reports in admin UI as coming from domain rather than user (#7347)

2018-05-04 13:26:25 +02:00

application

Escape HTML in profile name preview in profile settings (#9446)

2018-12-07 16:42:22 +01:00

auth

Change the password form order (#9267)

2018-11-16 11:18:43 +01:00

authorize_interactions

Add remote interaction dialog for toots (#8202)

2018-08-18 03:03:12 +02:00

directories

Cache hashtag sample accounts, and exclude ineligible ones (#9465)

2018-12-08 01:32:26 +01:00

errors

New error page graphic. Other error page improvements (#5099)

2017-09-25 23:05:54 +02:00

filters

Redesign forms, verify link ownership with rel="me" (#8703)

2018-09-18 16:45:58 +02:00

follower_accounts

Redesign public profiles and toots (#8068)

2018-07-28 19:25:33 +02:00

following_accounts

Redesign public profiles and toots (#8068)

2018-07-28 19:25:33 +02:00

home

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

2018-10-07 19:47:56 +02:00

invites

Redesign forms, verify link ownership with rel="me" (#8703)

2018-09-18 16:45:58 +02:00

kaminari

Pagination improvements (#1445)

2017-04-11 01:11:41 +02:00

layouts

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

2018-12-15 10:45:53 +01:00

media

Save video metadata and improve video OpenGraph tags (#6481)

2018-02-16 07:22:20 +01:00

notification_mailer

Display content warning in mail notification emails (#6832)

2018-03-19 20:12:20 +01:00

oauth

Oauth code in input form and add description message (#4986)

2017-09-17 15:23:44 +02:00

remote_follow

Redesign public profiles and toots (#8068)

2018-07-28 19:25:33 +02:00

remote_interaction

Add remote interaction dialog for toots (#8202)

2018-08-18 03:03:12 +02:00

remote_unfollows

Redesign public profiles and toots (#8068)

2018-07-28 19:25:33 +02:00

settings

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

2018-12-15 10:45:53 +01:00

shared

Fix form validation flash message color and input borders (#9235)

2018-11-08 21:06:14 +01:00

shares

Finalized theme loading and stuff

2017-11-20 22:13:37 -08:00

stream_entries

Display a double reply arrow on public pages for toots that are replies

2018-11-30 22:09:52 +01:00

tags

Merge branch 'master' into glitch-soc/merge

2018-05-11 18:12:42 +02:00

user_mailer

Fix e-mail changed notification (fixes #6778) (#6835)

2018-03-19 20:07:47 +01:00

well_known

Add remote interaction dialog for toots (#8202)

2018-08-18 03:03:12 +02:00