mastodon/app/javascript/mastodon
Thibaut Girka c0dc247bce Merge branch 'master' into glitch-soc/merge-upstream
Conflicts:
- app/models/account.rb
- app/views/settings/profiles/show.html.haml
- spec/controllers/api/v1/accounts/credentials_controller_spec.rb

Conflicts were due to an increase in account bio length upstream, which
is already covered in glitch-soc through `MAX_BIO_CHARS`.
2019-05-23 19:01:30 +02:00
..
actions Add toot source to delete result to ease Delete & Redraft (#10669) 2019-05-11 06:46:43 +02:00
components Add `forceSingleColumn` prop to `<UI />` (#10807) 2019-05-23 01:35:22 +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-05-23 19:01:30 +02:00
locales Merge branch 'master' into glitch-soc/merge-upstream 2019-05-23 19:01:30 +02:00
middleware
reducers Add `forceSingleColumn` prop to `<UI />` (#10807) 2019-05-23 01:35:22 +02:00
selectors Don't filter own toots (fixes #8289) (#8298) 2018-08-19 18:44:18 +02:00
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 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
extra_polyfills.js
initial_state.js Merge branch 'master' into glitch-soc/merge-upstream 2019-04-22 20:40:04 +02: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