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

1437 Commits

Author SHA1 Message Date
Jano Slota
c6e1afcf65 I thought I deleted that 2014-08-08 21:58:49 +02:00
Jano Slota
e581629480 I thought I deleted that 2014-08-08 21:58:49 +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
cadfa2cee9 Do not show noko in email selectbox if it's disabled 2014-08-08 21:53:21 +02:00
Jano Slota
daea816c7b Do not show noko in email selectbox if it's disabled 2014-08-08 21:53:21 +02:00
kaf
fd58873ee6 Added a space for valid html5 2014-08-08 21:53:00 +02:00
kaf
c40d4f9b83 Added a space for valid html5 2014-08-08 21:53:00 +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
8chan
48f99deaa5 Fix post linking bug in ?/recent 2014-07-21 16:55:36 +00:00
8chan
64e2cce677 Fix post linking bug in ?/recent 2014-07-21 16:55:36 +00:00
8chan
429882fc39 Fix post linking bug in ?/recent 2014-07-21 16:54:51 +00:00
Fredrick Brennan
18f158e2d5 Forgot some |e 2014-07-19 18:47:34 +00:00
Fredrick Brennan
cc9ae12ec9 Forgot some |e 2014-07-19 18:47:34 +00: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
1d4955081d Fix 55ch cancer; can now see next page of posts, ?/recent uses templating system 2014-07-19 18:41:48 +00:00
8chan
c7ef03f204 Merge https://github.com/vichan-devel/vichan 2014-07-06 00:18:45 +00:00
Marcin Łabanowski
95bb7b84b7 actually fix #70 2014-07-06 01:07:41 +02:00
Marcin Łabanowski
bd29586e32 actually fix #70 2014-07-06 01:07:41 +02:00
Michael Walker
8aff83bdd4 Fix unsanitised text vulnerability in post/fileinfo.html 2014-07-05 21:57:06 +01:00
Michael Walker
ebdee08d75 Fix unsanitised text vulnerability in post/fileinfo.html 2014-07-05 21:57:06 +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
ef810b1fda Fix issue #45 2014-06-24 19:40:16 +00:00
8chan
d6ddd5edf2 Merge vichan-devel 2014-06-21 19:39:55 +00:00
8chan
5b395c014c Merge https://github.com/vichan-devel/vichan 2014-06-21 19:37:24 +00: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
8chan
8d8563a20d Fix scroll to issues with post-hover.js, clean up highlightReply
Conflicts:
	templates/post_reply.html
	templates/post_thread.html
2014-06-21 20:34:09 +02:00
8chan
27bca279ac Fix scroll to issues with post-hover.js, clean up highlightReply
Conflicts:
	templates/post_reply.html
	templates/post_thread.html
2014-06-21 20:34:09 +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
9e2b722db6 Change timezone of news on main page to local timezone 2014-06-20 23:26:17 +02:00
Techan
4dea8c7a59 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
103a266421 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
Techan
7bf6c97e78 Improve main page template 2014-06-20 23:25:08 +02:00
8chan
4dc1d3e315 No index 2014-06-17 23:00:36 +00:00
czaks
8a189e2380 fix upgrade path a little bit with a new catalog 2014-06-16 11:29:18 +02:00
czaks
36d01fdb7d 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
8f49b148b3 Add scripts to catalog page 2014-06-12 17:27:18 +00:00
8chan
255ed9330c Add scripts to catalog page 2014-06-12 17:26:21 +00:00
8chan
1d6f46d9bb Fix scroll to issues with post-hover.js, clean up highlightReply 2014-06-12 15:36:40 +00:00
8chan
a997ce9e8d Fix scroll to issues with post-hover.js, clean up highlightReply 2014-06-12 15:36:40 +00:00
8chan
ce53832fdf Fix scroll to issues with post-hover.js, clean up highlightReply 2014-06-12 15:36:01 +00:00
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
czaks
094b5a21c1 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
59e614eb1f 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
Fredrick Brennan
4460b08096 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
8ad1edf5d7 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
7ab87343b7 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
d4753786c7 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
d3e03c1125 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
Fredrick Brennan
a781ceb041 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
e04cbe9e6f 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
004b0701c1 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
29ca1decd9 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
7ca6ce25f5 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
czaks
8c7505d396 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
copypaste
f178769a0a multiimage posting 2014-04-27 15:48:47 +02:00
8chan
7f56103958 Search page fix 2014-04-23 21:59:41 +00:00
8chan
03dea2173e 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
a4689d5239 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
czaks
dc93b06d90 update copyright footers in themes 2014-04-20 02:27:54 +02:00
8chan
b1688235dd Merge vichan-devel 2014-04-19 20:11:34 +00:00
8chan
8620e96971 Re-add board into querystring for banners 2014-04-19 20:03:54 +00:00
8chan
071ffaa69c Attempt to fix scroll to anchor issue 2014-04-19 20:02:39 +00:00
8chan
6d7dc7d2d5 Remove openBoard() from ukko 2014-04-19 20:02:15 +00:00
kaf
f83c87b623 Added: /pol/-like flags based on a953229de7
Conflicts:
	inc/config.php
	templates/post_form.html
2014-04-19 18:48:17 +02:00
kaf
1c2aa523a3 Added: /pol/-like flags based on a953229de7
Conflicts:
	inc/config.php
	templates/post_form.html
2014-04-19 18:48:17 +02:00
czaks
bfc4df8276 Merge branch 'master' of github.com:vichan-devel/Tinyboard into br-integration 2014-04-19 00:24:52 +02:00
czaks
6f39fecb53 Merge branch 'master' of github.com:vichan-devel/Tinyboard into br-integration 2014-04-19 00:24:52 +02:00
czaks
e5c48282c4 apply new branding for vichan-devel 2014-04-17 17:11:32 +02:00
czaks
388867d67f apply new branding for vichan-devel 2014-04-17 17:11:32 +02:00
8chan
c555a88aa9 Fix stylechooser 2014-04-17 00:41:33 +00:00
root
b30fff7ca7 Merge unmerged live changes 2014-04-16 15:14:02 +00:00
root
e34fe06db1 Merge vichan-devel! 2014-04-16 15:05:32 +00:00
czaks
59874b8376 modularize post templates a little more 2014-04-16 15:01:37 +02:00
czaks
037c29619d modularize post templates a little more 2014-04-16 15:01:37 +02:00
czaks
48bc9d9e29 add some files missing from the previous commit 2014-04-16 11:58:41 +02:00