Thibaut Girka 20d01a954e Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: - app/controllers/settings/preferences_controller.rb - app/lib/user_settings_decorator.rb - app/models/user.rb Conflicts due to the addition of a new preference upstream, “advanced layout”.		2019-05-26 15:41:40 +02:00
..
about	Merge branch 'master' into glitch-soc/merge-upstream	2019-04-10 09:16:08 +02:00
accounts	Merge branch 'master' into glitch-soc/merge-upstream	2019-04-22 20:40:04 +02:00
admin	Merge branch 'master' into glitch-soc/merge-upstream	2019-05-15 17:11:40 +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
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	Load custom CSS rules after standard ones	2019-04-22 23:07:27 +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
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-05-26 15:41:40 +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-05-19 17:46:31 +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