mastodon/app/javascript/mastodon
Thibaut Girka 89bee860cd Merge branch 'master' into glitch-soc/merge-upstream
Conflicts:
- app/services/post_status_service.rb
  Small conflict due to handling of instance-local toots.
  A subsequent change is required to ensure instance-local polls are not leaked
  through Update.
2019-03-11 11:23:50 +01:00
..
actions Support pushing and receiving updates to poll tallies (#10209) 2019-03-11 00:49:31 +01:00
components Fix NaN in Poll component (#10213) 2019-03-07 22:18:05 +01:00
containers Add polls (#10111) 2019-03-03 22:18:23 +01:00
features Merge branch 'master' into glitch-soc/merge-upstream 2019-03-11 11:23:50 +01:00
locales Merge branch 'master' into glitch-soc/merge-upstream 2019-03-11 11:23:50 +01:00
middleware
reducers Support pushing and receiving updates to poll tallies (#10209) 2019-03-11 00:49:31 +01:00
selectors
service_worker Support pushing and receiving updates to poll tallies (#10209) 2019-03-11 00:49:31 +01:00
storage
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
common.js Improve the public hashtag page (#9831) 2019-01-17 14:06:08 +01:00
compare_id.js
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
main.js
performance.js
ready.js
rtl.js
scroll.js
settings.js
stream.js Fix public timelines being broken by new toots when they are not mounted (#10131) 2019-03-07 22:17:52 +01:00
test_setup.js
uuid.js