Merge branch 'master' of https://github.com/hailey/sms-proj

app.py

@@ -148,7 +148,7 @@ def submitMessage():
     else:
         msgTS = time.strftime("%Y-%m-%dT%H:%m:%SZ")
         appdb.logsms_db(msg_id, msgTS, 'outbound', uglyphone, fromDid, 0.0040, 'pending', message, result)
-        returndata = json.dumps({"msg" : message, "fromdid" : fromDid, 'targetdid' : targetDid,})
+        returndata = json.dumps({"msg" : message, "fromdid" : fromDid, 'targetdid' : targetDid})
     return returndata
 
 @app.route('/testAjax')

templates/include/footer.html

@@ -3,7 +3,7 @@
     {% if loggedin == True %}
          | Messages | <a href='/settings'>Settings</a> | <a href="/google/logout">Logout</a></div>
     {% else %}
-    | <a href="/google/login">Login</a></div>
+    | <a href="/launch">Login</a></div>
     {% endif %}
     <div class='footlinks'><a href ='/about'>About</a> <a href='/tos'>Terms of Service</a> | <a href="/pp">Privacy Policy</a></div>
 </div>