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		2019-07-19 18:26:49 +02:00
..
actions	Add option to disable real-time updates in web UI (#9984)	2019-07-16 16:11:50 +02:00
components	Change single-column mode to scroll the whole page (#11359)	2019-07-19 09:25:22 +02:00
containers	Change single-column mode to scroll the whole page (#11359)	2019-07-19 09:25:22 +02:00
features	Merge branch 'master' into glitch-soc/merge-upstream	2019-07-19 18:26:49 +02:00
locales	Merge branch 'master' into glitch-soc/merge-upstream	2019-07-19 18:26:49 +02:00
middleware	Add missing rejection handling for Promises (#7008)	2018-04-02 14:51:02 +02:00
reducers	Add option to disable real-time updates in web UI (#9984)	2019-07-16 16:11:50 +02:00
selectors	Optimize makeGetStatus (#11211)	2019-06-30 00:12:38 +02:00
service_worker	Support pushing and receiving updates to poll tallies (#10209)	2019-03-11 00:49:31 +01:00
storage	Cache media only when storage can be freed (#7547)	2018-05-19 19:22:11 +02:00
store	Update dependencies for Node.js (2018-12-31) (#9669)	2018-12-31 18:11:48 +01:00
utils	Add WebP support (#9879)	2019-02-02 12:25:04 +01:00
api.js	Do not set CSRF Token when no csrf header (#10383)	2019-03-26 11:13:20 +01:00
base_polyfills.js	Refactor resizeImage method (#7236)	2018-04-23 09:15:51 +02:00
common.js	Improve the public hashtag page (#9831)	2019-01-17 14:06:08 +01:00
compare_id.js	Add option to disable real-time updates in web UI (#9984)	2019-07-16 16:11:50 +02:00
extra_polyfills.js	…
initial_state.js	Add option to disable real-time updates in web UI (#9984)	2019-07-16 16:11:50 +02:00
is_mobile.js	…
load_polyfills.js	Refactor resizeImage method (#7236)	2018-04-23 09:15:51 +02:00
main.js	…
performance.js	…
ready.js	…
rtl.js	…
scroll.js	Use ScrollToOptions for smooth scrolling if supported (#11207)	2019-06-29 18:32:06 +02:00
settings.js	Implement tag auto-completion by history (#6621)	2018-03-04 20:27:25 +01:00
stream.js	Improve streaming server security (#10818)	2019-05-24 15:21:42 +02:00
test_setup.js	…
uuid.js	…