mastodon/app/javascript/mastodon
Thibaut Girka 1d6152f440 Merge branch 'master' into glitch-soc/merge-upstream
Conflicts:
- config/locales/en.yml
  Conflict caused by the glitch-soc-specific “flavour” string being too close
  to the newly introduced “identity_proofs” string. Just included both.
2019-03-20 13:54:00 +01:00
..
actions Save quick filter settings when selecting a different filter (#10296) 2019-03-17 03:13:29 +01:00
components Show disappointed elephant if web UI crashes (#10275) 2019-03-15 05:35:45 +01:00
containers Show disappointed elephant if web UI crashes (#10275) 2019-03-15 05:35:45 +01:00
features Merge branch 'master' into glitch-soc/merge-upstream 2019-03-20 13:54:00 +01:00
locales Merge branch 'master' into glitch-soc/merge-upstream 2019-03-18 18:03:27 +01:00
middleware
reducers Add UI for enabling/disabling poll notifications (#10255) 2019-03-13 19:29:54 +01:00
selectors
service_worker Support pushing and receiving updates to poll tallies (#10209) 2019-03-11 00:49:31 +01:00
storage
store
utils
api.js
base_polyfills.js
common.js
compare_id.js
extra_polyfills.js
initial_state.js
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