This repository has been archived on 2023-07-01. You can view files and clone it, but cannot push or open issues or pull requests.

Thibaut Girka a2a64ecd3e 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.		2019-01-10 21:00:30 +01:00
..
_detailed_status.html.haml	Merge branch 'master' into glitch-soc/merge-upstream	2019-01-10 21:00:30 +01:00
_og_description.html.haml	Add description meta tag additionally to og:description (#8941)	2018-10-10 02:21:30 +02:00
_og_image.html.haml	Add admin setting to enable OG previews for sensitive media (#7962)	2018-07-06 02:15:56 +02:00
_simple_status.html.haml	Merge branch 'master' into glitch-soc/merge-upstream	2019-01-10 21:00:30 +01:00
_status.html.haml	Revert Font Awesome 5 upgrade (#8810)	2018-09-28 02:11:14 +02:00
embed.html.haml	Add animate custom emoji param to embed pages (#8507)	2018-08-30 23:14:01 +02:00
show.html.haml	Fix og:url on toots' public view (#9047)	2018-10-21 22:52:10 +02:00