From 0529a494ae6b541f917522a20de92e3d36615f65 Mon Sep 17 00:00:00 2001
From: =Corey Hulen <corey@hulen.com>
Date: Mon, 21 Sep 2015 17:34:13 -0700
Subject: Adding image properties

---
 web/react/components/admin_console/admin_controller.jsx | 3 +++
 1 file changed, 3 insertions(+)

(limited to 'web/react/components/admin_console/admin_controller.jsx')

diff --git a/web/react/components/admin_console/admin_controller.jsx b/web/react/components/admin_console/admin_controller.jsx
index e82fe1b76..0dc0ec45b 100644
--- a/web/react/components/admin_console/admin_controller.jsx
+++ b/web/react/components/admin_console/admin_controller.jsx
@@ -9,6 +9,7 @@ var LoadingScreen = require('../loading_screen.jsx');
 var EmailSettingsTab = require('./email_settings.jsx');
 var LogSettingsTab = require('./log_settings.jsx');
 var LogsTab = require('./logs.jsx');
+var ImageSettingsTab = require('./image_settings.jsx');
 
 export default class AdminController extends React.Component {
     constructor(props) {
@@ -53,6 +54,8 @@ export default class AdminController extends React.Component {
                 tab = <LogSettingsTab config={this.state.config} />;
             } else if (this.state.selected === 'logs') {
                 tab = <LogsTab />;
+            } else if (this.state.selected === 'image_settings') {
+                tab = <ImageSettingsTab config={this.state.config} />;
             }
         }
 
-- 
cgit v1.2.3-1-g7c22


From cae5dbd245f05e9441156a3918ef796d92ecf331 Mon Sep 17 00:00:00 2001
From: =Corey Hulen <corey@hulen.com>
Date: Mon, 21 Sep 2015 18:23:10 -0700
Subject: Adding privacy to admin console

---
 web/react/components/admin_console/admin_controller.jsx | 3 +++
 1 file changed, 3 insertions(+)

(limited to 'web/react/components/admin_console/admin_controller.jsx')

diff --git a/web/react/components/admin_console/admin_controller.jsx b/web/react/components/admin_console/admin_controller.jsx
index 0dc0ec45b..9db1c945e 100644
--- a/web/react/components/admin_console/admin_controller.jsx
+++ b/web/react/components/admin_console/admin_controller.jsx
@@ -10,6 +10,7 @@ var EmailSettingsTab = require('./email_settings.jsx');
 var LogSettingsTab = require('./log_settings.jsx');
 var LogsTab = require('./logs.jsx');
 var ImageSettingsTab = require('./image_settings.jsx');
+var PrivacySettingsTab = require('./privacy_settings.jsx');
 
 export default class AdminController extends React.Component {
     constructor(props) {
@@ -56,6 +57,8 @@ export default class AdminController extends React.Component {
                 tab = <LogsTab />;
             } else if (this.state.selected === 'image_settings') {
                 tab = <ImageSettingsTab config={this.state.config} />;
+            } else if (this.state.selected === 'privacy_settings') {
+                tab = <PrivacySettingsTab config={this.state.config} />;
             }
         }
 
-- 
cgit v1.2.3-1-g7c22


From e78c79b83213efc40bffc5ef42071fedb85d6061 Mon Sep 17 00:00:00 2001
From: =Corey Hulen <corey@hulen.com>
Date: Mon, 21 Sep 2015 19:01:52 -0700
Subject: Adding rate limiter settings to the admin console

---
 web/react/components/admin_console/admin_controller.jsx | 3 +++
 1 file changed, 3 insertions(+)

(limited to 'web/react/components/admin_console/admin_controller.jsx')

diff --git a/web/react/components/admin_console/admin_controller.jsx b/web/react/components/admin_console/admin_controller.jsx
index 9db1c945e..0cd3500e5 100644
--- a/web/react/components/admin_console/admin_controller.jsx
+++ b/web/react/components/admin_console/admin_controller.jsx
@@ -11,6 +11,7 @@ var LogSettingsTab = require('./log_settings.jsx');
 var LogsTab = require('./logs.jsx');
 var ImageSettingsTab = require('./image_settings.jsx');
 var PrivacySettingsTab = require('./privacy_settings.jsx');
+var RateSettingsTab = require('./rate_settings.jsx');
 
 export default class AdminController extends React.Component {
     constructor(props) {
@@ -59,6 +60,8 @@ export default class AdminController extends React.Component {
                 tab = <ImageSettingsTab config={this.state.config} />;
             } else if (this.state.selected === 'privacy_settings') {
                 tab = <PrivacySettingsTab config={this.state.config} />;
+            } else if (this.state.selected === 'rate_settings') {
+                tab = <RateSettingsTab config={this.state.config} />;
             }
         }
 
-- 
cgit v1.2.3-1-g7c22


From f05a2c03d5dbf5b0b7d09148a37d2325012b309f Mon Sep 17 00:00:00 2001
From: =Corey Hulen <corey@hulen.com>
Date: Tue, 22 Sep 2015 00:00:19 -0700
Subject: Adding SQL settings to admin console

---
 web/react/components/admin_console/admin_controller.jsx | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

(limited to 'web/react/components/admin_console/admin_controller.jsx')

diff --git a/web/react/components/admin_console/admin_controller.jsx b/web/react/components/admin_console/admin_controller.jsx
index 0cd3500e5..491dbd754 100644
--- a/web/react/components/admin_console/admin_controller.jsx
+++ b/web/react/components/admin_console/admin_controller.jsx
@@ -12,6 +12,8 @@ var LogsTab = require('./logs.jsx');
 var ImageSettingsTab = require('./image_settings.jsx');
 var PrivacySettingsTab = require('./privacy_settings.jsx');
 var RateSettingsTab = require('./rate_settings.jsx');
+var GitLabSettingsTab = require('./gitlab_settings.jsx');
+var SqlSettingsTab = require('./sql_settings.jsx');
 
 export default class AdminController extends React.Component {
     constructor(props) {
@@ -22,7 +24,7 @@ export default class AdminController extends React.Component {
 
         this.state = {
             config: null,
-            selected: 'email_settings'
+            selected: 'sql_settings'
         };
     }
 
@@ -62,6 +64,10 @@ export default class AdminController extends React.Component {
                 tab = <PrivacySettingsTab config={this.state.config} />;
             } else if (this.state.selected === 'rate_settings') {
                 tab = <RateSettingsTab config={this.state.config} />;
+            } else if (this.state.selected === 'gitlab_settings') {
+                tab = <GitLabSettingsTab config={this.state.config} />;
+            } else if (this.state.selected === 'sql_settings') {
+                tab = <SqlSettingsTab config={this.state.config} />;
             }
         }
 
-- 
cgit v1.2.3-1-g7c22


From 08a3acbb44b043b9bb56f9b96e91432352d06d1a Mon Sep 17 00:00:00 2001
From: =Corey Hulen <corey@hulen.com>
Date: Tue, 22 Sep 2015 01:15:41 -0700
Subject: Adding team settings to admin console

---
 web/react/components/admin_console/admin_controller.jsx | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

(limited to 'web/react/components/admin_console/admin_controller.jsx')

diff --git a/web/react/components/admin_console/admin_controller.jsx b/web/react/components/admin_console/admin_controller.jsx
index 491dbd754..72b5d5c9d 100644
--- a/web/react/components/admin_console/admin_controller.jsx
+++ b/web/react/components/admin_console/admin_controller.jsx
@@ -14,6 +14,8 @@ var PrivacySettingsTab = require('./privacy_settings.jsx');
 var RateSettingsTab = require('./rate_settings.jsx');
 var GitLabSettingsTab = require('./gitlab_settings.jsx');
 var SqlSettingsTab = require('./sql_settings.jsx');
+var TeamSettingsTab = require('./team_settings.jsx');
+
 
 export default class AdminController extends React.Component {
     constructor(props) {
@@ -24,7 +26,7 @@ export default class AdminController extends React.Component {
 
         this.state = {
             config: null,
-            selected: 'sql_settings'
+            selected: 'team_settings'
         };
     }
 
@@ -68,6 +70,8 @@ export default class AdminController extends React.Component {
                 tab = <GitLabSettingsTab config={this.state.config} />;
             } else if (this.state.selected === 'sql_settings') {
                 tab = <SqlSettingsTab config={this.state.config} />;
+            } else if (this.state.selected === 'team_settings') {
+                tab = <TeamSettingsTab config={this.state.config} />;
             }
         }
 
-- 
cgit v1.2.3-1-g7c22


From 88e5a71e8c93b495cedaa07931a4f8052d9f12ed Mon Sep 17 00:00:00 2001
From: =Corey Hulen <corey@hulen.com>
Date: Tue, 22 Sep 2015 12:12:50 -0700
Subject: Adding service settings to admin console

---
 web/react/components/admin_console/admin_controller.jsx | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

(limited to 'web/react/components/admin_console/admin_controller.jsx')

diff --git a/web/react/components/admin_console/admin_controller.jsx b/web/react/components/admin_console/admin_controller.jsx
index 72b5d5c9d..ce7d61ca9 100644
--- a/web/react/components/admin_console/admin_controller.jsx
+++ b/web/react/components/admin_console/admin_controller.jsx
@@ -15,7 +15,7 @@ var RateSettingsTab = require('./rate_settings.jsx');
 var GitLabSettingsTab = require('./gitlab_settings.jsx');
 var SqlSettingsTab = require('./sql_settings.jsx');
 var TeamSettingsTab = require('./team_settings.jsx');
-
+var ServiceSettingsTab = require('./service_settings.jsx');
 
 export default class AdminController extends React.Component {
     constructor(props) {
@@ -26,7 +26,7 @@ export default class AdminController extends React.Component {
 
         this.state = {
             config: null,
-            selected: 'team_settings'
+            selected: 'service_settings'
         };
     }
 
@@ -72,6 +72,8 @@ export default class AdminController extends React.Component {
                 tab = <SqlSettingsTab config={this.state.config} />;
             } else if (this.state.selected === 'team_settings') {
                 tab = <TeamSettingsTab config={this.state.config} />;
+            } else if (this.state.selected === 'service_settings') {
+                tab = <ServiceSettingsTab config={this.state.config} />;
             }
         }
 
-- 
cgit v1.2.3-1-g7c22


From ccf2e6e4e74fc249a094c2c27de675644f1065cb Mon Sep 17 00:00:00 2001
From: =Corey Hulen <corey@hulen.com>
Date: Wed, 23 Sep 2015 13:47:10 -0700
Subject: Changing image settings to file settings

---
 web/react/components/admin_console/admin_controller.jsx | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'web/react/components/admin_console/admin_controller.jsx')

diff --git a/web/react/components/admin_console/admin_controller.jsx b/web/react/components/admin_console/admin_controller.jsx
index ce7d61ca9..6fddfef07 100644
--- a/web/react/components/admin_console/admin_controller.jsx
+++ b/web/react/components/admin_console/admin_controller.jsx
@@ -9,7 +9,7 @@ var LoadingScreen = require('../loading_screen.jsx');
 var EmailSettingsTab = require('./email_settings.jsx');
 var LogSettingsTab = require('./log_settings.jsx');
 var LogsTab = require('./logs.jsx');
-var ImageSettingsTab = require('./image_settings.jsx');
+var FileSettingsTab = require('./image_settings.jsx');
 var PrivacySettingsTab = require('./privacy_settings.jsx');
 var RateSettingsTab = require('./rate_settings.jsx');
 var GitLabSettingsTab = require('./gitlab_settings.jsx');
@@ -61,7 +61,7 @@ export default class AdminController extends React.Component {
             } else if (this.state.selected === 'logs') {
                 tab = <LogsTab />;
             } else if (this.state.selected === 'image_settings') {
-                tab = <ImageSettingsTab config={this.state.config} />;
+                tab = <FileSettingsTab config={this.state.config} />;
             } else if (this.state.selected === 'privacy_settings') {
                 tab = <PrivacySettingsTab config={this.state.config} />;
             } else if (this.state.selected === 'rate_settings') {
-- 
cgit v1.2.3-1-g7c22

