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

Release Dev to QA #127

Merged
merged 6 commits into from
Jul 13, 2015
Merged

Release Dev to QA #127

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
76fbdce
SUP-438, Enhancement - Rewrite joined as Member Since on my dashboard
vikasrohit Jul 1, 2015
18f4f9a
Merge pull request #124 from appirio-tech/vikas-sup-438-joined-member…
Jul 1, 2015
40a4cbc
redirect all non https requests to https
thabofletcher Jul 13, 2015
3ddee45
cleanup obsolete analytics
thabofletcher Jul 13, 2015
7015994
Merge pull request #125 from appirio-tech/SUP-955-redirect-wp-https
thabofletcher Jul 13, 2015
6bf8598
Merge pull request #126 from appirio-tech/SUP-758-registration-analytics
thabofletcher Jul 13, 2015
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
32 changes: 0 additions & 32 deletions src/analytics.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,38 +5,6 @@
<script>Munchkin.init('921-UOU-112', {"wsInfo":"jFRS"});</script>
<!-- END Marketo Code -->

<!-- START Google Retargeting Marketing Code -->
<script type="text/javascript">
adroll_adv_id = "LOUA2FVRTJDYZC2BMX72Z7";
adroll_pix_id = "4XU6H3BYL5EQBFHZM4DIUU";
(function () {
var oldonload = window.onload;
window.onload = function(){
__adroll_loaded=true;
var scr = document.createElement("script");
var host = (("https:" == document.location.protocol) ? "https://s.adroll.com" : "http://a.adroll.com");
scr.setAttribute('async', 'true');
scr.type = "text/javascript";
scr.src = host + "/j/roundtrip.js";
((document.getElementsByTagName('head') || [null])[0] ||
document.getElementsByTagName('script')[0].parentNode).appendChild(scr);
if(oldonload){oldonload()}};
}());
</script>
<!-- END Google Retargeting Marketing Code -->


<!-- START Twitter Marketing Code -->
<script src="//platform.twitter.com/oct.js" type="text/javascript"></script>
<script type="text/javascript">
twttr.conversion.trackPid('l4r4k');
</script>
<noscript>
<img height="1" width="1" style="display:none;" alt="" src="https://analytics.twitter.com/i/adsct?txn_id=l4r4k&p_id=Twitter" />
<img height="1" width="1" style="display:none;" alt="" src="//t.co/i/adsct?txn_id=l4r4k&p_id=Twitter" />
</noscript>
<!-- END Twitter Marketing Code -->

<!-- START KISSmetrics -->
<script type="text/javascript">var _kmq = _kmq || [];
var _kmk = _kmk || 'aa23cd43c455ef33b6a0df3de81a79af9ea30f75';
Expand Down
4 changes: 1 addition & 3 deletions src/conf/tc-prod-nginx.conf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,9 +9,7 @@ server {
listen [::]:8080 default_server ipv6only=on;

if ($http_x_forwarded_proto != "https") {
rewrite ^/challenges https://$http_host$request_uri? permanent;
rewrite ^/challenge-details https://$http_host$request_uri? permanent;
rewrite ^/my-dashboard https://$http_host$request_uri? permanent;
return 301 https://$server_name$request_uri;
}

set $root_base /home/ubuntu/tc-site;
Expand Down
2 changes: 1 addition & 1 deletion src/js/app/my-dashboard/partials/welcome-back.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<div class="profile-image"><img width="130px" src="{{vm.photoLink}}"></div>
<div rel="upload-photo" ng-show="vm.showUploadPhotoLink"><a href="{{vm.uploadPhotoLink}}">Upload Photo</a></div>
<div class="handle" style="{{vm.ratingColor}}">{{vm.profile.handle}}</div>
<div class="doj">Joined: <span ng-bind="vm.profile.memberSince | date"></span></div>
<div class="doj">Member Since: <span ng-bind="vm.profile.memberSince | date"></span></div>
</div>
<div class="profile-right col-xs-12 col-sm-10">
<div class="col-xs-{{12/vm.statsToShow}}" ng-show="vm.profile && vm.profile.overallEarning > 0">
Expand Down