Thibaut Girka 1c9c0167b7 Merge branch 'master' into glitch-soc/master ...

Conflicts:
	app/models/account.rb
	app/views/accounts/_header.html.haml

2018-05-10 00:03:28 +02:00

..

actions

Use plaintext value for field value tooltips in web UI (#7388)

2018-05-07 09:30:38 +02:00

components

Show media modal on public timeline (#7413)

2018-05-08 13:33:09 +02:00

containers

Show card modal on public pages (#7428)

2018-05-09 16:22:52 +02:00

features

Show media modal on public timeline (#7413)

2018-05-08 13:33:09 +02:00

locales

Merge branch 'master' into glitch-soc/master

2018-05-10 00:03:28 +02:00

middleware

…

reducers

Fix gap insertion for timeline disconnection (#7363)

2018-05-05 00:54:56 +02:00

selectors

…

service_worker

…

storage

…

store

…

utils

Correct rotate of image using EXIF (#7422)

2018-05-09 08:41:07 +02:00

.gitkeep

…

api.js

…

base_polyfills.js

Refactor resizeImage method (#7236)

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

compare_id.js

…

extra_polyfills.js

…

initial_state.js

…

is_mobile.js

…

link_header.js

…

load_polyfills.js

Refactor resizeImage method (#7236)

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

main.js

…

performance.js

…

ready.js

…

rtl.js

…

scroll.js

…

settings.js

…

stream.js

…

test_setup.js

…

uuid.js

…