Merge branch '4.5' of github.com:vichan-devel/Tinyboard into HEAD

Conflicts:
	templates/themes/basic/index.html
This commit is contained in:
czaks 2014-06-20 23:27:34 +02:00
commit 73177fcffc
318 changed files with 3218 additions and 832 deletions

View file

@ -1,3 +1,7 @@
{% if config.poster_ids %}
ID: {{ post.ip|poster_id(post.id) }}
{% if post.thread %}
ID: {{ post.ip|poster_id(post.thread) }}
{% else %}
ID: {{ post.ip|poster_id(post.id) }}
{% endif %}
{% endif %}

Binary file not shown.

Before

Width:  |  Height:  |  Size: 9.1 KiB

After

Width:  |  Height:  |  Size: 7.7 KiB

Before After
Before After

Binary file not shown.

Before

Width:  |  Height:  |  Size: 9.7 KiB

After

Width:  |  Height:  |  Size: 8.6 KiB

Before After
Before After

Binary file not shown.

Before

Width:  |  Height:  |  Size: 7.4 KiB

After

Width:  |  Height:  |  Size: 6.2 KiB

Before After
Before After

Binary file not shown.

Before

Width:  |  Height:  |  Size: 24 KiB

After

Width:  |  Height:  |  Size: 22 KiB

Before After
Before After

Binary file not shown.

Before

Width:  |  Height:  |  Size: 15 KiB

After

Width:  |  Height:  |  Size: 13 KiB

Before After
Before After