1
0
mirror of https://github.com/vichan-devel/vichan.git synced 2024-11-27 17:00:52 +01:00
Commit Graph

676 Commits

Author SHA1 Message Date
8chan
32d88311e6 Banners commit 2014-05-23 21:20:27 +00:00
8chan
8d4ea79a3b 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
8chan
cf23161365 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
101202a031 Fix edit board link not appearing 2014-05-18 21:18:06 -04:00
8chan
fa55893add Fix edit link not appearing 2014-05-18 19:37:45 +00:00
8chan
e88cc285a1 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
Jano Slota
ecbf1ff24c Fixed image identification 2014-05-16 10:47:10 +02:00
8chan
bc9309ba2a Merge ../test 2014-05-14 17:54:11 +00:00
8chan
c9ec4a0ada Fix catalog if no files 2014-05-14 17:53:59 +00:00
8chan
a19b0ac160 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
8chan
c26e339a77 SWITCH TO 5.0; MERGE VICHAN 2014-05-14 16:09:04 +00:00
8chan
2a812dd8fc 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
19ce50c545 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
Jason Lam
9bd0572b63 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
9dab9179f9 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
Fredrick Brennan
d31a353962 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
8chan
0ffbe4a034 Merge ../http 2014-05-05 15:05:41 +00:00
8chan
bc9bf3ab4c Fix stylesheet issue for mod 2014-05-05 15:05:18 +00:00
8chan
b6fc7fc815 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
Fredrick Brennan
b1912ba86f Merge branch 'staging' of https://github.com/vichan-devel/vichan into staging 2014-04-30 17:18:44 -04:00
Fredrick Brennan
042e7b9c59 Deprecate postControls(), per-file deletion and spoilering 2014-04-30 17:18:35 -04:00
czaks
4e21e3dbb7 Merge master branch into staging
Conflicts:
	templates/themes/ukko/theme.php
2014-04-30 18:28:46 +02:00
czaks
3545ba1b47 ukko: this return thingy wasn`t needed 2014-04-30 18:28:14 +02:00
czaks
318d75ac27 ukko: mod support for ukko; fixes #23 2014-04-30 18:20:30 +02:00
czaks
776bbeb73e ukko: mod support for ukko; fixes #23 2014-04-30 18:18:55 +02:00
Fredrick Brennan
de524c64d9 Attempt to fix styling issue http://i.imgur.com/owHv6sE.png 2014-04-29 20:39:32 -04:00
czaks
2adf7d99db integrate favelog into catalog theme; needs more work, code cleanup etc. 2014-04-30 00:14:25 +02:00
czaks
bb5446a93d Merge remote-tracking branch 'origin/br-integration' into staging 2014-04-29 21:35:50 +02:00
czaks
b94e39148b remove quick-reply-old. it probably doesn't work now, it certainly isn't
maintained. this is an old cruft and if needed, it needs rewriting.
2014-04-29 18:37:29 +02:00
czaks
276a742bce Revert "change thumb to file to overcome a nasty bug in upgrading"
This reverts commit b0faa1a7e4.
2014-04-27 16:19:41 +02:00
czaks
b0faa1a7e4 change thumb to file to overcome a nasty bug in upgrading 2014-04-27 16:05:38 +02:00
copypaste
c483e1258c multiimage posting 2014-04-27 15:48:47 +02:00
8chan
5fb4812458 Search page fix 2014-04-23 21:59:41 +00:00
8chan
4142362046 Merge vichan 2014-04-21 13:46:04 +00:00
czaks
0ec6355358 fix recentposts theme building null query, throw error instead 2014-04-20 23:33:52 +02:00
czaks
a93530e32f update copyright footers in themes 2014-04-20 02:27:54 +02:00
8chan
18524e4810 Merge vichan-devel 2014-04-19 20:11:34 +00:00
8chan
722f97678e Re-add board into querystring for banners 2014-04-19 20:03:54 +00:00
8chan
b7618c303e Attempt to fix scroll to anchor issue 2014-04-19 20:02:39 +00:00
8chan
c70b4e3959 Remove openBoard() from ukko 2014-04-19 20:02:15 +00:00