unarist d8a0ee1956 Fix merge default columns (#3748) ...

mergeDeep also merges columns, but it should be replaced simply.

So in the new function, first apply mergeDeep except columns, and set default columns if columns unset.

2017-06-14 21:59:52 +02:00

..

actions

Save settings when they are changed (#3743)

2017-06-14 18:59:02 +02:00

components

fix(status): Content jump due to height changes (#3734)

2017-06-13 20:46:21 +02:00

containers

Fix #3665 - Refactor timelines reducer (#3686)

2017-06-11 17:07:35 +02:00

features

Simplify getting started links localization. Link "powered by Mastodon" to joinmastodon.org (#3725)

2017-06-13 03:55:28 +02:00

locales

Simplify getting started links localization. Link "powered by Mastodon" to joinmastodon.org (#3725)

2017-06-13 03:55:28 +02:00

middleware

Remove comments for eslint-disable (#3691)

2017-06-11 10:42:42 +02:00

reducers

Fix merge default columns (#3748)

2017-06-14 21:59:52 +02:00

selectors

Fix #3665 - Refactor timelines reducer (#3686)

2017-06-11 17:07:35 +02:00

store

Replace sprockets/browserify with Webpack (#2617)

2017-05-03 02:04:16 +02:00

.gitkeep

Replace sprockets/browserify with Webpack (#2617)

2017-05-03 02:04:16 +02:00

api.js

Improve eslint rules (#3147)

2017-05-20 17:31:47 +02:00

base_polyfills.js

Lazy load toots using IntersectionObserver (#3191)

2017-05-24 17:55:00 +02:00

emoji.js

Show emoji shortname by a tooltip (#2784)

2017-05-04 15:50:09 +02:00

extra_polyfills.js

Lazy load toots using IntersectionObserver (#3191)

2017-05-24 17:55:00 +02:00

is_mobile.js

Replace sprockets/browserify with Webpack (#2617)

2017-05-03 02:04:16 +02:00

link_header.js

Improve eslint rules (#3147)

2017-05-20 17:31:47 +02:00

load_polyfills.js

Extract polyfill loading into single module (#3421)

2017-05-30 15:11:15 +02:00

main.js

Resolve custom application stylesheet with Webpack (#3373)

2017-06-01 20:56:32 +02:00

performance.js

Attach ReactPerf to window for easier debugging (#3318)

2017-05-25 21:14:40 +02:00

rtl.js

Improve RTL detection (#3682)

2017-06-10 15:06:50 +02:00

scroll.js

Allow mounting arbitrary columns (#3207)

2017-06-04 01:39:38 +02:00

stream.js

Use ws protocol in streaming API base URL (#2606)

2017-05-04 15:55:13 +02:00

uuid.js

Replace sprockets/browserify with Webpack (#2617)

2017-05-03 02:04:16 +02:00