Glitch-Shrike/app/javascript/mastodon
Thibaut Girka b9f314bba7 Merge branch 'master' into glitch-soc/merge-upstream
Conflicts:
- config/locales/es.yml
- config/locales/pl.yml
- config/locales/pt-BR.yml
2019-03-26 16:02:54 +01:00
..
actions Add support for custom emojis in poll options (#10322) 2019-03-20 17:29:12 +01:00
components Change language detector threshold from 140 characters to 4 words (#10376) 2019-03-26 01:23:59 +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-26 16:02:54 +01:00
locales Merge branch 'master' into glitch-soc/merge-upstream 2019-03-26 16:02:54 +01:00
middleware
reducers Do not empty timeline of blocked users on block (#10359) 2019-03-24 19:15:58 +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 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
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