Thibaut Girka ab5ff638f2 Merge branch 'master' into glitch-soc/master ... Conflicts: - `config/locales/en.yml` No real conflict, upstream added a translatable string “too close” to one specific to glitch-soc - `lib/mastodon/statuses_cli.rb` Fixes made upstream, while changed in glitch-soc to keep bookmarked statuses - `package.json` No real conflict, additional dependency in glitch-soc		2019-12-19 13:52:54 +01:00
..
actions	Add follow_request notification type (#12198)	2019-12-01 17:25:29 +01:00
components	Fix media open hotkey (#12546)	2019-12-05 00:50:51 +01:00
containers	Fix account dropdown not opening due to regression from #12377 (#12430)	2019-11-20 00:56:22 +01:00
features	Merge branch 'master' into glitch-soc/master	2019-12-19 13:52:54 +01:00
locales	Merge branch 'master' into glitch-soc/merge-upstream	2019-12-07 12:28:59 +01:00
middleware	…
reducers	Add follow_request notification type (#12198)	2019-12-01 17:25:29 +01:00
selectors	Add special alert for throttled requests (#11677)	2019-08-27 16:50:39 +02:00
service_worker	Add follow_request notification type (#12198)	2019-12-01 17:25:29 +01:00
storage	…
store	Update dependencies for Node.js (2018-12-31) (#9669)	2018-12-31 18:11:48 +01:00
utils	Do not add margin light when opening modal on mobile (#11830)	2019-09-29 14:30:58 +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	…
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	fix multiple space (#12655)	2019-12-19 07:39:08 +09:00
initial_state.js	Merge branch 'master' into glitch-soc/merge-upstream	2019-10-27 12:14:01 +01:00
is_mobile.js	…
load_keyboard_extensions.js	fix: support KaiOS arrow navigation on public pages (#12251)	2019-11-04 13:03:09 +01:00
load_polyfills.js	…
main.js	…
performance.js	…
ready.js	…
rtl.js	Exclude URLs from text analysis (#11759)	2019-09-04 22:30:49 +02:00
scroll.js	Use ScrollToOptions for smooth scrolling if supported (#11207)	2019-06-29 18:32:06 +02:00
settings.js	…
stream.js	upgrade/replace websocket.js to @gamestdio/websocket v2 (#12543)	2019-12-04 20:45:49 +09:00
test_setup.js	…
uuid.js	…