1
0
mirror of https://github.com/vichan-devel/vichan.git synced 2024-11-29 09:44:28 +01:00
Commit Graph

165 Commits

Author SHA1 Message Date
8chan
f0e58a02d2 Merge https://github.com/vichan-devel/vichan
Conflicts:
	README.md
2014-09-24 19:42:45 +00:00
fourfivesix
94f2fae196 Applies the theme to all board pages and catalog. 2014-09-24 13:56:38 -03:00
czaks
a25e5f7839 additional measurements for catalog, so it does not throw errors; should fix vichan-devel#84 2014-09-24 03:21:35 +02: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
dubcheck
c2f612bac9 'no comment' in Recent theme 2014-09-21 05:51:17 +02:00
Fredrick Brennan
19f2505ae6 Merge https://github.com/vichan-devel/vichan 2014-09-20 15:29:05 +00:00
czaks
ea3c571d6c Merge branch 'catalog-spoiler-fix' of https://github.com/marlencrabapple/vichan 2014-09-20 06:44:03 +02:00
czaks
ac888a769d add a very small image size for catalog 2014-09-20 06:40:43 +02:00
marlencrabapple
14cd12ff2a Fixed spoiler images in the catalog theme. 2014-09-17 16:15:18 -07:00
marlencrabapple
40787db177 Fixed spoiler thumbnails not showing up in the recent theme 2014-09-17 15:55:16 -07:00
Ian Bradley
cff2af99d5 Fixed blank catalog image count when zero image replies and threads with deleted files from being excluded 2014-09-16 13:10:54 -07:00
8chan
58fb3592b7 Subjects in catalog 2014-09-15 14:29:39 +00:00
8chan
0ac9aaaf25 Merge vichan-devel 2014-08-10 14:41:40 +00:00
czaks
05e7ad0b56 ongoing catalog cleanup 2014-08-08 22:50:31 +02:00
czaks
4df5d7697d fix & optimize catalog a little bit, don't expect anything big yet 2014-08-08 22:36:36 +02:00
8chan
8cd15c9dd8 Merge https://github.com/vichan-devel/vichan 2014-06-21 19:37:24 +00:00
czaks
26884e8e11 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
Techan
9e2b722db6 Change timezone of news on main page to local timezone 2014-06-20 23:26:17 +02:00
Techan
4cc8a0a8b0 Fix custom stylesheets on main page 2014-06-20 23:25:29 +02:00
Techan
c42050671b Improve main page template 2014-06-20 23:25:08 +02:00
czaks
8a189e2380 fix upgrade path a little bit with a new catalog 2014-06-16 11:29:18 +02:00
8chan
e856917b00 Add scripts to catalog page 2014-06-12 17:27:18 +00:00
8chan
bc984261be 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
Chen-Pang He
8d745bec26 Set viewport to basic theme 2014-06-10 17:40:47 +02:00
8chan
c9ec4a0ada Fix catalog if no files 2014-05-14 17:53:59 +00: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
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
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
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
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
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
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
c70b4e3959 Remove openBoard() from ukko 2014-04-19 20:02:15 +00:00
root
44729bfc32 Merge unmerged live changes 2014-04-16 15:14:02 +00:00
8chan Admin
a4f75ffd7d Catalog 8chan fixes 2014-04-05 21:04:46 +00:00