Thibaut Girka 76918554a6 Merge remote-tracking branch 'upstream/master' into glitch-soc/merge-upstream ...

Conflicts:
- Gemfile.lock
- config/webpack/rules/css.js
- package.json
- yarn.lock

2019-06-03 14:54:30 +02:00

..

actions

Improvements to the single column layout (#10835)

2019-05-26 02:55:37 +02:00

components

Improvement variable height in single column layout (#10917)

2019-06-02 10:05:54 +02:00

containers

Add confirm modal for unboosting toots (#10287)

2019-05-09 22:39:26 +02:00

features

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

2019-06-03 14:54:30 +02:00

locales

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

2019-05-30 13:31:01 +02:00

middleware

…

reducers

Display notifications count on a new single column (#10859)

2019-05-27 21:56:29 +02:00

selectors

…

service_worker

…

storage

…

store

…

utils

…

api.js

…

base_polyfills.js

…

common.js

…

compare_id.js

…

extra_polyfills.js

…

initial_state.js

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

2019-05-26 15:41:40 +02:00

is_mobile.js

…

load_polyfills.js

…

main.js

…

performance.js

…

ready.js

…

rtl.js

…

scroll.js

…

settings.js

…

stream.js

Improve streaming server security (#10818)

2019-05-24 15:21:42 +02:00

test_setup.js

…

uuid.js

…