From ab67f6e257f6e8f08145a02a7b93550f99641be4 Mon Sep 17 00:00:00 2001
From: Joram Wilander <jwawilander@gmail.com>
Date: Sun, 18 Jun 2017 14:42:32 -0400
Subject: PLT-6215 Major post list refactor (#6501)

* Major post list refactor

* Fix post and thread deletion

* Fix preferences not selecting correctly

* Fix military time displaying

* Fix UP key for editing posts

* Fix ESLint error

* Various fixes and updates per feedback

* Fix for permalink view

* Revert to old scrolling method and various fixes

* Add floating timestamp, new message indicator, scroll arrows

* Update post loading for focus mode and add visibility limit

* Fix pinning posts and a react warning

* Add loading UI updates from Asaad

* Fix refreshing loop

* Temporarily bump post visibility limit

* Update infinite scrolling

* Remove infinite scrolling
---
 webapp/store/index.js | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

(limited to 'webapp/store')

diff --git a/webapp/store/index.js b/webapp/store/index.js
index 7ab22e292..6d2fc6d9c 100644
--- a/webapp/store/index.js
+++ b/webapp/store/index.js
@@ -7,6 +7,11 @@ import {General, RequestStatus} from 'mattermost-redux/constants';
 import reduxInitialState from 'mattermost-redux/store/initial_state';
 import {createTransform, persistStore} from 'redux-persist';
 import localForage from 'localforage';
+import appReducer from 'reducers';
+
+function getAppReducer() {
+    return require('../reducers'); // eslint-disable-line global-require
+}
 
 import {transformSet} from './utils';
 
@@ -99,7 +104,7 @@ export default function configureStore(initialState) {
             autoRehydrate: {
                 log: false
             },
-            blacklist: ['errors', 'offline', 'requests', 'entities'],
+            blacklist: ['errors', 'offline', 'requests', 'entities', 'views'],
             debounce: 500,
             transforms: [
                 setTransformer
@@ -107,6 +112,6 @@ export default function configureStore(initialState) {
         }
     };
 
-    return configureServiceStore({}, {}, offlineOptions, null, false);
+    return configureServiceStore({}, appReducer, offlineOptions, getAppReducer, false);
 }
 
-- 
cgit v1.2.3-1-g7c22