Merge branch 'develop'

This commit is contained in:
Ian Adam Naval 2014-02-15 11:25:25 -05:00
commit 42df68de55
3 changed files with 14 additions and 10 deletions

View File

@ -11,7 +11,7 @@ server {
error_log /var/log/nginx/ianonavy.error.log;
if ($host != 'ianonavy.com') {
rewrite ^/(.*)$ http://ianonavy.com/$1 permanent;
rewrite ^/(.*)$ https://ianonavy.com/$1 permanent;
}
root /var/sites/ianonavy.com/www;

View File

@ -40,37 +40,37 @@
<div id="portfolio-items" class="">
<div class="portfolio-item center-wrapped">
<a href="http://mirrors.acm.wpi.edu/"><img src="{{ url_for('static', filename='img/mirrors.png') }}" alt="WPI ACM Mirrors screenshot" class="screenshot"></a>
<a target="_blank" href="http://mirrors.acm.wpi.edu/"><img src="{{ url_for('static', filename='img/mirrors.png') }}" alt="WPI ACM Mirrors screenshot" class="screenshot"></a>
<h3>WPI ACM Mirrors</h3>
<p>GNU/Linux mirrors for WPI folk.</p>
</div>
<div class="portfolio-item center-wrapped">
<a href="http://acm.wpi.edu/"><img src="{{ url_for('static', filename='img/acm.png') }}" alt="WPI ACM Website screenshot" class="screenshot"></a>
<a target="_blank" href="http://acm.wpi.edu/"><img src="{{ url_for('static', filename='img/acm.png') }}" alt="WPI ACM Website screenshot" class="screenshot"></a>
<h3>WPI ACM Website</h3>
<p>Homepage for the WPI ACM chapter.</p>
</div>
<div class="portfolio-item center-wrapped">
<a href="http://sms-fixer.ianonavy.com/"><img src="{{ url_for('static', filename='img/sms-fixer.png') }}" alt="SMS Fixer screenshot" class="screenshot"></a>
<a target="_blank" href="http://sms-fixer.ianonavy.com/"><img src="{{ url_for('static', filename='img/sms-fixer.png') }}" alt="SMS Fixer screenshot" class="screenshot"></a>
<h3>SMS Fixer</h3>
<p>Helps restore Android texts from Google Voice.</p>
</div>
<div class="portfolio-item center-wrapped">
<a href="http://potatoipsum.com/"><img src="{{ url_for('static', filename='img/potatoipsum.png') }}" alt="Potato Ipsum screenshot" class="screenshot"></a>
<a target="_blank" href="http://potatoipsum.com/"><img src="{{ url_for('static', filename='img/potatoipsum.png') }}" alt="Potato Ipsum screenshot" class="screenshot"></a>
<h3>Potato Ipsum</h3>
<p>Lorem ipsum generator. With potatoes.</p>
</div>
<div class="portfolio-item center-wrapped">
<a href="https://play.google.com/store/apps/details?id=com.mathhammer40k.mathhammer&amp;hl=en"><img src="{{ url_for('static', filename='img/mathhammer.png') }}" alt="MathHammer screenshot" class="screenshot"></a>
<a target="_blank" href="https://play.google.com/store/apps/details?id=com.mathhammer40k.mathhammer&amp;hl=en"><img src="{{ url_for('static', filename='img/mathhammer.png') }}" alt="MathHammer screenshot" class="screenshot"></a>
<h3>MathHammer 40k</h3>
<p>Damage stats calculator app for WarHammer 40k.</p>
</div>
<div class="portfolio-item center-wrapped">
<a href="https://play.google.com/store/apps/details?id=com.ianonavy.spammer&amp;hl=en"><img src="{{ url_for('static', filename='img/smspammer.png') }}" alt="SMSpammer screenshot" class="screenshot"></a>
<a target="_blank" href="https://play.google.com/store/apps/details?id=com.ianonavy.spammer&amp;hl=en"><img src="{{ url_for('static', filename='img/smspammer.png') }}" alt="SMSpammer screenshot" class="screenshot"></a>
<h3>SMSpammer</h3>
<p>App for spamming text messages. <span class="cheeky-aside">(With permission.)</span></p>
</div>

View File

@ -4,8 +4,12 @@
{% block main %}
<div class="section">
<h2>Labs</h2>
<p>Welcome to my lab! This where I run all my experimental stuff. My <a href="https://git.ianonavy.com/public">private Git server</a> has some public repositories if you are interested.</p>
<p>I also use <a href="http://demo.ianonavy.com/">demo.ianonavy.com</a> as a general purpose staging site. Check it out to see what I'm working on now!</p>
<h2>Labs</h2>
<p>Welcome to my lab! This where I run all my experimental stuff. My <a href="https://git.ianonavy.com/public">private Git server</a> has some public repositories if you are interested.</p>
<p>I also use <a href="http://demo.ianonavy.com/">demo.ianonavy.com</a> as a general purpose staging site. Check it out to see what I'm working on now!</p>
</div>
<div class="section">
<h2>Floppy Pig</h2>
<p>Just a small little <a href="http://floppypig.ianonavy.com/">game</a> I'm working on right now in my free time.</p>
</div>
{% endblock main %}