From edd995fd5f92bba8221c7b9384ad0cb7c59794e3 Mon Sep 17 00:00:00 2001
From: Dennis Eriksen <dennis.se@gmail.com>
Date: Thu, 25 Apr 2013 01:21:07 +0200
Subject: moved express config to own file. created configfile.

---
 config/config.js | 15 +++++++++++++++
 1 file changed, 15 insertions(+)
 create mode 100644 config/config.js

(limited to 'config/config.js')

diff --git a/config/config.js b/config/config.js
new file mode 100644
index 0000000..8312ddc
--- /dev/null
+++ b/config/config.js
@@ -0,0 +1,15 @@
+var path = require('path')
+  , rootPath = path.normalize(__dirname + '/..');
+
+
+module.exports = {
+    development: {
+        db: 'mongodb://localhost/test',
+        root: rootPath,
+        app: {
+            name: 'Divid'
+        }
+    }
+}
+
+
-- 
cgit v1.2.3


From 4dd7550b87386114ba4e86be17afbaa4d3fa11d6 Mon Sep 17 00:00:00 2001
From: Dennis Eriksen <dennis.se@gmail.com>
Date: Thu, 25 Apr 2013 02:12:34 +0200
Subject: addedpassport config file and did some other stuff

---
 config/config.js | 5 +++++
 1 file changed, 5 insertions(+)

(limited to 'config/config.js')

diff --git a/config/config.js b/config/config.js
index 8312ddc..1eaffa1 100644
--- a/config/config.js
+++ b/config/config.js
@@ -8,6 +8,11 @@ module.exports = {
         root: rootPath,
         app: {
             name: 'Divid'
+        },
+        facebook: {
+            clientID: "504825706245603",
+            clientSecret: "e5ea0faed85d8749cafd38732530ef35",
+            callbackURL: "https://divid.no/auth/facebook/callback"
         }
     }
 }
-- 
cgit v1.2.3


From a82fe16c44a6005546131e58c88c02474243105a Mon Sep 17 00:00:00 2001
From: Dennis Eriksen <dennis.se@gmail.com>
Date: Thu, 25 Apr 2013 02:21:53 +0200
Subject: added twitter config

---
 config/config.js | 5 +++++
 1 file changed, 5 insertions(+)

(limited to 'config/config.js')

diff --git a/config/config.js b/config/config.js
index 1eaffa1..f932387 100644
--- a/config/config.js
+++ b/config/config.js
@@ -14,6 +14,11 @@ module.exports = {
             clientSecret: "e5ea0faed85d8749cafd38732530ef35",
             callbackURL: "https://divid.no/auth/facebook/callback"
         }
+        twitter: {
+            clientID: "CONSUMER KEY",
+            clientSecret: "CONSUMER SECRET",
+            callbackURL: "https://divid.no/auth/twitter/callback"
+        }
     }
 }
 
-- 
cgit v1.2.3


From d4b85e5e7765def9820dab5129f80d238e515591 Mon Sep 17 00:00:00 2001
From: Dennis Eriksen <dennis.se@gmail.com>
Date: Thu, 25 Apr 2013 16:34:48 +0200
Subject: fixed small bug

---
 config/config.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'config/config.js')

diff --git a/config/config.js b/config/config.js
index f932387..8d120b2 100644
--- a/config/config.js
+++ b/config/config.js
@@ -13,7 +13,7 @@ module.exports = {
             clientID: "504825706245603",
             clientSecret: "e5ea0faed85d8749cafd38732530ef35",
             callbackURL: "https://divid.no/auth/facebook/callback"
-        }
+        },
         twitter: {
             clientID: "CONSUMER KEY",
             clientSecret: "CONSUMER SECRET",
-- 
cgit v1.2.3


From ff55ba7557f83a99a6e3cd0e26cf627b8890ed71 Mon Sep 17 00:00:00 2001
From: Dennis Eriksen <dennis.se@gmail.com>
Date: Fri, 26 Apr 2013 17:42:44 +0200
Subject: added twitter authentication

---
 config/config.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'config/config.js')

diff --git a/config/config.js b/config/config.js
index 8d120b2..50dea23 100644
--- a/config/config.js
+++ b/config/config.js
@@ -15,8 +15,8 @@ module.exports = {
             callbackURL: "https://divid.no/auth/facebook/callback"
         },
         twitter: {
-            clientID: "CONSUMER KEY",
-            clientSecret: "CONSUMER SECRET",
+            clientID: "tpCfKBUyAfogTpFxnb9w",
+            clientSecret: "abzInK4Nu0IFUhyXl73O2XjlFLFlzmBtLmbXk6v8",
             callbackURL: "https://divid.no/auth/twitter/callback"
         }
     }
-- 
cgit v1.2.3