Merge remote-tracking branch 'upstream/master' into vichan-merge

This commit is contained in:
Simon McFarlane 2015-05-26 23:31:47 -07:00
commit 4b40f69a4e
223 changed files with 65256 additions and 2969 deletions

View file

@ -8,7 +8,7 @@
<a href="http://regex.info/exif.cgi?url={{ config.domain }}{{ config.uri_img }}{{ file.file }}" target="_blank">Exif</a>
{% endif %}
{% if config.image_identification_google %}
<a href="https://www.google.com/searchbyimage?image_url={{ config.domain }}{{ config.uri_img }}{{ file.file }}" target="_blank">Google</a>
<a href="https://www.google.com/searchbyimage?image_url={{ config.domain|url_encode }}{{ config.uri_img|url_encode }}{{ file.file|url_encode }}" target="_blank">Google</a>
{% endif %}
{% if config.image_identification_iqdb %}
<a href="http://iqdb.org/?url={{ config.domain }}{{ config.uri_img }}{{ file.file }}" target="_blank">iqdb</a>

View file

@ -1,5 +1,5 @@
{% set capcode = post.capcode|capcode %}
{% if post.email|length > 0 %}
{% if post.email|length > 0 and (config.hide_sage!=true or post.email!='sage') %}
{# start email #}
<a class="email" href="mailto:{{ post.email }}">
{% endif %}

View file

@ -1,7 +1,7 @@
{% if config.poster_ids %}
{% if post.thread %}
ID: {{ post.ip|poster_id(post.thread) }}
ID: <span class="poster_id">{{ post.ip|poster_id(post.thread) }}</span>
{% else %}
ID: {{ post.ip|poster_id(post.id) }}
ID: <span class="poster_id">{{ post.ip|poster_id(post.id) }}</span>
{% endif %}
{% endif %}