From bf75e1457363739f9ea4329da71c03e48a0bb8af Mon Sep 17 00:00:00 2001
From: Clemens <cle1000.cb@gmail.com>
Date: Tue, 14 Jun 2016 11:20:48 +0200
Subject: added flowMenu

---
 web/src/js/ducks/index.js | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

(limited to 'web/src/js/ducks/index.js')

diff --git a/web/src/js/ducks/index.js b/web/src/js/ducks/index.js
index 6c521a70..2638272d 100644
--- a/web/src/js/ducks/index.js
+++ b/web/src/js/ducks/index.js
@@ -2,11 +2,13 @@ import {combineReducers} from 'redux'
 import eventLog from './eventLog'
 import websocket from './websocket'
 import flows from './flows'
+import view from './view'
 
 const rootReducer = combineReducers({
     eventLog,
     websocket,
     flows,
+    view
 })
 
-export default rootReducer
\ No newline at end of file
+export default rootReducer
-- 
cgit v1.2.3


From 48e372bf98aeee718f6ce9758fd96d49fb2fd3a5 Mon Sep 17 00:00:00 2001
From: Clemens <cle1000.cb@gmail.com>
Date: Wed, 15 Jun 2016 08:54:55 +0200
Subject: rename view -> ui, make code more readable

---
 web/src/js/ducks/index.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'web/src/js/ducks/index.js')

diff --git a/web/src/js/ducks/index.js b/web/src/js/ducks/index.js
index 2638272d..f4ce8fa6 100644
--- a/web/src/js/ducks/index.js
+++ b/web/src/js/ducks/index.js
@@ -2,13 +2,13 @@ import {combineReducers} from 'redux'
 import eventLog from './eventLog'
 import websocket from './websocket'
 import flows from './flows'
-import view from './view'
+import ui from './ui.js'
 
 const rootReducer = combineReducers({
     eventLog,
     websocket,
     flows,
-    view
+    ui
 })
 
 export default rootReducer
-- 
cgit v1.2.3


From 94e2929b3fd6dc335d1c787167956df18f05494e Mon Sep 17 00:00:00 2001
From: Maximilian Hils <git@maximilianhils.com>
Date: Wed, 15 Jun 2016 13:39:56 -0700
Subject: minor fixes

---
 web/src/js/ducks/index.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'web/src/js/ducks/index.js')

diff --git a/web/src/js/ducks/index.js b/web/src/js/ducks/index.js
index f4ce8fa6..fee4d792 100644
--- a/web/src/js/ducks/index.js
+++ b/web/src/js/ducks/index.js
@@ -2,7 +2,7 @@ import {combineReducers} from 'redux'
 import eventLog from './eventLog'
 import websocket from './websocket'
 import flows from './flows'
-import ui from './ui.js'
+import ui from './ui'
 
 const rootReducer = combineReducers({
     eventLog,
-- 
cgit v1.2.3