1
0
mirror of https://github.com/vichan-devel/vichan.git synced 2025-01-27 00:13:47 +01:00

1686 Commits

Author SHA1 Message Date
8chan
044bfa5b05 Merge vichan-devel 2014-06-10 18:16:16 +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
8d745bec26 Set viewport to basic theme 2014-06-10 17:40:47 +02:00
Chen-Pang He
8123bbffc8 Set viewport to basic theme 2014-06-10 17:40:47 +02:00
8chan
1d4e3ad7b9 Fix board stylesheets not being respected on +50 2014-06-05 14:35:51 +00:00
8chan
09ef0bc944 Banners commit 2014-05-23 21:20:27 +00:00
8chan
64b6385921 Merge https://github.com/vichan-devel/vichan 2014-05-21 23:41:47 +00:00
Fredrick Brennan
696e5e59d2 Fix issue #60 2014-05-20 21:23:33 -04:00
Fredrick Brennan
1db32eff47 Fix issue #60 2014-05-20 21:23:33 -04:00
8chan
c77526afa6 Merge https://github.com/vichan-devel/vichan 2014-05-19 19:39:35 +00:00
Fredrick Brennan
0be16cf178 Fix js error when allow_delete is false 2014-05-19 14:11:24 -04:00
Fredrick Brennan
054b9b8220 Fix js error when allow_delete is false 2014-05-19 14:11:24 -04:00
Fredrick Brennan
101202a031 Fix edit board link not appearing 2014-05-18 21:18:06 -04:00
Fredrick Brennan
c248646b74 Fix edit board link not appearing 2014-05-18 21:18:06 -04:00
8chan
dc07975c2f Fix edit link not appearing 2014-05-18 19:37:45 +00:00
8chan
07af40e01e Merge https://github.com/vichan-devel/vichan 2014-05-17 19:51:05 +00:00
czaks
ea47e000f4 Merge branch 'master' of github.com:vichan-devel/Tinyboard 2014-05-16 10:47:16 +02:00
czaks
5de6227fdd Merge branch 'master' of github.com:vichan-devel/Tinyboard 2014-05-16 10:47:16 +02:00
Jano Slota
ecbf1ff24c Fixed image identification 2014-05-16 10:47:10 +02:00
Jano Slota
77a5b5c525 Fixed image identification 2014-05-16 10:47:10 +02:00
8chan
da4a310d3f Merge ../test 2014-05-14 17:54:11 +00:00
8chan
ed54529f29 Fix catalog if no files 2014-05-14 17:53:59 +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
2fff8835a2 SWITCH TO 5.0; MERGE VICHAN 2014-05-14 16:09:04 +00:00
8chan
3468d324ec Fix failed merge 2014-05-12 19:45:42 +00: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
9bd0572b63 use new truncate_filename function 2014-05-09 20:37:31 -04:00
Jason Lam
ea6c9fbe39 use new truncate_filename function 2014-05-09 20:37:31 -04:00
Jason Lam
bf7304622a Update poster_id.html
previous code did not work
2014-05-08 00:58:42 +02:00
Jason Lam
d60be0de98 Update poster_id.html
previous code did not work
2014-05-08 00:58:42 +02:00
Jason Lam
9dab9179f9 Update poster_id.html
previous code did not work
2014-05-07 18:37:48 -04:00
Jason Lam
a611ddcbc4 Update poster_id.html
previous code did not work
2014-05-07 18:37:48 -04: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
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
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
8chan
4f4267661b Merge ../http 2014-05-05 15:05:41 +00:00
8chan
6416152794 Fix stylesheet issue for mod 2014-05-05 15:05:18 +00:00
8chan
86ae70770c Merge vichan-devel 2014-05-05 15:04:41 +00:00
czaks
73eb8c6b58 quick & dirty youtube thumbnails in catalog support 2014-05-04 01:20:12 +02:00