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

Conflicts:
	app/models/user.rb

Resolved by adding :default_language to user settings fields

2018-06-21 20:49:57 +02:00

..

actions

Put "Media Only" option in column settings instead of content area headline (#7801)

2018-06-15 11:15:15 +02:00

components

Add redraft function (#7735)

2018-06-05 00:17:38 +02:00

containers

Add redraft function (#7735)

2018-06-05 00:17:38 +02:00

features

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

2018-06-21 20:49:57 +02:00

locales

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

2018-06-21 20:49:57 +02:00

middleware

…

reducers

Put "Media Only" option in column settings instead of content area headline (#7801)

2018-06-15 11:15:15 +02:00

selectors

…

service_worker

Return collect response when fail put cache to storage (#7863)

2018-06-20 20:55:17 +02:00

storage

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

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

store

…

utils

Preserve newlines in delete & redraft and desktop notifications (#7750)

2018-06-06 20:49:53 +02:00

.gitkeep

…

api.js

…

base_polyfills.js

…

compare_id.js

…

extra_polyfills.js

…

initial_state.js

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

2018-06-15 20:51:39 +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

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

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

test_setup.js

…

uuid.js

…