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 91bef4759f Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: Vagrantfile app/javascript/packs/public.js app/views/admin/settings/edit.html.haml app/views/settings/preferences/show.html.haml app/views/settings/profiles/show.html.haml config/locales/es.yml config/locales/simple_form.en.yml config/webpack/configuration.js config/webpack/loaders/babel.js package.json yarn.lock Split new additions to app/javascript/packs/public.js to app/javascript/core/settings.js		6 years ago
..
about	Merge branch 'master' into glitch-soc/merge-upstream	6 years ago
accounts	Redesign forms, verify link ownership with rel="me" (#8703)	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	Add separate setting for sidebar text (site_short_description) (#8107)	6 years ago
auth	Redesign forms, verify link ownership with rel="me" (#8703)	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	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 remote-tracking branch 'origin/master' into gs-master	7 years ago
invites	Redesign forms, verify link ownership with rel="me" (#8703)	6 years ago
kaminari	Pagination improvements (#1445)	8 years ago
layouts	Merge branch 'master' into glitch-soc/merge-upstream	6 years ago
media	Save video metadata and improve video OpenGraph tags (#6481)	7 years ago
notification_mailer	Display content warning in mail notification emails (#6832)	7 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	7 years ago
user_mailer	Fix e-mail changed notification (fixes #6778) (#6835)	7 years ago
well_known	Add remote interaction dialog for toots (#8202)	6 years ago