Cool_Tools/vichan
1
0
Fork 0
mirror of https://github.com/vichan-devel/vichan.git synced 2024-12-02 02:57:26 +01:00
Code Releases Wiki Activity
7,080 Commits 50 Branches 28 Tags 70 MiB
aa71065dac
Commit Graph

3257 Commits

Author SHA1 Message Date
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
mgaj
0adc70baf7 update es_ES locale 2014-06-21 20:40:14 +02:00
mgaj
9a95bffc88 update es_ES locale 2014-06-21 20:40:14 +02:00
sildeperker
3241f6325b import da_DK transation 2014-06-21 20:39:33 +02:00
sildeperker
06948b2f37 import da_DK transation 2014-06-21 20:39:33 +02:00
kaf
4f61279ad6 update fr_FR transation 2014-06-21 20:38:51 +02:00
kaf
7c49d65a04 update fr_FR transation 2014-06-21 20:38:51 +02:00
czaks
32c42e3596 update pl_PL translation 2014-06-21 20:38:16 +02:00
czaks
6d4a60ab9c update pl_PL translation 2014-06-21 20:38:16 +02:00
czaks
26884e8e11 Merge 4.5 
Conflicts:
	post.php
 2014-06-20 23:35:45 +02:00
czaks
72c873551e Merge 4.5 
Conflicts:
	post.php
 2014-06-20 23:35:45 +02:00
czaks
73177fcffc Merge branch '4.5' of github.com:vichan-devel/Tinyboard into HEAD 
Conflicts:
	templates/themes/basic/index.html
 2014-06-20 23:27:34 +02:00
czaks
36dd8c607e Merge branch '4.5' of github.com:vichan-devel/Tinyboard into HEAD 
Conflicts:
	templates/themes/basic/index.html
 2014-06-20 23:27:34 +02:00
Techan
eb2a468a09 Improve protection from displaying errors to visitors 2014-06-20 23:07:07 +02:00
Techan
826a921a53 Improve protection from displaying errors to visitors 2014-06-20 23:07:07 +02:00
8chan
043f5fa2f6 Twitter 2014-06-17 23:00:47 +00:00
8chan
544089fc24 Twitter 2014-06-17 23:00:47 +00:00
8chan
977cf0711e No index 2014-06-17 23:00:36 +00:00
8chan
4dc1d3e315 No index 2014-06-17 23:00:36 +00:00
czaks
2c883fda0a fix ban appeals; thanks to sraczynski for reporting 2014-06-16 11:39:56 +02:00
czaks
7d17960f69 fix ban appeals; thanks to sraczynski for reporting 2014-06-16 11:39:56 +02:00
czaks
b12612ac57 fix sql error as reported by a Romanian anon 2014-06-14 18:33:55 +02:00
czaks
e4d77b0a70 fix sql error as reported by a Romanian anon 2014-06-14 18:33:55 +02:00
8chan
d073eda2ac Merge ../test 2014-06-12 14:37:53 +00:00
8chan
a2d0fbbe6a Merge ../test 2014-06-12 14:37:53 +00:00
8chan
c493642bce Merge https://github.com/vichan-devel/vichan 2014-06-12 14:37:36 +00:00
8chan
7532591975 Merge https://github.com/vichan-devel/vichan 2014-06-12 14:37:36 +00:00
8chan
4223bc7c79 Enable syslog 2014-06-12 03:07:16 +00:00
8chan
a03354f705 Enable syslog 2014-06-12 03:07:16 +00:00
czaks
427a9938a7 Merge 4.5 2014-06-12 03:12:56 +02:00
czaks
d626ecc530 Merge 4.5 2014-06-12 03:12:56 +02:00
Chen-Pang He
7933abd271 Fix vichan #65 
Conflicts:
	inc/mod/auth.php
	inc/mod/pages.php
 2014-06-12 03:12:27 +02:00
Chen-Pang He
2c5ae29a3b Fix vichan #65 
Conflicts:
	inc/mod/auth.php
	inc/mod/pages.php
 2014-06-12 03:12:27 +02:00
8chan
66066304c1 Merge https://github.com/vichan-devel/vichan 2014-06-11 00:10:05 +00:00
8chan
94c1b76e3a Merge https://github.com/vichan-devel/vichan 2014-06-11 00:10:05 +00:00
czaks
503903ac0f Merge 4.5 2014-06-11 02:05:14 +02:00
czaks
a689a52973 Merge 4.5 2014-06-11 02:05:14 +02:00
czaks
23d6e82038 $_SERVER[HTTPS] isn`t being always set; fixes #65 2014-06-11 02:04:59 +02:00
czaks
081798c127 $_SERVER[HTTPS] isn`t being always set; fixes #65 2014-06-11 02:04:59 +02:00
8chan
1006aa3132 Merge vichan-devel 2014-06-10 23:13:42 +00:00
8chan
069296177f Merge vichan-devel 2014-06-10 23:13:42 +00:00
Fredrick Brennan
4f070d16e5 Congrats, you broke the mod page on non-secured servers @jdh8 2014-06-10 23:09:39 +00:00
Fredrick Brennan
e7fa200a84 Congrats, you broke the mod page on non-secured servers @jdh8 2014-06-10 23:09:39 +00:00
8chan
bc984261be Merge vichan-devel 2014-06-10 18:16:16 +00:00
8chan
044bfa5b05 Merge vichan-devel 2014-06-10 18:16:16 +00:00
8chan
59d443846e No animated GIFs 2014-06-10 17:57:37 +00:00
8chan
e5489cefa7 No animated GIFs 2014-06-10 17:57:37 +00:00
czaks
c2cbbe7e22 Merge 4.5 
Conflicts:
	js/expand-too-long.js
 2014-06-10 17:51:03 +02:00
czaks
42352e6180 Merge 4.5 
Conflicts:
	js/expand-too-long.js
 2014-06-10 17:51:03 +02:00
Chen-Pang He
6716a24b68 Send cookie only via HTTPS if a mod logs in via HTTPS, which is the case on this site 2014-06-10 17:42:18 +02:00
Chen-Pang He
d828850196 Send cookie only via HTTPS if a mod logs in via HTTPS, which is the case on this site 2014-06-10 17:42:18 +02:00
8chan
3b34c345d8 Fix board stylesheets not being respected on +50 2014-06-05 14:35:51 +00:00
8chan
1d4e3ad7b9 Fix board stylesheets not being respected on +50 2014-06-05 14:35:51 +00:00
8chan
b506c0be9f Fix array_filter error message when debug_stuff is false 2014-05-31 22:43:34 +02:00
8chan
10d9653ee2 Fix array_filter error message when debug_stuff is false 2014-05-31 22:43:34 +02:00
8chan
dc8d8e5bcd Fix cache error when board deleted 2014-05-29 14:41:20 +00:00
8chan
1a9ae22aeb Fix cache error when board deleted 2014-05-29 14:41:20 +00:00
8chan
073e6bec83 Fix array_filter error message when debug_stuff is false 2014-05-27 23:50:20 +00:00
8chan
3b0681906a Fix array_filter error message when debug_stuff is false 2014-05-27 23:50:20 +00:00
8chan
59b4443e71 Fix array_filter error message when debug_stuff is false 2014-05-27 23:44:49 +00:00
8chan
b5a5c491ab Fix array_filter error message when debug_stuff is false 2014-05-27 23:44:49 +00:00
Fredrick Brennan
56695fbf04 No need for global config 2014-05-21 08:19:16 +02:00
Fredrick Brennan
5394da6b2e No need for global config 2014-05-21 08:19:16 +02:00
Fredrick Brennan
f6e97b6e73 SECURITY: Remove $config[db][password] when $config[debug] is TRUE 2014-05-21 08:19:09 +02:00
Fredrick Brennan
f91fdfbc0d SECURITY: Remove $config[db][password] when $config[debug] is TRUE 2014-05-21 08:19:09 +02:00
8chan
cf23161365 Merge https://github.com/vichan-devel/vichan 2014-05-19 19:39:35 +00:00
8chan
c77526afa6 Merge https://github.com/vichan-devel/vichan 2014-05-19 19:39:35 +00:00
Fredrick Brennan
65a14a0d39 Fix moving of deleted files 2014-05-19 14:00:16 -04:00
Fredrick Brennan
a702a20058 Fix moving of deleted files 2014-05-19 14:00:16 -04:00
Fredrick Brennan
85136b76ed No need for global config 2014-05-19 13:46:18 -04:00
Fredrick Brennan
a4222c2d38 No need for global config 2014-05-19 13:46:18 -04:00
Fredrick Brennan
ff809ccf71 SECURITY: Remove $config[db][password] when $config[debug] is TRUE 2014-05-19 13:39:30 -04:00
Fredrick Brennan
5994964450 SECURITY: Remove $config[db][password] when $config[debug] is TRUE 2014-05-19 13:39:30 -04:00
8chan
5fecb99bf0 https change for $config[embedding] 2014-05-18 19:37:22 +00:00
8chan
97c4afc2eb https change for $config[embedding] 2014-05-18 19:37:22 +00:00
8chan
4ba085bdef 8chan.co proprietary changes 2014-05-17 20:01:14 +00:00
8chan
ed6fae6b09 8chan.co proprietary changes 2014-05-17 20:01:14 +00:00
8chan
1355908418 Fix order in ?/users 2014-05-17 19:50:28 +00:00
8chan
60233a734e Fix order in ?/users 2014-05-17 19:50:28 +00:00
8chan
8ac012b1c5 Thanks to Bill Karwin on SO (http://stackoverflow.com/a/23703118/1901658), speed up ?/users dramatically 2014-05-16 19:44:01 +00:00
8chan
8cdd807af7 Thanks to Bill Karwin on SO (http://stackoverflow.com/a/23703118/1901658), speed up ?/users dramatically 2014-05-16 19:44:01 +00:00
8chan
a19b0ac160 Merge https://github.com/vichan-devel/vichan 2014-05-14 17:53:36 +00:00
8chan
02d07f02f2 Merge https://github.com/vichan-devel/vichan 2014-05-14 17:53:36 +00:00
Fredrick Brennan
9b3f8421fc Fix displaying bans 2014-05-14 13:51:49 -04:00
Fredrick Brennan
57cf56ad9b Fix displaying bans 2014-05-14 13:51:49 -04:00
8chan
c26e339a77 SWITCH TO 5.0; MERGE VICHAN 2014-05-14 16:09:04 +00:00
8chan
2fff8835a2 SWITCH TO 5.0; MERGE VICHAN 2014-05-14 16:09:04 +00:00
czaks
fe126cb4bf rewrite filename truncation code; ref #53 2014-05-11 14:10:53 +02:00
czaks
5f626acd50 rewrite filename truncation code; ref #53 2014-05-11 14:10:53 +02:00
czaks
7d29cf9e37 Merge 4.5 2014-05-10 22:44:37 +02:00
czaks
cda2c59a12 Merge 4.5 2014-05-10 22:44:37 +02:00
kaf
c878b308bf update fr l10n 2014-05-10 22:44:22 +02:00
kaf
5871148f3f update fr l10n 2014-05-10 22:44:22 +02:00
Aš Esu
6fbe26c9e1 update lt locale 2014-05-10 22:43:14 +02:00
Aš Esu
030e858041 update lt locale 2014-05-10 22:43:14 +02:00
diggydoc
8233cdbad2 update lv l10n 2014-05-10 22:42:20 +02:00
diggydoc
5af44ed560 update lv l10n 2014-05-10 22:42:20 +02:00
Alrahambra
1102e6d47c update fi l10n 2014-05-10 22:40:47 +02:00
Alrahambra
ea25e89660 update fi l10n 2014-05-10 22:40:47 +02:00
neniu
d7a20417bd update eo l10n 2014-05-10 22:39:56 +02:00
neniu
5022b6c333 update eo l10n 2014-05-10 22:39:56 +02:00
Assada
8103a0ba8d update ru l10n 2014-05-10 22:39:21 +02:00
Assada
839faf3c52 update ru l10n 2014-05-10 22:39:21 +02:00
cicus
65a87ed9af update hu l10n 2014-05-10 22:38:43 +02:00
cicus
e5b5b2c562 update hu l10n 2014-05-10 22:38:43 +02:00
czaks
4288898dfa Merge branch 'master' of github.com:vichan-devel/Tinyboard 2014-05-10 21:58:34 +02:00
czaks
0f9e2a5a9d Merge branch 'master' of github.com:vichan-devel/Tinyboard 2014-05-10 21:58:34 +02:00
czaks
19ce50c545 Merge ../pl 
Conflicts:
	post.php
 2014-05-10 21:58:23 +02:00
czaks
5caed72059 Merge ../pl 
Conflicts:
	post.php
 2014-05-10 21:58:23 +02:00
Jano Slota
844d724b62 Optimized images 2014-05-10 21:51:00 +02:00
Jano Slota
adc7288529 Optimized images 2014-05-10 21:51:00 +02:00
Jason Lam
ff51706bfd add new truncate_filename filter 2014-05-09 20:42:57 -04:00
Jason Lam
687983b7c3 add new truncate_filename filter 2014-05-09 20:42:57 -04:00
Jason Lam
eca5c383e1 added truncate_filename function 2014-05-09 20:42:05 -04:00
Jason Lam
4764aa30b8 added truncate_filename function 2014-05-09 20:42:05 -04:00
Jano Slota
c25b8f01c5 Updated minify, jQuery, MixItUp and Tooltipster 2014-05-07 11:17:32 +02:00
Jano Slota
a2cd7de2dc Updated minify, jQuery, MixItUp and Tooltipster 2014-05-07 11:17:32 +02:00
Jano Slota
593560956c Added configurabe image identification 2014-05-07 11:14:30 +02:00
Jano Slota
4c31dec50e Added configurabe image identification 2014-05-07 11:14:30 +02:00
czaks
cd15458a32 Merge remote-tracking branch 'origin/4.5' 2014-05-06 21:53:38 +02:00
czaks
63ac90a66d Merge remote-tracking branch 'origin/4.5' 2014-05-06 21:53:38 +02:00
czaks
f7278e5a61 user moderation support 2014-05-06 21:53:05 +02:00
czaks
3ac1ac9b00 user moderation support 2014-05-06 21:53:05 +02:00
Fredrick Brennan
d31a353962 Allow post deletion switch 2014-05-05 18:03:51 -04:00
Fredrick Brennan
9ef2d02b5c Allow post deletion switch 2014-05-05 18:03:51 -04:00
czaks
72c7e28a0e Merge branch 'master' into staging 2014-05-05 17:29:59 +02:00
czaks
d5d7876d06 Merge branch 'master' into staging 2014-05-05 17:29:59 +02:00
czaks
855618b2a0 Merge branch 'master' of github.com:vichan-devel/Tinyboard 
Conflicts:
	templates/themes/catalog/catalog.html
	templates/themes/catalog/theme.php
 2014-05-05 17:29:34 +02:00
czaks
20cfc8f230 Merge branch 'master' of github.com:vichan-devel/Tinyboard 
Conflicts:
	templates/themes/catalog/catalog.html
	templates/themes/catalog/theme.php
 2014-05-05 17:29:34 +02:00