From 5a1d43e3aa3e377f7e3aaf22eab4dcba5ad48d10 Mon Sep 17 00:00:00 2001 From: Tom Ladendorf Date: Tue, 4 Apr 2017 18:49:23 +0200 Subject: [PATCH 1/5] temp revert --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index b2b58431f..7ea43c30d 100644 --- a/package.json +++ b/package.json @@ -57,7 +57,7 @@ "appirio-styles": "0.x.x", "appirio-tech-ng-iso-constants": "^1.0.6", "appirio-tech-ng-ui-components": "^2.1.2", - "appirio-tech-react-components": "appirio-tech/react-components.git#tom-styling-fixes", + "appirio-tech-react-components": "appirio-tech/react-components.git#tom-fix-tech-url", "auth0-angular": "^4.1.0", "auth0-js": "^6.8.0", "d3": "^3.5.14", From 8ea106b9968a208b1e005040eeb9450871488b12 Mon Sep 17 00:00:00 2001 From: shubhu Date: Tue, 4 Apr 2017 23:53:15 +0530 Subject: [PATCH 2/5] fixed #1141 removed feedback widget --- app/listings/listings.controller.js | 11 ----------- 1 file changed, 11 deletions(-) diff --git a/app/listings/listings.controller.js b/app/listings/listings.controller.js index f709102f5..606e00dc4 100755 --- a/app/listings/listings.controller.js +++ b/app/listings/listings.controller.js @@ -25,17 +25,6 @@ import { loadUser } from '../services/userv3.service.js' function activate() { - // add usersnap widget to /listings/ route - (function() { - var s = document.createElement('script') - s.type = 'text/javascript' - s.async = true - s.src = '//api.usersnap.com/load/'+ - '3e7c8f0c-6cf6-41b6-9f2c-e8e4e60dfc59.js' - var x = document.getElementById('react-component') - x.appendChild(s, x) - })() - $scope.myChallenges = [] $scope.reactProps = { config: CONSTANTS, From dc7fe795bff56b86cfc50144458985a11e597413 Mon Sep 17 00:00:00 2001 From: Tom Ladendorf Date: Tue, 4 Apr 2017 23:44:49 +0200 Subject: [PATCH 3/5] re-revert dev --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 7ea43c30d..b2b58431f 100644 --- a/package.json +++ b/package.json @@ -57,7 +57,7 @@ "appirio-styles": "0.x.x", "appirio-tech-ng-iso-constants": "^1.0.6", "appirio-tech-ng-ui-components": "^2.1.2", - "appirio-tech-react-components": "appirio-tech/react-components.git#tom-fix-tech-url", + "appirio-tech-react-components": "appirio-tech/react-components.git#tom-styling-fixes", "auth0-angular": "^4.1.0", "auth0-js": "^6.8.0", "d3": "^3.5.14", From 2a79bef2f2007bf0f4da2ece6a4c7152c73a783b Mon Sep 17 00:00:00 2001 From: Tom Ladendorf Date: Wed, 5 Apr 2017 00:44:36 +0200 Subject: [PATCH 4/5] revert for testing purposes --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index b2b58431f..7ea43c30d 100644 --- a/package.json +++ b/package.json @@ -57,7 +57,7 @@ "appirio-styles": "0.x.x", "appirio-tech-ng-iso-constants": "^1.0.6", "appirio-tech-ng-ui-components": "^2.1.2", - "appirio-tech-react-components": "appirio-tech/react-components.git#tom-styling-fixes", + "appirio-tech-react-components": "appirio-tech/react-components.git#tom-fix-tech-url", "auth0-angular": "^4.1.0", "auth0-js": "^6.8.0", "d3": "^3.5.14", From 9e55d5ca09da4fd6c110fb47bceedfb90d3de198 Mon Sep 17 00:00:00 2001 From: Tom Ladendorf Date: Wed, 5 Apr 2017 15:49:02 +0200 Subject: [PATCH 5/5] revert to main react-components branch --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 7ea43c30d..b2b58431f 100644 --- a/package.json +++ b/package.json @@ -57,7 +57,7 @@ "appirio-styles": "0.x.x", "appirio-tech-ng-iso-constants": "^1.0.6", "appirio-tech-ng-ui-components": "^2.1.2", - "appirio-tech-react-components": "appirio-tech/react-components.git#tom-fix-tech-url", + "appirio-tech-react-components": "appirio-tech/react-components.git#tom-styling-fixes", "auth0-angular": "^4.1.0", "auth0-js": "^6.8.0", "d3": "^3.5.14",