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

Conflicts:
	app/controllers/api/v1/mutes_controller.rb
	config/locales/simple_form.pl.yml

2018-08-27 18:09:28 +02:00

..

actions

Preserve hashtag casing in web UI hashtag history (#8394)

2018-08-23 21:21:15 +02:00

components

Add aria-label to notifications (#8460)

2018-08-26 17:53:26 +02:00

containers

Weblate translations (2018-08-25) (#8420)

2018-08-25 13:27:56 +02:00

features

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

2018-08-27 18:09:28 +02:00

locales

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

2018-08-27 18:09:28 +02:00

middleware

…

reducers

Add aria-label to notifications (#8460)

2018-08-26 17:53:26 +02:00

selectors

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

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

service_worker

Only display web push notifications after API call (fixes #7902) (#8396)

2018-08-23 21:44:27 +02:00

storage

…

store

…

utils

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

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

.gitkeep

…

api.js

…

base_polyfills.js

…

common.js

Upgrade webpack to version v4.x (#6655)

2018-07-14 03:56:41 +02:00

compare_id.js

…

extra_polyfills.js

…

initial_state.js

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

2018-07-16 14:50:42 +02:00

is_mobile.js

…

link_header.js

…

load_polyfills.js

…

main.js

…

performance.js

…

ready.js

…

rtl.js

…

scroll.js

…

settings.js

…

stream.js

…

test_setup.js

…

uuid.js

…