Thibaut Girka 1b0ff4cd69 Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: - app/controllers/settings/notifications_controller.rb - app/javascript/packs/public.js - app/views/settings/preferences/show.html.haml - app/views/stream_entries/_simple_status.html.haml - config/locales/simple_form.en.yml - config/locales/simple_form.pl.yml - config/navigation.rb - config/routes.rb		2019-06-10 18:59:53 +02:00
..
about	Merge branch 'master' into glitch-soc/merge-upstream	2019-06-10 18:59:53 +02:00
accounts	Merge branch 'master' into glitch-soc/merge-upstream	2019-06-10 18:59:53 +02:00
admin	Merge branch 'master' into glitch-soc/merge-upstream	2019-06-07 17:00:36 +02:00
admin_mailer	Add invite request to pending account notification e-mail (#10528)	2019-04-10 00:36:01 +02:00
application	Bump webpacker from 3.5.5 to 4.0.2 (#10277)	2019-03-15 15:05:31 +01:00
auth	Fix sign up button not saying sign up when invite is used (#10623)	2019-04-23 04:39:21 +02:00
authorize_interactions
directories	Merge branch 'master' into glitch-soc/merge-upstream	2019-01-19 18:28:37 +01:00
errors
filters
follower_accounts	Improve blocked view of profiles (#10491)	2019-04-07 04:59:13 +02:00
following_accounts	Improve blocked view of profiles (#10491)	2019-04-07 04:59:13 +02:00
home	Merge branch 'master' into glitch-soc/merge-upstream	2019-03-16 14:14:20 +01:00
invites	Fix maxed-out invites not showing up as expired in UI (#10274)	2019-03-15 05:35:17 +01:00
kaminari
layouts	Merge branch 'master' into glitch-soc/merge-upstream	2019-06-10 18:59:53 +02:00
media
notification_mailer	Bump webpacker from 3.5.5 to 4.0.2 (#10277)	2019-03-15 15:05:31 +01:00
oauth	Oauth code in input form and add description message (#4986)	2017-09-17 15:23:44 +02:00
public_timelines	[Glitch] Redesign landing page	2019-03-13 15:53:00 +01:00
relationships	Merge branch 'master' into glitch-soc/merge-upstream	2019-03-28 13:01:33 +01:00
remote_follow	Admission-based registrations mode (#10250)	2019-03-14 05:28:30 +01:00
remote_interaction	Admission-based registrations mode (#10250)	2019-03-14 05:28:30 +01:00
remote_unfollows
settings	Merge branch 'master' into glitch-soc/merge-upstream	2019-06-10 18:59:53 +02:00
shared	Bump webpacker from 3.5.5 to 4.0.2 (#10277)	2019-03-15 15:05:31 +01:00
shares
stream_entries	Merge branch 'master' into glitch-soc/merge-upstream	2019-06-10 18:59:53 +02:00
tags	Merge branch 'master' into glitch-soc/merge-upstream	2019-03-13 15:16:02 +01:00
user_mailer	Bump webpacker from 3.5.5 to 4.0.2 (#10277)	2019-03-15 15:05:31 +01:00
well_known