mastodon/app/javascript/mastodon
Thibaut Girka 356e9150df Merge branch 'master' into glitch-soc/merge-upstream
Conflicts:
- app/lib/sanitize_config.rb
  Keep our version, we support the tags upstream transforms.
- package.json
- yarn.lock
2019-06-19 18:36:16 +02:00
..
actions Completely hide toots matched by “irreversible” filters even if they got to the client (#11113) 2019-06-18 18:23:08 +02:00
components Do not expand toot when clicking on a poll option (#11067) 2019-06-13 00:16:46 +02:00
containers Add confirm modal for unboosting toots (#10287) 2019-05-09 22:39:26 +02:00
features Merge branch 'master' into glitch-soc/merge-upstream 2019-06-16 21:09:19 +02:00
locales Merge branch 'master' into glitch-soc/merge-upstream 2019-06-19 18:36:16 +02:00
middleware
reducers Fix “mark as sensitive” not being used in delete & redraft (#10980) 2019-06-06 13:04:34 +02:00
selectors Completely hide toots matched by “irreversible” filters even if they got to the client (#11113) 2019-06-18 18:23:08 +02:00
service_worker Support pushing and receiving updates to poll tallies (#10209) 2019-03-11 00:49:31 +01:00
storage
store
utils
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
compare_id.js
extra_polyfills.js
initial_state.js Merge branch 'master' into glitch-soc/merge-upstream 2019-05-26 15:41:40 +02:00
is_mobile.js
load_polyfills.js
main.js
performance.js
ready.js
rtl.js
scroll.js
settings.js
stream.js Improve streaming server security (#10818) 2019-05-24 15:21:42 +02:00
test_setup.js
uuid.js