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 249991c498 Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: - Gemfile.lock - app/controllers/accounts_controller.rb - app/controllers/admin/dashboard_controller.rb - app/controllers/follower_accounts_controller.rb - app/controllers/following_accounts_controller.rb - app/controllers/remote_follow_controller.rb - app/controllers/stream_entries_controller.rb - app/controllers/tags_controller.rb - app/javascript/packs/public.js - app/lib/sanitize_config.rb - app/models/account.rb - app/models/form/admin_settings.rb - app/models/media_attachment.rb - app/models/stream_entry.rb - app/models/user.rb - app/serializers/initial_state_serializer.rb - app/services/batched_remove_status_service.rb - app/services/post_status_service.rb - app/services/process_mentions_service.rb - app/services/reblog_service.rb - app/services/remove_status_service.rb - app/views/admin/settings/edit.html.haml - config/locales/simple_form.pl.yml - config/settings.yml - docker-compose.yml		5 years ago
..
actions	Add option to disable real-time updates in web UI (#9984)	5 years ago
components	Change single-column mode to scroll the whole page (#11359)	5 years ago
containers	Change single-column mode to scroll the whole page (#11359)	5 years ago
features	Merge branch 'master' into glitch-soc/merge-upstream	5 years ago
locales	Merge branch 'master' into glitch-soc/merge-upstream	5 years ago
middleware	…
reducers	Add option to disable real-time updates in web UI (#9984)	5 years ago
selectors	Optimize makeGetStatus (#11211)	5 years ago
service_worker	…
storage	…
store	…
utils	…
api.js	…
base_polyfills.js	…
common.js	…
compare_id.js	Add option to disable real-time updates in web UI (#9984)	5 years ago
extra_polyfills.js	…
initial_state.js	Add option to disable real-time updates in web UI (#9984)	5 years ago
is_mobile.js	…
load_polyfills.js	…
main.js	…
performance.js	…
ready.js	…
rtl.js	…
scroll.js	Use ScrollToOptions for smooth scrolling if supported (#11207)	5 years ago
settings.js	…
stream.js	…
test_setup.js	…
uuid.js	…