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 a78447a6a4 Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: - .eslintrc.yml Removed, as upstream removed it. - app/controllers/admin/statuses_controller.rb Minor code cleanup when porting one of our features. - app/models/account.rb Note length validation has changed upstream. We now use upstream's validation (dropped legacy glitch-soc account metadata stuff) but with configurable limit. - app/services/post_status_service.rb Upstream has added support for scheduled toots, refactoring the code a bit. Adapted our changes to this refactoring. - app/views/stream_entries/_detailed_status.html.haml Not a real conflict, changes too close. - app/views/stream_entries/_simple_status.html.haml Not a real conflict, changes too close.		6 years ago
..
about	Merge branch 'master' into glitch-soc/merge-upstream	6 years ago
accounts	Rename hide_followers_count helper to hide_followers_count?	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)	7 years ago
application	Escape HTML in profile name preview in profile settings (#9446)	6 years ago
auth	Change the password form order (#9267)	6 years ago
authorize_interactions	Add remote interaction dialog for toots (#8202)	6 years ago
directories	Rename hide_followers_count helper to hide_followers_count?	6 years ago
errors	New error page graphic. Other error page improvements (#5099)	7 years ago
filters	Redesign forms, verify link ownership with rel="me" (#8703)	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 branch 'master' into glitch-soc/merge-upstream	6 years ago
invites	Redesign forms, verify link ownership with rel="me" (#8703)	6 years ago
kaminari	Pagination improvements (#1445)	8 years ago
layouts	Restore oops.gif animation for user who have auto_play_gif set	6 years ago
media	Save video metadata and improve video OpenGraph tags (#6481)	7 years ago
notification_mailer	Improve e-mail digest (#9689)	6 years ago
oauth	Oauth code in input form and add description message (#4986)	7 years ago
remote_follow	Change remote interaction dialog to use specific actions (#9743)	6 years ago
remote_interaction	Change remote interaction dialog to use specific actions (#9743)	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	Fix form validation flash message color and input borders (#9235)	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	7 years ago
user_mailer	Add REST API for creating an account (#9572)	6 years ago
well_known	Add remote interaction dialog for toots (#8202)	6 years ago