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

Conflicts:
- app/models/form/admin_settings.rb
- config/locales/ja.yml

2019-04-01 21:28:31 +02:00

..

actions

Fix search in web UI not setting a limit, restore limit of 5 (#10421)

2019-03-30 00:43:38 +01:00

components

Add a “Block & Report” button to the block confirmation dialog (#10360)

2019-03-26 17:34:02 +01:00

containers

Add a “Block & Report” button to the block confirmation dialog (#10360)

2019-03-26 17:34:02 +01:00

features

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

2019-04-01 21:28:31 +02:00

locales

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

2019-04-01 21:28:31 +02:00

middleware

…

reducers

squashed identity proof updates (#10375)

2019-03-28 18:01:09 +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

…