Merge branch 'master' of ghghgh.us:armory-fmf-cms

2 files changed, 9 insertions, 1 deletions

diff --git a/index.js b/index.js
index 5cd8692..03d9578 100644
--- a/index.js
+++ b/index.js
@@ -7,6 +7,7 @@ var viewConfig = {
   data: [
     {type: 'timeline', query: '*'},
     {type: 'page', query: '*'},
+    {type: 'feed', query: '*'},
   ]
 }
 
@@ -51,11 +52,18 @@ var app = okcms.createApp({
       body: {type: 'text'},
       disabled: {type: 'flag'},
     },
+    stream: {
+      id: {type: 'string', hidden: true},
+      title: {type: 'string'},
+      streams: {type: 'link-list'},
+      disabled: {type: 'flag'},
+    },
   },
 
   resources: [
     { type: 'timeline' },
     { type: 'page' },
+    { type: 'stream' },
   ],
 
   views: {
diff --git a/package.json b/package.json
index 89e9b7f..4334c5b 100644
--- a/package.json
+++ b/package.json
@@ -9,7 +9,7 @@
     "liquid-node": "^2.6.1",
     "mailgun.js": "^2.0.1",
     "multer": "^1.3.0",
-    "okcms": "git+ssh://git@ghghgh.us/~/okcms.git#v0.2.6",
+    "okcms": "git+ssh://git@ghghgh.us/~/okcms.git#v0.2.7",
     "request": "^2.81.0"
   },
   "devDependencies": {}