From 42e85f7aa9859afbfc0066a8d174a95d3d7c9f88 Mon Sep 17 00:00:00 2001
From: Reed Garmsen <rgarmsen2295@gmail.com>
Date: Tue, 16 Jun 2015 17:08:06 -0700
Subject: Added in basic changes necessary to fix some typos.  Needs further
 tests and changes to other config files

---
 web/react/components/login.jsx | 6 +++---
 web/static/config/config.js    | 6 ++++--
 2 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/web/react/components/login.jsx b/web/react/components/login.jsx
index 8d82a4b62..39571bae1 100644
--- a/web/react/components/login.jsx
+++ b/web/react/components/login.jsx
@@ -52,20 +52,20 @@ var FindTeamDomain = React.createClass({
                 <div>
                     <span className="signup-team__name">{ config.SiteName }</span>
                     <br/>
-                    <span className="signup-team__subdomain">Enter your {strings.TeamPlural} domain.</span>
+                    <span className="signup-team__subdomain">Enter your {strings.TeamPossessive} domain.</span>
                     <br/>
                     <br/>
                 </div>
                 <form onSubmit={this.handleSubmit}>
                     <div className={server_error ? 'form-group has-error' : 'form-group'}>
                         { server_error }
-                        <input type="text" className="form-control" name="domain" ref="domain" placeholder="teamdomain" />
+                        <input type="text" className="form-control" name="domain" ref="domain" placeholder="team domain" />
                     </div>
                     <div className="form-group">
                         <button type="submit" className="btn btn-primary">Continue</button>
                     </div>
                     <div>
-                        <span>Don't remember your {strings.TeamPlural} domain? <a href="/find_team">Find it here</a></span>
+                        <span>Don't remember your {strings.TeamPossessive} domain? <a href="/find_team">Find it here</a></span>
                     </div>
                     <br/>
                     <br/>
diff --git a/web/static/config/config.js b/web/static/config/config.js
index 080f16a30..04b188b75 100644
--- a/web/static/config/config.js
+++ b/web/static/config/config.js
@@ -33,6 +33,8 @@ var config = {
 var strings = {
     Team: "team",
     TeamPlural: "teams",
+    TeamPossessive: "team's",
     Company: "company",
-    CompanyPlural: "companies"
-}
+    CompanyPlural: "companies",
+    CompanyPossessive: "company's"
+};
-- 
cgit v1.2.3-1-g7c22


From 4b1d834514dcf42d311321ef31c18c24ecdcaef7 Mon Sep 17 00:00:00 2001
From: Reed Garmsen <rgarmsen2295@gmail.com>
Date: Wed, 17 Jun 2015 09:53:15 -0700
Subject: Simplified code changes

---
 config/config.json             | 1 -
 web/react/components/login.jsx | 4 ++--
 web/static/config/config.js    | 2 --
 3 files changed, 2 insertions(+), 5 deletions(-)

diff --git a/config/config.json b/config/config.json
index 3d2c26716..0ca072194 100644
--- a/config/config.json
+++ b/config/config.json
@@ -56,7 +56,6 @@
     "EmailSettings": {
         "SMTPUsername": "",
         "SMTPPassword": "",
-        "SMTPServer": "localhost:25",
 		"UseTLS": false,
         "FeedbackEmail": "feedback@xxxxxxmustbefilledin.com",
         "FeedbackName": "",
diff --git a/web/react/components/login.jsx b/web/react/components/login.jsx
index 85be3d45b..65f1da1f8 100644
--- a/web/react/components/login.jsx
+++ b/web/react/components/login.jsx
@@ -52,7 +52,7 @@ var FindTeamDomain = React.createClass({
                 <div>
                     <span className="signup-team__name">{ config.SiteName }</span>
                     <br/>
-                    <span className="signup-team__subdomain">Enter your {strings.TeamPossessive} domain.</span>
+                    <span className="signup-team__subdomain">Enter your {strings.Team}'s domain.</span>
                     <br/>
                     <br/>
                 </div>
@@ -65,7 +65,7 @@ var FindTeamDomain = React.createClass({
                         <button type="submit" className="btn btn-primary">Continue</button>
                     </div>
                     <div>
-                        <span>Don't remember your {strings.TeamPossessive} domain? <a href="/find_team">Find it here</a></span>
+                        <span>Don't remember your {strings.Team}'s domain? <a href="/find_team">Find it here</a></span>
                     </div>
                     <br/>
                     <br/>
diff --git a/web/static/config/config.js b/web/static/config/config.js
index 12cbb4019..a9a3e732e 100644
--- a/web/static/config/config.js
+++ b/web/static/config/config.js
@@ -33,8 +33,6 @@ var config = {
 var strings = {
     Team: "team",
     TeamPlural: "teams",
-    TeamPossessive: "team's",
     Company: "company",
     CompanyPlural: "companies",
-    CompanyPossessive: "company's"
 };
-- 
cgit v1.2.3-1-g7c22


From 29a68da90a6d6bba8894afe44e57733fd527085d Mon Sep 17 00:00:00 2001
From: Reed Garmsen <rgarmsen2295@gmail.com>
Date: Wed, 17 Jun 2015 09:54:06 -0700
Subject: Removed unnecessary comma

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

diff --git a/web/static/config/config.js b/web/static/config/config.js
index a9a3e732e..82d4bbf70 100644
--- a/web/static/config/config.js
+++ b/web/static/config/config.js
@@ -34,5 +34,5 @@ var strings = {
     Team: "team",
     TeamPlural: "teams",
     Company: "company",
-    CompanyPlural: "companies",
+    CompanyPlural: "companies"
 };
-- 
cgit v1.2.3-1-g7c22


From 85adca9d7ac13e0c6ede3a4ee6419b9e1af67254 Mon Sep 17 00:00:00 2001
From: Reed Garmsen <rgarmsen2295@gmail.com>
Date: Tue, 16 Jun 2015 17:08:06 -0700
Subject: Added in basic changes necessary to fix some typos.  Needs further
 tests and changes to other config files

---
 web/react/components/login.jsx | 6 +++---
 web/static/config/config.js    | 6 ++++--
 2 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/web/react/components/login.jsx b/web/react/components/login.jsx
index 103a93bc6..85be3d45b 100644
--- a/web/react/components/login.jsx
+++ b/web/react/components/login.jsx
@@ -52,20 +52,20 @@ var FindTeamDomain = React.createClass({
                 <div>
                     <span className="signup-team__name">{ config.SiteName }</span>
                     <br/>
-                    <span className="signup-team__subdomain">Enter your {strings.TeamPlural} domain.</span>
+                    <span className="signup-team__subdomain">Enter your {strings.TeamPossessive} domain.</span>
                     <br/>
                     <br/>
                 </div>
                 <form onSubmit={this.handleSubmit}>
                     <div className={server_error ? 'form-group has-error' : 'form-group'}>
                         { server_error }
-                        <input type="text" className="form-control" name="domain" ref="domain" placeholder="teamdomain" />
+                        <input type="text" className="form-control" name="domain" ref="domain" placeholder="team domain" />
                     </div>
                     <div className="form-group">
                         <button type="submit" className="btn btn-primary">Continue</button>
                     </div>
                     <div>
-                        <span>Don't remember your {strings.TeamPlural} domain? <a href="/find_team">Find it here</a></span>
+                        <span>Don't remember your {strings.TeamPossessive} domain? <a href="/find_team">Find it here</a></span>
                     </div>
                     <br/>
                     <br/>
diff --git a/web/static/config/config.js b/web/static/config/config.js
index 5a12942c8..12cbb4019 100644
--- a/web/static/config/config.js
+++ b/web/static/config/config.js
@@ -33,6 +33,8 @@ var config = {
 var strings = {
     Team: "team",
     TeamPlural: "teams",
+    TeamPossessive: "team's",
     Company: "company",
-    CompanyPlural: "companies"
-}
+    CompanyPlural: "companies",
+    CompanyPossessive: "company's"
+};
-- 
cgit v1.2.3-1-g7c22


From 829f1f18086d11e1b8e20ebe9e3343d2d345f7d6 Mon Sep 17 00:00:00 2001
From: Reed Garmsen <rgarmsen2295@gmail.com>
Date: Wed, 17 Jun 2015 09:53:15 -0700
Subject: Simplified code changes

---
 config/config.json             | 1 -
 web/react/components/login.jsx | 4 ++--
 web/static/config/config.js    | 2 --
 3 files changed, 2 insertions(+), 5 deletions(-)

diff --git a/config/config.json b/config/config.json
index 3d2c26716..0ca072194 100644
--- a/config/config.json
+++ b/config/config.json
@@ -56,7 +56,6 @@
     "EmailSettings": {
         "SMTPUsername": "",
         "SMTPPassword": "",
-        "SMTPServer": "localhost:25",
 		"UseTLS": false,
         "FeedbackEmail": "feedback@xxxxxxmustbefilledin.com",
         "FeedbackName": "",
diff --git a/web/react/components/login.jsx b/web/react/components/login.jsx
index 85be3d45b..65f1da1f8 100644
--- a/web/react/components/login.jsx
+++ b/web/react/components/login.jsx
@@ -52,7 +52,7 @@ var FindTeamDomain = React.createClass({
                 <div>
                     <span className="signup-team__name">{ config.SiteName }</span>
                     <br/>
-                    <span className="signup-team__subdomain">Enter your {strings.TeamPossessive} domain.</span>
+                    <span className="signup-team__subdomain">Enter your {strings.Team}'s domain.</span>
                     <br/>
                     <br/>
                 </div>
@@ -65,7 +65,7 @@ var FindTeamDomain = React.createClass({
                         <button type="submit" className="btn btn-primary">Continue</button>
                     </div>
                     <div>
-                        <span>Don't remember your {strings.TeamPossessive} domain? <a href="/find_team">Find it here</a></span>
+                        <span>Don't remember your {strings.Team}'s domain? <a href="/find_team">Find it here</a></span>
                     </div>
                     <br/>
                     <br/>
diff --git a/web/static/config/config.js b/web/static/config/config.js
index 12cbb4019..a9a3e732e 100644
--- a/web/static/config/config.js
+++ b/web/static/config/config.js
@@ -33,8 +33,6 @@ var config = {
 var strings = {
     Team: "team",
     TeamPlural: "teams",
-    TeamPossessive: "team's",
     Company: "company",
     CompanyPlural: "companies",
-    CompanyPossessive: "company's"
 };
-- 
cgit v1.2.3-1-g7c22


From 4c44d0465b679dfaa56a637fdef32f8c2afc4b94 Mon Sep 17 00:00:00 2001
From: Reed Garmsen <rgarmsen2295@gmail.com>
Date: Wed, 17 Jun 2015 09:54:06 -0700
Subject: Removed unnecessary comma

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

diff --git a/web/static/config/config.js b/web/static/config/config.js
index a9a3e732e..82d4bbf70 100644
--- a/web/static/config/config.js
+++ b/web/static/config/config.js
@@ -34,5 +34,5 @@ var strings = {
     Team: "team",
     TeamPlural: "teams",
     Company: "company",
-    CompanyPlural: "companies",
+    CompanyPlural: "companies"
 };
-- 
cgit v1.2.3-1-g7c22


From 31d795b459c396d8e2e3df0ee11c096392109464 Mon Sep 17 00:00:00 2001
From: Reed Garmsen <rgarmsen2295@gmail.com>
Date: Wed, 17 Jun 2015 11:16:03 -0700
Subject: Fixing compatibility

---
 config/config.json | 1 +
 1 file changed, 1 insertion(+)

diff --git a/config/config.json b/config/config.json
index 0ca072194..6e5fb8d0e 100644
--- a/config/config.json
+++ b/config/config.json
@@ -56,6 +56,7 @@
     "EmailSettings": {
         "SMTPUsername": "",
         "SMTPPassword": "",
+        "SMTPServer": "",
 		"UseTLS": false,
         "FeedbackEmail": "feedback@xxxxxxmustbefilledin.com",
         "FeedbackName": "",
-- 
cgit v1.2.3-1-g7c22