Thibaut Girka 369a475a70 Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: - app/serializers/rest/instance_serializer.rb - app/views/layouts/error.html.haml - public/oops.png Took our version (same as upstream but without the things that only make sense in an animation). Additional changes: - app/javascript/flavours/vanilla/theme.yml Include upstream's javascript in error pages.		2019-02-17 12:26:55 +01:00
..
actions	Allow multiple files upload through web UI, including drag & drop (#9856)	2019-02-02 20:22:05 +01:00
components	Change buttons on timeline preview to open the interaction dialog (#10054)	2019-02-15 19:43:09 +01:00
containers	Fix not showing custom emojis in share page emoji picker (#9970)	2019-02-04 23:14:57 +01:00
features	Merge branch 'master' into glitch-soc/merge-upstream	2019-02-17 12:26:55 +01:00
locales	Merge branch 'master' into glitch-soc/merge-upstream	2019-02-12 20:32:48 +01:00
middleware	Add missing rejection handling for Promises (#7008)	2018-04-02 14:51:02 +02:00
reducers	Add list title editing (#9748)	2019-02-13 18:52:02 +01:00
selectors	Don't filter own toots (fixes #8289) (#8298)	2018-08-19 18:44:18 +02:00
service_worker	Hide CWed content in notifications and fix sensitive images without CWs (#9778)	2019-01-11 07:29:17 +00: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	Update dependencies for Node.js (2018-12-31) (#9669)	2018-12-31 18:11:48 +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	Fix comparing id (#7180)	2018-04-18 16:50:19 +02:00
extra_polyfills.js	…
initial_state.js	Merge branch 'master' into glitch-soc/merge-upstream	2019-01-10 21:00:30 +01: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	…
settings.js	Implement tag auto-completion by history (#6621)	2018-03-04 20:27:25 +01:00
stream.js	Use randomized setTimeout when fallback-polling and re-add since_id (#7522)	2018-05-18 02:32:35 +02:00
test_setup.js	…
uuid.js	…