mastodon/app/javascript/mastodon/reducers
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
..
accounts.js Fix #3665 - Refactor timelines reducer (#3686) 2017-06-11 17:07:35 +02:00
accounts_counters.js Fix #3665 - Refactor timelines reducer (#3686) 2017-06-11 17:07:35 +02:00
alerts.js Improve eslint rules (#3147) 2017-05-20 17:31:47 +02:00
cards.js Replace sprockets/browserify with Webpack (#2617) 2017-05-03 02:04:16 +02:00
compose.js Improve eslint rules (#3147) 2017-05-20 17:31:47 +02:00
contexts.js Fix #3665 - Refactor timelines reducer (#3686) 2017-06-11 17:07:35 +02:00
index.js Fix #3665 - Refactor timelines reducer (#3686) 2017-06-11 17:07:35 +02:00
media_attachments.js Prevent selection of unacceptable Content-Type files (#2910) 2017-05-08 16:49:53 +02:00
meta.js Improve eslint rules (#3147) 2017-05-20 17:31:47 +02:00
modal.js Improve eslint rules (#3147) 2017-05-20 17:31:47 +02:00
notifications.js Improve eslint rules (#3147) 2017-05-20 17:31:47 +02:00
relationships.js Improve eslint rules (#3147) 2017-05-20 17:31:47 +02:00
reports.js Improve eslint rules (#3147) 2017-05-20 17:31:47 +02:00
search.js Improve eslint rules (#3147) 2017-05-20 17:31:47 +02:00
settings.js Fix merge default columns (#3748) 2017-06-14 21:59:52 +02:00
status_lists.js Improve eslint rules (#3147) 2017-05-20 17:31:47 +02:00
statuses.js Fix #3665 - Refactor timelines reducer (#3686) 2017-06-11 17:07:35 +02:00
timelines.js Fix #3665 - Refactor timelines reducer (#3686) 2017-06-11 17:07:35 +02:00
user_lists.js Improve eslint rules (#3147) 2017-05-20 17:31:47 +02:00