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
..
activitypub	…
admin	Allow to show a specific status in the admin interface	6 years ago
api	Merge branch 'master' into glitch-soc/merge-upstream	6 years ago
auth	Merge branch 'master' into glitch-soc/merge-upstream	6 years ago
concerns	Redesign public profiles and toots (#8068)	7 years ago
oauth	Merge branch 'master' into glitch-soc/merge-upstream	6 years ago
settings	Merge branch 'master' into glitch-soc/merge-upstream	6 years ago
well_known	…
about_controller.rb	Merge branch 'master' into glitch-soc/merge-upstream	6 years ago
account_follow_controller.rb	…
account_unfollow_controller.rb	…
accounts_controller.rb	Merge branch 'master' into glitch-soc/master	6 years ago
application_controller.rb	Merge branch 'master' into glitch-soc/merge-upstream	6 years ago
authorize_interactions_controller.rb	Merge branch 'master' into glitch-soc/merge-upstream	6 years ago
custom_css_controller.rb	Add admin custom CSS setting (#8399)	6 years ago
emojis_controller.rb	Unuse ActiveRecord::Base#cache_key (#8185)	6 years ago
filters_controller.rb	Merge branch 'master' into glitch-soc/merge-upstream	7 years ago
follower_accounts_controller.rb	…
following_accounts_controller.rb	…
home_controller.rb	Merge branch 'master' into glitch-soc/merge-upstream	6 years ago
intents_controller.rb	Add remote interaction dialog for toots (#8202)	6 years ago
invites_controller.rb	Merge branch 'master' into glitch-soc/merge-upstream	6 years ago
manifests_controller.rb	…
media_controller.rb	…
media_proxy_controller.rb	…
remote_follow_controller.rb	Merge branch 'master' into glitch-soc/merge-upstream	6 years ago
remote_interaction_controller.rb	Merge branch 'master' into glitch-soc/merge-upstream	6 years ago
remote_unfollows_controller.rb	Add tests for remote_unfollows_controller (#7879)	7 years ago
shares_controller.rb	…
statuses_controller.rb	Merge branch 'master' into glitch-soc/merge-upstream	6 years ago
stream_entries_controller.rb	…
tags_controller.rb	Merge branch 'master' into glitch-soc/merge-upstream	6 years ago