Skip to content

Commit

Permalink
merge #14 and rmtargetblank
Browse files Browse the repository at this point in the history
  • Loading branch information
Kasper Souren committed Dec 25, 2014
2 parents a52b9cd + 98f6d18 commit a79ba16
Show file tree
Hide file tree
Showing 5 changed files with 28 additions and 28 deletions.
2 changes: 1 addition & 1 deletion public/modules/pages/views/about.client.view.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,7 @@ <h3>Communities</h3>

<h3>Volunteering</h3>
<p>We appreciate a hard working, <em>getting things done</em> attitude and great ideas. We'll aim to keep the entry level <a href="https://github.com/Trustroots/trustroots/wiki/Volunteering">for volunteers</a> as low as possible. No bureaucracy. Pragmatic approach. Trust.</p>
<p>Right now structures for volunteering are a bit underway, but you can simply <a ui-sref="contact">drop us a line</a> and tell about your ideas! If you're a developer, check <a href="https://github.com/Trustroots/trustroots/wiki#development" target="_blank">GitHub</a>.</p>
<p>Right now structures for volunteering are a bit underway, but you can simply <a ui-sref="contact">drop us a line</a> and tell about your ideas! If you're a developer, check <a href="https://github.com/Trustroots/trustroots/wiki#development">GitHub</a>.</p>

</div>
<div class="col-xs-12 col-sm-6 col-md-4">
Expand Down
2 changes: 1 addition & 1 deletion public/modules/pages/views/home.client.view.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ <h3>
Hospitality exchange community for hitchhikers and other travellers.
</h3>
<p class="home-btw">
Same team brought you also <a href="http://hitchwiki.org" target="_blank">Hitchwiki</a>, <a href="http://trashwiki.org" target="_blank">Trashwiki</a>, <a href="http://nomadwiki.org" target="_blank">Nomadwiki</a> & more.
Same team brought you also <a href="http://hitchwiki.org">Hitchwiki</a>, <a href="http://trashwiki.org">Trashwiki</a>, <a href="http://nomadwiki.org">Nomadwiki</a> & more.
</p>
<br><br>
</div>
Expand Down
10 changes: 5 additions & 5 deletions public/modules/pages/views/privacy.client.view.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -28,15 +28,15 @@ <h3>Your data is yours</h3>

<h3>Analytics & opting out</h3>

Right now Trustroots uses <a href="http://www.google.com/analytics/">Google Analytics</a> to collect usage statistics and <a href="http://www.newrelic.com" target="_blank">New Relic</a> to monitor performance. We're looking into switching to an open source alternative <a href="http://piwik.org/" target="_blank">Piwik</a>, but running Piwik isn't that straightforward. We hope you understand and let us know if you could help us with that!
Right now Trustroots uses <a href="http://www.google.com/analytics/">Google Analytics</a> to collect usage statistics and <a href="http://www.newrelic.com">New Relic</a> to monitor performance. We're looking into switching to an open source alternative <a href="http://piwik.org/">Piwik</a>, but running Piwik isn't that straightforward. We hope you understand and let us know if you could help us with that!

<br><br>

To opt-out of Google Analytics tracking, you could install Google's official <a href="https://tools.google.com/dlpage/gaoptout" target="_blank">opt out extension</a>. To opt-out of all tracking (including Google Analytics and Piwik) you can install <a href="https://www.ghostery.com/" target="_blank">Ghostery</a>, <a href="https://addons.mozilla.org/en-US/firefox/addon/noscript/" target="_blank">Noscript</a> or <a href="https://disconnect.me/" target="_blank">Disconnect</a>. These browser extensions will disable all known JavaScript trackers and ensure that your browser does not send a request to external tracking servers.
To opt-out of Google Analytics tracking, you could install Google's official <a href="https://tools.google.com/dlpage/gaoptout">opt out extension</a>. To opt-out of all tracking (including Google Analytics and Piwik) you can install <a href="https://www.ghostery.com/">Ghostery</a>, <a href="https://addons.mozilla.org/en-US/firefox/addon/noscript/">Noscript</a> or <a href="https://disconnect.me/">Disconnect</a>. These browser extensions will disable all known JavaScript trackers and ensure that your browser does not send a request to external tracking servers.

<br><br>

If you wish to stay completely anonymous online, please check this guide by Piwik: <a href="http://piwik.org/wp-content/uploads/2012/01/How-to-remain-anonymous-online.pdf" target="_blank">How to remain anonymous online? (PDF)</a>.
If you wish to stay completely anonymous online, please check this guide by Piwik: <a href="http://piwik.org/wp-content/uploads/2012/01/How-to-remain-anonymous-online.pdf">How to remain anonymous online? (PDF)</a>.


<h3>Social networks</h3>
Expand All @@ -49,11 +49,11 @@ <h3>Social networks</h3>

<h3>Your emails</h3>

We route all our emails using <a href="http://mandrillapp.com" target="_blank">Mandrill</a>. They're reliable, professional and we trust them. They do much better job than we could ever do and privacy wise using their service equals to buying a server space from somewhere else.
We route all our emails using <a href="http://mandrillapp.com">Mandrill</a>. They're reliable, professional and we trust them. They do much better job than we could ever do and privacy wise using their service equals to buying a server space from somewhere else.

<br><br>

If you subscribe to our newsletters, your email will be stored at <a href="http://www.mailchimp.com" target="_blank">MailChimp</a> since we use them to send newsletters. MailChimp and Mandrill are the same company, just via Mandrill nothing is stored.
If you subscribe to our newsletters, your email will be stored at <a href="http://www.mailchimp.com">MailChimp</a> since we use them to send newsletters. MailChimp and Mandrill are the same company, just via Mandrill nothing is stored.


<h3>Our server</h3>
Expand Down
38 changes: 19 additions & 19 deletions public/modules/pages/views/team.client.view.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
<a ui-sref="home" class="logo logo-sm logo-blue center-block"></a>
<hr/>
<p class="lead">
We are a group of hospitality exchange enthusiasts with backgrounds in some notable projects. The same people who also brought you <a href="http://hitchwiki.org" target="_blank">Hitchwiki</a>, <a href="http://trashwiki.org" target="_blank">Trashwiki</a>, <a href="http://nomadwiki.org" target="_blank">Nomadwiki</a> & more.
We are a group of hospitality exchange enthusiasts with backgrounds in some notable projects. The same people who also brought you <a href="http://hitchwiki.org/">Hitchwiki</a>, <a href="http://trashwiki.org/">Trashwiki</a>, <a href="http://nomadwiki.org/">Nomadwiki</a> & more.
</p>
<hr/>
</div>
Expand All @@ -29,10 +29,10 @@ <h4 class="media-heading">Mikael</h4>
Volunteering in big freegan projects such as Hitchwiki, Hitchgathering festival, Nomadwiki and Trashwiki since 2008. In the past has volunteered for BeWelcome (2013). I'm a big advocate of free/gift economy and want to bring more trust into the world.
</p>
<p>
<a href="http://www.mikaelkorpela.fi" class="text-muted" target="_blank">mikaelkorpela.fi</a>
<a href="https://twitter.com/simison" target="_blank"><i class="text-muted fa fa-fw fa-twitter"></i></a>
<a href="https://github.com/simison" target="_blank"><i class="text-muted fa fa-fw fa-github"></i></a>
<a href="http://www.linkedin.com/in/mikaelkorpela" target="_blank"><i class="text-muted fa fa-fw fa-linkedin"></i></a>
<a href="http://www.mikaelkorpela.fi" class="text-muted">mikaelkorpela.fi</a>
<a href="https://twitter.com/simison"><i class="text-muted fa fa-fw fa-twitter"></i></a>
<a href="https://github.com/simison"><i class="text-muted fa fa-fw fa-github"></i></a>
<a href="http://www.linkedin.com/in/mikaelkorpela"><i class="text-muted fa fa-fw fa-linkedin"></i></a>
</p>
</div>
</div>
Expand All @@ -48,7 +48,7 @@ <h4 class="media-heading">Carlos</h4>
Love to travel, passionate and enthusiastic about share economy and hospitality exchange as human development tools. Volunteered CouchSurfing from 2008 to 2010 as well as other NGOs.
</p>
<p>
<a href="https://www.linkedin.com/pub/carlos-cardenas/26/711/19" target="_blank"><i class="text-muted fa fa-fw fa-linkedin"></i></a>
<a href="https://www.linkedin.com/pub/carlos-cardenas/26/711/19"><i class="text-muted fa fa-fw fa-linkedin"></i></a>
</p>
</div>
</div>
Expand All @@ -64,7 +64,7 @@ <h4 class="media-heading">Natalia</h4>
Coming from a multinational business background, Natalia is an enthusiastic of the share and gift economy. Veteran globetrotter and volunteer for different NGOs from hospex as Couchsurfing to nonprofit lobbying orgs.
</p>
<p>
<a href="https://www.linkedin.com/pub/natalia-s%C3%A1enz-alban%C3%A9s/27/692/384" target="_blank"><i class="text-muted fa fa-fw fa-linkedin"></i></a>
<a href="https://www.linkedin.com/pub/natalia-s%C3%A1enz-alban%C3%A9s/27/692/384"><i class="text-muted fa fa-fw fa-linkedin"></i></a>
</p>
</div>
</div>
Expand All @@ -83,10 +83,10 @@ <h4 class="media-heading">Callum</h4>
Long term nomad and technology expert. Volunteered for BeWelcome BoD in 2013 and for CouchSurfing in 2007.
</p>
<p>
<a href="http://www.callum-macdonald.com" class="text-muted" target="_blank">callum-macdonald.com</a>
<a href="https://twitter.com/chmac" target="_blank"><i class="text-muted fa fa-fw fa-twitter"></i></a>
<a href="https://github.com/chmac" target="_blank"><i class="text-muted fa fa-fw fa-github"></i></a>
<a href="http://www.linkedin.com/in/chmac" target="_blank"><i class="text-muted fa fa-fw fa-linkedin"></i></a>
<a href="http://www.callum-macdonald.com" class="text-muted">callum-macdonald.com</a>
<a href="https://twitter.com/chmac"><i class="text-muted fa fa-fw fa-twitter"></i></a>
<a href="https://github.com/chmac"><i class="text-muted fa fa-fw fa-github"></i></a>
<a href="http://www.linkedin.com/in/chmac"><i class="text-muted fa fa-fw fa-linkedin"></i></a>
</p>
</div>
</div>
Expand All @@ -101,13 +101,13 @@ <h4 class="media-heading">Callum</h4>
<div class="media-body">
<h4 class="media-heading">Kasper</h4>
<p class="text-color-links">
Founded multiple popular and trusted websites such as <a href="http://hitchwiki.org" target="_blank">Hitchwiki</a>, <a href="http://trashwiki.org" target="_blank">Trashwiki</a>, <a href="http://nomadwiki.org" target="_blank">Nomadwiki</a>, <a href="http://couchwiki.org">Couchwiki</a>, <a href="http://coinwiki.info" target="_blank">Coinwiki</a> and <a href="http://deletionpedia.org" target="_blank">Deletionpedia</a>. Volunteered for CouchSurfing as a tech team coordinator in 2006 and 2007 and for <a href="http://bewelcome.org" target="_blank">BeWelcome</a> since 2007.
Founded multiple popular and trusted websites such as <a href="http://hitchwiki.org">Hitchwiki</a>, <a href="http://trashwiki.org">Trashwiki</a>, <a href="http://nomadwiki.org">Nomadwiki</a>, <a href="http://couchwiki.org">Couchwiki</a>, <a href="http://coinwiki.info">Coinwiki</a> and <a href="http://deletionpedia.org">Deletionpedia</a>. Volunteered for CouchSurfing as a tech team coordinator in 2006 and 2007 and for <a href="http://bewelcome.org">BeWelcome</a> since 2007.
</p>
<p>
<a href="http://kasper.re" target="_blank" class="text-muted">kasper.re</a>
<a href="https://twitter.com/guaka" target="_blank"><i class="text-muted fa fa-fw fa-twitter"></i></a>
<a href="https://github.com/guaka" target="_blank"><i class="text-muted fa fa-fw fa-github"></i></a>
<a href="http://www.linkedin.com/in/guaka" target="_blank"><i class="text-muted fa fa-fw fa-linkedin"></i></a>
<a href="http://kasper.re" class="text-muted">kasper.re</a>
<a href="https://twitter.com/guaka"><i class="text-muted fa fa-fw fa-twitter"></i></a>
<a href="https://github.com/guaka"><i class="text-muted fa fa-fw fa-github"></i></a>
<a href="http://www.linkedin.com/in/guaka"><i class="text-muted fa fa-fw fa-linkedin"></i></a>
</p>
</div>
</div>
Expand Down Expand Up @@ -135,9 +135,9 @@ <h4 class="media-heading">Kasper</h4>
<p class="love">Give us some <i class="fa fa-heart"></i> at:</p>
<div class="btn-group">
<a href="http://ideas.trustroots.org" class="btn btn-link btn-lg">Blog</a>
<a href="https://github.com/Trustroots" class="btn btn-link btn-lg" target="_blank">Github</a>
<a href="https://www.facebook.com/trustroots.org" class="btn btn-link btn-lg" target="_blank">Facebook</a>
<a href="https://twitter.com/trustroots" class="btn btn-link btn-lg" target="_blank">Twitter</a>
<a href="https://github.com/Trustroots" class="btn btn-link btn-lg">Github</a>
<a href="https://www.facebook.com/trustroots.org" class="btn btn-link btn-lg">Facebook</a>
<a href="https://twitter.com/trustroots" class="btn btn-link btn-lg">Twitter</a>
</div>
<br><br>
</div>
Expand Down
4 changes: 2 additions & 2 deletions public/modules/statistics/controllers/statistics.client.controller.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@
angular.module('statistics').controller('StatisticsController', ['$scope', 'Statistics',
function($scope, Statistics) {

// Yay!
$scope.launchDate = new Date(2014, 12, 23);
// Dec 23, 2014
$scope.launchDate = new Date(2014, 11, 23);

$scope.statistics = Statistics.get();

Expand Down

0 comments on commit a79ba16

Please sign in to comment.