Thibaut Girka 04534604c6 Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: - app/models/user.rb - app/serializers/initial_state_serializer.rb - app/views/admin/dashboard/index.html.haml - config/locales/simple_form.en.yml		2019-08-07 13:56:48 +02:00
..
actions	Add trends UI with admin and user settings (#11502)	2019-08-06 17:57:52 +02:00
components	Fix non-lowercase hashtags not being picked up by the streaming API (#11508)	2019-08-07 10:01:19 +02:00
containers	Improve dropdown menu keyboard navigation (#11491)	2019-08-06 11:59:46 +02:00
features	Merge branch 'master' into glitch-soc/merge-upstream	2019-08-07 13:56:48 +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 trends UI with admin and user settings (#11502)	2019-08-06 17:57:52 +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	Revert "Change links in webUI to rewrite misleading links (#11426)" (#11500)	2019-08-06 12:09:28 +02: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	Restore vanilla components	2017-11-17 19:29:16 -08:00
initial_state.js	Merge branch 'master' into glitch-soc/merge-upstream	2019-08-07 13:56:48 +02:00
is_mobile.js	Restore vanilla components	2017-11-17 19:29:16 -08:00
load_polyfills.js	Refactor resizeImage method (#7236)	2018-04-23 09:15:51 +02:00
main.js	bug fix (WebPush does not work) (#6120)	2017-12-28 16:20:34 +01:00
performance.js	Restore vanilla components	2017-11-17 19:29:16 -08:00
ready.js	Restore vanilla components	2017-11-17 19:29:16 -08:00
rtl.js	Restore vanilla components	2017-11-17 19:29:16 -08:00
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	Restore vanilla components	2017-11-17 19:29:16 -08:00
uuid.js	Restore vanilla components	2017-11-17 19:29:16 -08:00