Skip to content
This repository was archived by the owner on Mar 4, 2025. It is now read-only.

Listings release 6 12 2017 #1210

Merged
merged 6 commits into from
Jun 12, 2017
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions app/profile/about/about.controller.js
Original file line number Diff line number Diff line change
Expand Up @@ -41,8 +41,8 @@ import angular from 'angular'

profileVm.statsPromise.then(function() {
vm.categories = profileVm.categories
vm.marathonRating = profileVm.categories['MARATHON_MATCH'] && profileVm.categories['MARATHON_MATCH'].rating
vm.SRMRating = profileVm.categories['SRM'] && profileVm.categories['SRM'].rating
vm.marathonRating = profileVm.categories && profileVm.categories['MARATHON_MATCH'] && profileVm.categories['MARATHON_MATCH'].rating
vm.SRMRating = profileVm.categories && profileVm.categories['SRM'] && profileVm.categories['SRM'].rating
vm.displaySection.stats = profileVm.showEditProfileLink
})

Expand Down
12 changes: 4 additions & 8 deletions assets/scripts/google.analytics.jade
Original file line number Diff line number Diff line change
@@ -1,9 +1,5 @@
script(type="text/javascript").
(function(i,s,o,g,r,a,m){i['GoogleAnalyticsObject']=r;i[r]=i[r]||function(){
(i[r].q=i[r].q||[]).push(arguments)},i[r].l=1*new Date();a=s.createElement(o),
m=s.getElementsByTagName(o)[0];a.async=1;a.src=g;m.parentNode.insertBefore(a,m)
})(window,document,'script','//www.google-analytics.com/analytics.js','__gaTracker');
__gaTracker('create', 'UA-6340959-1', 'auto');
__gaTracker('set', 'forceSSL', true);
__gaTracker('require', 'displayfeatures');
__gaTracker('send','pageview');
!function(){var analytics=window.analytics=window.analytics||[];if(!analytics.initialize)if(analytics.invoked)window.console&&console.error&&console.error("Segment snippet included twice.");else{analytics.invoked=!0;analytics.methods=["trackSubmit","trackClick","trackLink","trackForm","pageview","identify","reset","group","track","ready","alias","debug","page","once","off","on"];analytics.factory=function(t){return function(){var e=Array.prototype.slice.call(arguments);e.unshift(t);analytics.push(e);return analytics}};for(var t=0;t<analytics.methods.length;t++){var e=analytics.methods[t];analytics[e]=analytics.factory(e)}analytics.load=function(t){var e=document.createElement("script");e.type="text/javascript";e.async=!0;e.src=("https:"===document.location.protocol?"https://":"http://")+"cdn.segment.com/analytics.js/v1/"+t+"/analytics.min.js";var n=document.getElementsByTagName("script")[0];n.parentNode.insertBefore(e,n)};analytics.SNIPPET_VERSION="4.0.0";
analytics.load("WEjBoGYCPGzGrNDmf7V4eQsMOsJroeyr");
analytics.page();
}}();
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -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#listings-release-v3",
"auth0-angular": "^4.1.0",
"auth0-js": "^6.8.0",
"d3": "^3.5.14",
Expand Down