1
0
mirror of https://github.com/vichan-devel/vichan.git synced 2024-11-26 08:20:58 +01:00
Commit Graph

3185 Commits

Author SHA1 Message Date
anonfagola
77b2caa284 Update instance-config.php
Fix https://github.com/ctrlcctrlv/8chan/issues/62
2014-09-25 10:46:33 -07:00
Fredrick Brennan
f11da66e3d Merge pull request #65 from hatstand0/patch-2
Add file md5 to API
2014-09-25 12:37:17 -04:00
Fredrick Brennan
ad17f3e95b Merge pull request #51 from anonfagola/patch-6
Made threadscroll.js a default additional JS
2014-09-25 12:36:18 -04:00
hatstand0
e26ce2c610 Add file hash to API
The API currently lacks the Base64 encoded file hash 4chan's API provides, which assists in file de-duplication by archive software.
2014-09-26 00:09:14 +10:00
hatstand0
ebd85c1fd6 Fix thumbnail width/height in API
The API currently has the thumbnail widths and heights switched around
2014-09-25 23:42:41 +10:00
Morgan Bazalgette (Howl)
c72e1fcb1d Merge pull request #1 from ctrlcctrlv/master
fucking git how do i merge to my current repo without making it notice to all the people that committed that
2014-09-25 15:10:20 +02:00
undido
37ac3fbe9e Added recaptcha support to create.php 2014-09-25 08:18:27 -03:00
undido
03b142b847 removed var_dump 2014-09-25 08:06:16 -03:00
undido
b24ec23cbb inc/mod/pages.php only show your board in boardlist if you are ranked below admin 2014-09-25 07:57:51 -03:00
undido
ff68278111 renamed playgame config field to ayah_enabled 2014-09-25 07:08:55 -03:00
undido
9c0436269f disable ayah 'game' on create.php by default added option to turn it on in /inc/config.php with explaination on where to put private keys at 2014-09-25 06:58:44 -03:00
anonfagola
14148b1292 Made threadscroll.js a default additional JS 2014-09-24 16:54:49 -07:00
8chan
416a48838c Add timer to auto reload js 2014-09-24 21:30:57 +00:00
TheHowl
eee2cf82d4 Make ayah optional 2014-09-24 22:35:59 +02:00
8chan
2afb2b4e7b Require secrets.php 2014-09-24 20:19:58 +00:00
8chan
102559751a Require secrets.php 2014-09-24 20:19:58 +00:00
8chan
e94ae94f6c Add extra non-synced file for 8chan.co secrets (passwords etc) 2014-09-24 20:17:59 +00:00
8chan
4eb31555fc Add update button to auto-reload.js 2014-09-24 20:14:02 +00:00
8chan
f0e58a02d2 Merge https://github.com/vichan-devel/vichan
Conflicts:
	README.md
2014-09-24 19:42:45 +00:00
fourfivesix
795b2646ea Uncommenting catalog_link, it is now required
`$config['catalog_link']` is now required because `templates/main.js` uses it.
2014-09-24 14:36:03 -03:00
czaks
3b2f448102 restore compatibility with php < 5.5; fixes vichan-devel#86 2014-09-24 12:26:15 +02:00
8chan
c090ad7fff We open source nao 2014-09-24 04:27:14 +00:00
8chan
fb405c9cf0 Reject repost option in ?/settings 2014-09-24 04:25:55 +00:00
czaks
ba49bc6c37 update locales 2014-09-24 03:48:46 +02:00
8chan
b682c5861a Merge https://github.com/ctrlcctrlv/8chan
Conflicts:
	README.md
	banners.php
	create.php
	inc/instance-config.php
2014-09-24 00:07:56 +00:00
8chan
da9ee32c2b add htmlpurifier library 2014-09-23 23:25:04 +00:00
8chan
1e479f5a2e Fix #13 2014-09-23 23:22:41 +00:00
8chan
9acbfe4d98 Add AYAH library to repo 2014-09-23 19:46:51 +00:00
8chan
d5bce0bf04 Merge ../http 2014-09-23 15:32:19 +00:00
8chan
fa28b5b370 Merge ../http 2014-09-23 15:32:19 +00:00
8chan
a2a15c761c Allow SWF, fix \rule breaking /b/ (temporarily) 2014-09-23 15:31:52 +00:00
8chan
9adee6016c Allow SWF, fix \rule breaking /b/ (temporarily) 2014-09-23 15:31:52 +00:00
8chan
f8e55b3143 Merge ../http
Conflicts:
	create.php
	inc/instance-config.php
2014-09-23 15:30:03 +00:00
8chan
ff6831e51c Merge ../http
Conflicts:
	create.php
	inc/instance-config.php
2014-09-23 15:30:03 +00:00
8chan
0764a8ead8 Apologies for this huge shitty commit. Git got corrupted. Contains a merge, change to katex, stylesheets, lots of shit really. ;_; 2014-09-22 18:29:06 -07:00
8chan
3675caadfc Apologies for this huge shitty commit. Git got corrupted. Contains a merge, change to katex, stylesheets, lots of shit really. ;_; 2014-09-22 18:29:06 -07:00
Fredrick Brennan
a8be948f7d Merge https://github.com/vichan-devel/vichan
Conflicts:
	inc/bans.php
	js/favorites.js
2014-09-21 18:04:10 +00:00
Fredrick Brennan
300ec2a295 Merge https://github.com/vichan-devel/vichan
Conflicts:
	inc/bans.php
	js/favorites.js
2014-09-21 18:04:10 +00:00
Fredrick Brennan
19d6db9a44 Config changes 2014-09-21 17:51:42 +00:00
Fredrick Brennan
6ea0f26ce4 Config changes 2014-09-21 17:51:42 +00:00
czaks
92183e8e39 add portuguese (portugal) translation by Chorizo 2014-09-21 08:37:16 +02:00
czaks
6b968ce50a add portuguese (portugal) translation by Chorizo 2014-09-21 08:37:16 +02:00
czaks
a1f26e8fd1 update locales 2014-09-21 04:52:18 +02:00
czaks
476d24d401 update locales 2014-09-21 04:52:18 +02:00
Fredrick Brennan
7288f1dec7 Fix last commit 2014-09-20 16:49:32 +00:00
Fredrick Brennan
686338e576 Fix last commit 2014-09-20 16:49:32 +00:00
Fredrick Brennan
23c73ca839 Allow the user to decide whether or not he wants to display his country 2014-09-20 16:35:28 +00:00
Fredrick Brennan
1c2a2a3cf6 Allow the user to decide whether or not he wants to display his country 2014-09-20 16:35:28 +00:00
Fredrick Brennan
9070b061ee Bug fix: users were banned from /0/ if they had a ban anywhere else
Conflicts:
	inc/bans.php
2014-09-20 15:39:47 +00:00
Fredrick Brennan
a3a7586b35 Bug fix: users were banned from /0/ if they had a ban anywhere else
Conflicts:
	inc/bans.php
2014-09-20 15:39:47 +00:00
Fredrick Brennan
19f2505ae6 Merge https://github.com/vichan-devel/vichan 2014-09-20 15:29:05 +00:00
Fredrick Brennan
6f195a033c Merge https://github.com/vichan-devel/vichan 2014-09-20 15:29:05 +00:00
Fredrick Brennan
696b551a31 Allow the user to decide whether or not he wants to display his country 2014-09-20 15:21:50 +00:00
Fredrick Brennan
9d67593af0 Allow the user to decide whether or not he wants to display his country 2014-09-20 15:21:50 +00:00
Fredrick Brennan
f67f839e0f fuck splitting this one up, misc changes 2014-09-20 15:21:09 +00:00
Fredrick Brennan
b5ce7c683d fuck splitting this one up, misc changes 2014-09-20 15:21:09 +00:00
Fredrick Brennan
e972548ae2 More dice limits 2014-09-20 15:20:22 +00:00
Fredrick Brennan
b8a3ef5b56 More dice limits 2014-09-20 15:20:22 +00:00
Fredrick Brennan
4e6bb9ad97 Bug fix: users were banned from /0/ if they had a ban anywhere else 2014-09-20 15:20:00 +00:00
Fredrick Brennan
d486fc4e44 Bug fix: users were banned from /0/ if they had a ban anywhere else 2014-09-20 15:20:00 +00:00
Marcin Łabanowski
4da5f4ec90 Merge pull request #79 from marlencrabapple/master
FFmpeg support for WebM uploads
2014-09-17 20:50:21 +02:00
Marcin Łabanowski
6e105bfa19 Merge pull request #79 from marlencrabapple/master
FFmpeg support for WebM uploads
2014-09-17 20:50:21 +02:00
Ian Bradley
306f4ef46b Added escapeshellarg() for WebM thumbnail generation. 2014-09-15 16:57:06 -07:00
Ian Bradley
41c8628e19 Added escapeshellarg() for WebM thumbnail generation. 2014-09-15 16:57:06 -07:00
Ian Bradley
0a9de3deb5 FFmpeg support for WebMs. Fixes threads with large amounts of WebM's causing crashes for some users. 2014-09-15 16:34:36 -07:00
Ian Bradley
c91915f121 FFmpeg support for WebMs. Fixes threads with large amounts of WebM's causing crashes for some users. 2014-09-15 16:34:36 -07:00
Ian Bradley
c1ecef3772 Added support for BSD md5 incase md5sum isn't available. 2014-09-15 16:33:37 -07:00
Ian Bradley
8641a739a6 Added support for BSD md5 incase md5sum isn't available. 2014-09-15 16:33:37 -07:00
8chan
66e026b361 ?/bans: fix pagination - can now see all bans on all boards if > $config[mod][banlist_page]
Conflicts:
	inc/bans.php
2014-09-13 16:43:46 +00:00
8chan
d6e5a0f720 ?/bans: fix pagination - can now see all bans on all boards if > $config[mod][banlist_page]
Conflicts:
	inc/bans.php
2014-09-13 16:43:46 +00:00
8chan
adb1294016 Merge https://github.com/vichan-devel/vichan 2014-09-13 16:38:06 +00:00
8chan
7005163af3 Merge https://github.com/vichan-devel/vichan 2014-09-13 16:38:06 +00:00
8chan
c0e22f972f ?/bans: fix pagination - can now see all bans on all boards if > $config[mod][banlist_page] 2014-09-13 16:37:33 +00:00
8chan
4e94338ab2 ?/bans: fix pagination - can now see all bans on all boards if > $config[mod][banlist_page] 2014-09-13 16:37:33 +00:00
8chan
84e4fa054f New scripts 2014-09-13 16:36:40 +00:00
8chan
c8f512a270 New scripts 2014-09-13 16:36:40 +00:00
Juan Tamad
53ada6a5ff added option for showing the mod in ban page.
also fixes issue where the Staff is not shown in ban appeals.
2014-09-01 06:30:33 +08:00
Juan Tamad
7c71c46af9 added option for showing the mod in ban page.
also fixes issue where the Staff is not shown in ban appeals.
2014-09-01 06:30:33 +08:00
8chan
18ac30b7cc Merge ../http 2014-08-30 20:07:36 +00:00
8chan
da5f35244f Merge ../http 2014-08-30 20:07:36 +00:00
8chan
3c8367240a Arbitrary maximum dice 2014-08-30 20:07:08 +00:00
8chan
41f2255e51 Arbitrary maximum dice 2014-08-30 20:07:08 +00:00
8chan
41be663ee9 Merge vichan-devel 2014-08-30 20:06:02 +00:00
8chan
69dc5500e8 Merge vichan-devel 2014-08-30 20:06:02 +00:00
Tomasz Konojacki
1b62fbea6f added support for statcounter.com tracking code 2014-08-24 23:33:53 +02:00
Tomasz Konojacki
0c3a07adfd added support for statcounter.com tracking code 2014-08-24 23:33:53 +02:00
Marcin Łabanowski
d78dcd6ed6 fix a bug reported by Dudeman on #v-d 2014-08-21 04:27:47 +02:00
Marcin Łabanowski
f83ca84298 fix a bug reported by Dudeman on #v-d 2014-08-21 04:27:47 +02:00
8chan
e28f233e3d Close #51: Prevent players from cheating the dice roller by using markup 2014-08-10 15:38:02 +00:00
8chan
954099bb64 Close #51: Prevent players from cheating the dice roller by using markup 2014-08-10 15:38:02 +00:00
8chan
db6c0e634c Close #51: Prevent players from cheating the dice roller by using markup 2014-08-10 15:37:28 +00:00
8chan
26b1191558 Close #51: Prevent players from cheating the dice roller by using markup 2014-08-10 15:37:28 +00:00
8chan
1ea3da1db6 Merge Barrucadu/diceroll into master 2014-08-10 15:35:11 +00:00
8chan
73228b950e Merge Barrucadu/diceroll into master 2014-08-10 15:35:11 +00:00
8chan
06faa65fdd Merge Barrucadu/diceroll into master 2014-08-10 14:51:45 +00:00
8chan
78aebd6833 Merge Barrucadu/diceroll into master 2014-08-10 14:51:45 +00:00
8chan
0ac2bea736 Pull 8chan 2014-08-10 14:43:16 +00:00
8chan
e59ee1c80e Pull 8chan 2014-08-10 14:43:16 +00:00
8chan
0ac9aaaf25 Merge vichan-devel 2014-08-10 14:41:40 +00:00
8chan
edc8df469e Merge vichan-devel 2014-08-10 14:41:40 +00:00
czaks
c3662d4a59 handle tinyboard flags with length=0 2014-08-09 05:12:36 +02:00
czaks
1fb9fffefb handle tinyboard flags with length=0 2014-08-09 05:12:36 +02:00
czaks
b8381b31db Revert "Use a different way to show the original filename"
This reverts commit d81a6c49e2.

Conflicts:
	js/download-original.js
	templates/post/fileinfo.html
2014-08-08 22:18:06 +02:00
czaks
e554ef7d47 Revert "Use a different way to show the original filename"
This reverts commit d81a6c49e2.

Conflicts:
	js/download-original.js
	templates/post/fileinfo.html
2014-08-08 22:18:06 +02:00
Jano Slota
46c07d3566 Change styling of fileinfo, add iqdb search 2014-08-08 21:58:15 +02:00
Jano Slota
80281a46cb Change styling of fileinfo, add iqdb search 2014-08-08 21:58:15 +02:00
Jano Slota
a87dc24169 Minor fixes for embed htmls 2014-08-08 21:57:58 +02:00
Jano Slota
2e89786e62 Minor fixes for embed htmls 2014-08-08 21:57:58 +02:00
Jano Slota
3144e11cf9 Minor fixes for embed htmls 2014-08-08 21:57:11 +02:00
Jano Slota
345ffe869f Minor fixes for embed htmls 2014-08-08 21:57:11 +02:00
Jano Slota
d81a6c49e2 Use a different way to show the original filename
Conflicts:
	templates/post/fileinfo.html
2014-08-08 21:52:19 +02:00
Jano Slota
1221c2c37e Use a different way to show the original filename
Conflicts:
	templates/post/fileinfo.html
2014-08-08 21:52:19 +02:00
Alrahambra
323f29d2b3 update fi_FI locale 2014-08-08 21:48:02 +02:00
Alrahambra
89229cdb20 update fi_FI locale 2014-08-08 21:48:02 +02:00
dubcheck
bbff6da4c8 update sk_SK locale 2014-08-08 21:47:10 +02:00
dubcheck
da6b25cd6b update sk_SK locale 2014-08-08 21:47:10 +02:00
cicus
34d4e3267a update hu_HU locale 2014-08-08 21:46:35 +02:00
cicus
3977fd4fad update hu_HU locale 2014-08-08 21:46:35 +02:00
Adverso
31420d4190 update es_ES locale 2014-08-08 21:45:39 +02:00
Adverso
e498a1e7ec update es_ES locale 2014-08-08 21:45:39 +02:00
copypaste
4dba56386d update eo locale 2014-08-08 21:44:56 +02:00
copypaste
ae659d91a1 update eo locale 2014-08-08 21:44:56 +02:00
kennyl
b81f9749a8 update zh_TW locale 2014-08-08 21:44:08 +02:00
kennyl
7f265d0d2a update zh_TW locale 2014-08-08 21:44:08 +02:00
kaf
c6c7de937a update fr_FR locale 2014-08-08 21:43:18 +02:00
kaf
172ad2d308 update fr_FR locale 2014-08-08 21:43:18 +02:00
kpcyrd
9a98d518a0 Fix is_writable check for templates/cache 2014-08-08 21:36:56 +02:00
kpcyrd
5d19d2660d Fix is_writable check for templates/cache 2014-08-08 21:36:56 +02:00
czaks
fa198e207f enhance filters; make them work on multiimage 2014-08-08 21:35:00 +02:00
czaks
f9dce59f1f enhance filters; make them work on multiimage 2014-08-08 21:35:00 +02:00
czaks
57e80951d9 sorta document the changes in config.php 2014-07-28 04:15:09 +02:00
czaks
e38a0c9f43 sorta document the changes in config.php 2014-07-28 04:15:09 +02:00
czaks
a01f8e9e11 actually allow for a log-only filter 2014-07-28 04:12:19 +02:00
czaks
f7da99e2b8 actually allow for a log-only filter 2014-07-28 04:12:19 +02:00
czaks
50091e28a9 allow the previous not only for ban action, but also for reject action, or a nul one 2014-07-28 04:09:01 +02:00
czaks
bb096954c7 allow the previous not only for ban action, but also for reject action, or a nul one 2014-07-28 04:09:01 +02:00
czaks
a940ee9abb Merge branch 'master' of github.com:vichan-devel/Tinyboard 2014-07-28 04:06:39 +02:00
czaks
22bd8d3378 Merge branch 'master' of github.com:vichan-devel/Tinyboard 2014-07-28 04:06:39 +02:00
Marcin Łabanowski
29e71fa3ee filters: add option to log a message body in ip notes 2014-07-28 04:05:47 +02:00
Marcin Łabanowski
5e8bbdc9f6 filters: add option to log a message body in ip notes 2014-07-28 04:05:47 +02:00
8chan
ef7556194c Fix 55ch cancer; can now see next page of posts, ?/recent uses templating system 2014-07-19 18:42:52 +00:00
8chan
778ca28a3c Fix 55ch cancer; can now see next page of posts, ?/recent uses templating system 2014-07-19 18:42:52 +00:00
8chan
7b1a5bb0e8 Fix 55ch cancer; can now see next page of posts, ?/recent uses templating system 2014-07-19 18:41:48 +00:00
8chan
1d4955081d Fix 55ch cancer; can now see next page of posts, ?/recent uses templating system 2014-07-19 18:41:48 +00:00
8chan
af403e1119 No more automatic claiming 2014-07-19 18:40:06 +00:00
8chan
ee6db3f063 No more automatic claiming 2014-07-19 18:40:06 +00:00
8chan
f7c7b8cd48 Merge https://github.com/vichan-devel/vichan 2014-07-08 15:33:08 +00:00
8chan
55aaed7c93 Merge https://github.com/vichan-devel/vichan 2014-07-08 15:33:08 +00:00
czaks
8d0f1bf4ad fix a bug in filename truncation 2014-07-08 09:56:31 +02:00
czaks
2476648416 fix a bug in filename truncation 2014-07-08 09:56:31 +02:00
czaks
f97d2dff85 fix previous commit 2014-07-08 09:44:30 +02:00
czaks
806d4da68d fix previous commit 2014-07-08 09:44:30 +02:00
czaks
9526f5ed1c fix #72 2014-07-08 09:43:04 +02:00
czaks
07d416465c fix #72 2014-07-08 09:43:04 +02:00
8chan
713d4d265b Merge https://github.com/vichan-devel/vichan 2014-07-06 02:02:19 +00:00
8chan
150c3b2603 Merge https://github.com/vichan-devel/vichan 2014-07-06 02:02:19 +00:00
czaks
8d3c3f7ef7 Merge 4.5 2014-07-06 03:58:00 +02:00
czaks
ef80de4e31 Merge 4.5 2014-07-06 03:58:00 +02:00
czaks
4a0c87c7e1 Revert "Update jQuery UI to 1.11.0, GeoIPv6 and IP library"
This reverts commit dca7570b32.
2014-07-06 03:50:16 +02:00
czaks
9bcd228293 Revert "Update jQuery UI to 1.11.0, GeoIPv6 and IP library"
This reverts commit dca7570b32.
2014-07-06 03:50:16 +02:00
czaks
d38433a9c2 fix gzip static 2014-07-06 03:22:40 +02:00
czaks
60e2bf8e1e fix gzip static 2014-07-06 03:22:40 +02:00
8chan
0dc66a0faa Merge https://github.com/vichan-devel/vichan 2014-07-06 00:18:45 +00:00
8chan
c7ef03f204 Merge https://github.com/vichan-devel/vichan 2014-07-06 00:18:45 +00:00
czaks
9b943da60a Revert "Rework the GeoIP code, add country-based poster names"
This reverts commit db3c7f4ee9.
2014-07-06 02:13:08 +02:00
czaks
e749da1115 Revert "Rework the GeoIP code, add country-based poster names"
This reverts commit db3c7f4ee9.
2014-07-06 02:13:08 +02:00
czaks
a9b035d822 Revert "Second rework of the GeoIP code, now supporting cities!"
This reverts commit 2488e77e86.
2014-07-06 02:12:54 +02:00
czaks
22108ca901 Revert "Second rework of the GeoIP code, now supporting cities!"
This reverts commit 2488e77e86.
2014-07-06 02:12:54 +02:00
Jano Slota
2488e77e86 Second rework of the GeoIP code, now supporting cities! 2014-07-06 01:30:38 +02:00
Jano Slota
a520101e22 Second rework of the GeoIP code, now supporting cities! 2014-07-06 01:30:38 +02:00
Jano Slota
db3c7f4ee9 Rework the GeoIP code, add country-based poster names 2014-07-06 01:29:12 +02:00
Jano Slota
0c22aaed24 Rework the GeoIP code, add country-based poster names 2014-07-06 01:29:12 +02:00
Jano Slota
4adf893c39 Random names for anonymous users - thanks to svnth 2014-07-06 01:27:38 +02:00
Jano Slota
88e33bef2c Random names for anonymous users - thanks to svnth 2014-07-06 01:27:38 +02:00
Jano Slota
dca7570b32 Update jQuery UI to 1.11.0, GeoIPv6 and IP library 2014-07-06 01:25:37 +02:00
Jano Slota
2d9e7d8ac0 Update jQuery UI to 1.11.0, GeoIPv6 and IP library 2014-07-06 01:25:37 +02:00
czaks
6a3dbe5c98 Merge 4.5
Conflicts:
	inc/display.php
	templates/post_reply.html
	templates/post_thread.html
2014-07-06 01:24:16 +02:00
czaks
c7073a98d6 Merge 4.5
Conflicts:
	inc/display.php
	templates/post_reply.html
	templates/post_thread.html
2014-07-06 01:24:16 +02:00
8chan
f2809d4793 Fix issue #45 2014-07-06 01:14:59 +02:00
8chan
b99b065592 Fix issue #45 2014-07-06 01:14:59 +02:00
Chen-Pang He
97069ea490 Introduce $config['gzip_static'] 2014-07-06 01:12:12 +02:00
Chen-Pang He
39d55b6dbb Introduce $config['gzip_static'] 2014-07-06 01:12:12 +02:00
Michael Walker
3c70fe78ae Move rolling into an event handler 2014-07-05 21:58:12 +01:00
Michael Walker
3040cdc818 Move rolling into an event handler 2014-07-05 21:58:12 +01:00
Michael Walker
4b25d42596 Implement dice rolling in posts: use an email like 'dice XdY+Z' to roll. 2014-07-05 21:58:12 +01:00
Michael Walker
f19d0cdda6 Implement dice rolling in posts: use an email like 'dice XdY+Z' to roll. 2014-07-05 21:58:12 +01:00
8chan
9df6ca8ddd Fix issue #45 2014-06-24 19:41:00 +00:00
8chan
f4cf55dbe4 Fix issue #45 2014-06-24 19:41:00 +00:00
8chan
766a5e5c0f Fix issue #45 2014-06-24 19:40:16 +00:00
8chan
ef810b1fda Fix issue #45 2014-06-24 19:40:16 +00:00
8chan
6e0682ab19 Merge vichan-devel 2014-06-21 19:39:55 +00:00
8chan
d6ddd5edf2 Merge vichan-devel 2014-06-21 19:39:55 +00:00
8chan
8cd15c9dd8 Merge https://github.com/vichan-devel/vichan 2014-06-21 19:37:24 +00:00
8chan
5b395c014c Merge https://github.com/vichan-devel/vichan 2014-06-21 19:37:24 +00:00
czaks
a04dee562c update locales for 5.0 2014-06-21 21:04:29 +02:00
czaks
a8b7152238 update locales for 5.0 2014-06-21 21:04:29 +02:00
czaks
3895223922 Merge 4.5
Conflicts:
	templates/post_thread.html
2014-06-21 20:50:41 +02:00
czaks
f8aa9c7d7c Merge 4.5
Conflicts:
	templates/post_thread.html
2014-06-21 20:50:41 +02:00
Chen-Pang He
9fd003cbca import zh_TW translation 2014-06-21 20:46:30 +02:00
Chen-Pang He
77026ad974 import zh_TW translation 2014-06-21 20:46:30 +02:00