Merge branch 'v2' of github.com:neocities/neocities into v2

This commit is contained in:
Victoria Wang 2014-10-13 18:05:57 -07:00
commit a6b01bc004
2 changed files with 10 additions and 1 deletions

View file

@ -0,0 +1,9 @@
Sequel.migration do
up {
DB.add_column :tags, :is_nsfw, :boolean, default: false, index: true
}
down {
DB.drop_column :tags, :is_nsfw
}
end

View file

@ -37,7 +37,7 @@
</form>
<h3>Flattr</h3>
<script id='flattrbtn'>(function(i){var f,s=document.getElementById(i);f=document.createElement('iframe');f.src='//api.flattr.com/button/view/?uid=kyledrake&url='+encodeURIComponent(document.URL);f.title='Flattr';f.height=62;f.width=55;f.style.borderWidth=0;s.parentNode.insertBefore(f,s);})('flattrbtn');</script>
<script id='flattrbtn'>(function(i){var f,s=document.getElementById(i);f=document.createElement('iframe');f.src='//api.flattr.com/button/view/?uid=kyledrake&url='+encodeURIComponent(document.URL);f.title='Flattr';f.height=100;f.width=100;f.style.borderWidth=0;s.parentNode.insertBefore(f,s);})('flattrbtn');</script>
<h4 style="margin-top: 30px; margin-bottom: 30px">Thanks. You are great! <a href="/new">Now go and make an awesome web site!</a></h4>
</section>
</article>