Merge pull request #113 from mitmedialab/oauth

Integrate OAuth authentication instead of Persona, recommendation system changes
mitmedialab · May 1, 2017 · 0e02e99 · 0e02e99
2 parents 149c7a6 + 5e682b8
commit 0e02e99
Show file tree

Hide file tree

Showing 19 changed files with 1,643 additions and 1,597 deletions.
diff --git a/.gitignore b/.gitignore
@@ -124,3 +124,8 @@ analysis/Download_ExportCityClicks_07172014,json
 analysis/Download_ExportCityClicks_07172014.json
 
 analysis/images/cityclicks.png
+
+www/venv/*
+
+
+HANDY_SNIPPETS.txt
diff --git a/HANDY_SNIPPETS.txt b/HANDY_SNIPPETS.txt
diff --git a/extension/app.js b/extension/app.js
@@ -1,29 +1,27 @@
 App = {
-	
+
 	config: {
 		debug: true
 	},
-	
+
 	initialize: function (cityID, isRandomCity) {
 		App.debug('App.initialize()');
 		App.instance = this;
-		
+
 		/*
 			From the extension.config.js
 		*/
 		App.serverURL = SERVER_URL;
 		App.loginURL = LOGIN_URL;
-		
+
 		this.router = new App.Router({"cityID":cityID, "isRandomCity":isRandomCity})
 		this.router.navigate('');
 		Backbone.history.start();
-		App.log	
 	},
-	
+
 	debug: function (message) {
 		if (App.config.debug) {
 			console.log(message);
 		}
 	},
 }
-