You can not select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.

Thibaut Girka 36393e1d2b Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: app/views/layouts/application.html.haml Edited: app/helpers/application_helper.rb app/views/admin/domain_blocks/new.html.haml Conflict wasn't really one, just two changes too close to one another. Edition was to adapt the class names for themes to class names for skins and flavours. Also edited app/views/admin/domain_blocks/new.html.haml to strip the duplicate admin pack inclusion thing.		6 years ago
..
about	Merge branch 'master' into glitch-soc/merge-upstream	6 years ago
accounts	Show exact number of followers/statuses on export page/in tooltip (#8199)	6 years ago
admin	Merge branch 'master' into glitch-soc/merge-upstream	6 years ago
admin_mailer	Show remote reports in admin UI as coming from domain rather than user (#7347)	6 years ago
application	Add separate setting for sidebar text (site_short_description) (#8107)	6 years ago
auth	When registrations closed, link "Sign up" to joinmastodon.org (#8395)	6 years ago
authorize_interactions	Add remote interaction dialog for toots (#8202)	6 years ago
errors	New error page graphic. Other error page improvements (#5099)	7 years ago
filters	Add option to not consider word boundaries when processing keyword filtering (#7975)	6 years ago
follower_accounts	Redesign public profiles and toots (#8068)	6 years ago
following_accounts	Redesign public profiles and toots (#8068)	6 years ago
home	Merge remote-tracking branch 'origin/master' into gs-master	6 years ago
invites	Add autofollow option to invites (#7805)	6 years ago
kaminari	…
layouts	Merge branch 'master' into glitch-soc/merge-upstream	6 years ago
media	Save video metadata and improve video OpenGraph tags (#6481)	6 years ago
notification_mailer	Display content warning in mail notification emails (#6832)	6 years ago
oauth	Oauth code in input form and add description message (#4986)	7 years ago
remote_follow	Redesign public profiles and toots (#8068)	6 years ago
remote_interaction	Add remote interaction dialog for toots (#8202)	6 years ago
remote_unfollows	Redesign public profiles and toots (#8068)	6 years ago
settings	Merge branch 'master' into glitch-soc/merge-upstream	6 years ago
shared	Add separate setting for sidebar text (site_short_description) (#8107)	6 years ago
shares	Finalized theme loading and stuff	7 years ago
stream_entries	Merge branch 'master' into glitch-soc/merge-upstream	6 years ago
tags	Merge branch 'master' into glitch-soc/merge	6 years ago
user_mailer	Fix e-mail changed notification (fixes #6778) (#6835)	6 years ago
well_known	Add remote interaction dialog for toots (#8202)	6 years ago