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 d392020da6 Merge branch 'master' into glitch-soc/tentative-merge ... Conflicts: README.md app/controllers/statuses_controller.rb app/lib/feed_manager.rb config/navigation.rb spec/lib/feed_manager_spec.rb Conflicts were resolved by taking both versions for each change. This means the two filter systems (glitch-soc's keyword mutes and tootsuite's custom filters) are in place, which will be changed in a follow-up commit.		7 years ago
..
_content_spoiler.html.haml	Merge upstream!! #64 <3 <3	8 years ago
_detailed_status.html.haml	Add follow button to detailed status, add gradient to mask bio cut-off (#7979)	7 years ago
_media.html.haml	Images now behind CWs on static pages	8 years ago
_more.html.haml	Paginate descendant statuses in public page (#7148)	7 years ago
_og_description.html.haml	Revert #6479, hide sensitive text/images from OpenGraph previews (#6818)	7 years ago
_og_image.html.haml	Add admin setting to enable OG previews for sensitive media (#7962)	7 years ago
_simple_status.html.haml	Merge branch 'master' into glitch-soc/tentative-merge	7 years ago
_status.html.haml	Enable custom emojis in profiles (notes, field values, display names) (#7374)	7 years ago
embed.html.haml	Update status embeds (#4742)	7 years ago
show.html.haml	Revert #6479, hide sensitive text/images from OpenGraph previews (#6818)	7 years ago