Thibaut Girka a942ad3062 Merge branch 'master' into glitch-soc/merge-upstream ...

Conflicts:
- config/locales/simple_form.ja.yml

Not a real conflict, one new string was introduced in
glitch and one in upstream.

2018-10-29 14:00:41 +01:00

..

actions

Fix dimensions of preview cards, fix crash in web UI, fix warning (#9133)

2018-10-29 04:42:07 +01:00

components

Fix dimensions of preview cards, fix crash in web UI, fix warning (#9133)

2018-10-29 04:42:07 +01:00

containers

Add a confirmation dialog when hitting reply and the compose box isn't empty (#8893)

2018-10-05 18:44:44 +02:00

features

Merge branch 'master' into glitch-soc/merge-upstream

2018-10-29 14:00:41 +01:00

locales

Merge branch 'master' into glitch-soc/merge-upstream

2018-10-29 14:00:41 +01:00

middleware

Add missing rejection handling for Promises (#7008)

2018-04-02 14:51:02 +02:00

reducers

Fix dimensions of preview cards, fix crash in web UI, fix warning (#9133)

2018-10-29 04:42:07 +01:00

selectors

Don't filter own toots (fixes #8289) (#8298)

2018-08-19 18:44:18 +02:00

service_worker

Fix a problem about generating an url of notifications (#8758)

2018-09-24 05:45:58 +02:00

storage

Cache media only when storage can be freed (#7547)

2018-05-19 19:22:11 +02:00

store

…

utils

Resize images by area instead of fixed dimensions (#8083)

2018-07-28 03:33:00 +02:00

api.js

…

base_polyfills.js

Refactor resizeImage method (#7236)

2018-04-23 09:15:51 +02:00

common.js

Revert Font Awesome 5 upgrade (#8810)

2018-09-28 02:11:14 +02:00

compare_id.js

…

extra_polyfills.js

…

initial_state.js

Merge branch 'master' into glitch-soc/merge-upstream

2018-10-22 17:51:38 +02:00

is_mobile.js

…

link_header.js

Improve eslint rules (#3147)

2017-05-20 17:31:47 +02:00

load_polyfills.js

…

main.js

bug fix (WebPush does not work) (#6120)

2017-12-28 16:20:34 +01:00

performance.js

Upgrade to React 16 (#5119)

2017-09-30 04:29:56 +02:00

ready.js

Do not load unnecessary script files (#4193)

2017-07-14 11:08:56 +02:00

rtl.js

Improve RTL detection (#3682)

2017-06-10 15:06:50 +02:00

scroll.js

Scroll smoothly to the right (#4735)

2017-08-29 17:06:19 +02:00

settings.js

…

stream.js

Use randomized setTimeout when fallback-polling and re-add since_id (#7522)

2018-05-18 02:32:35 +02:00

test_setup.js

Replace JavaScript Testing Framework from Mocha to Jest (#5412)

2017-10-16 09:33:08 +02:00

uuid.js

…