1
0
mirror of https://github.com/vichan-devel/vichan.git synced 2024-12-12 07:41:12 +01:00
Commit Graph

1659 Commits

Author SHA1 Message Date
unknown
9c5ec12aaa [#184] Reports made to clean posts are now ignored correctly (and in accordance with the local/global duality). Marking posts clean dismisses posts (also in accordance with local/global duality). Fixed up some templating issues (now display more correct messages and omit actions that are invalid). Moved Clean action off post-level and into reports action. 2014-10-21 07:50:25 -05:00
unknown
4c8e920303 [#184] Resolved duplicate report issue. Added rudamentary Clean functionality. 2014-10-20 10:17:19 -05:00
unknown
3c2ebb2d6b Merge branch 'master' of git://github.com/ctrlcctrlv/8chan
Conflicts:
	templates/8chan/index.html
2014-10-19 11:15:57 -05:00
unknown
01c80bd7ad [#184] System almost completely functional. Woo. 2014-10-19 11:07:07 -05:00
unknown
a8a843bf4b [#184] Added Promote and Demote to reports. CSS improvements. 2014-10-19 00:07:16 -05:00
unknown
2d6d449bd2 [#184] Added <body> tag classes. Style selector now adds a <body> class. Moved board list under moderator dashboard. 2014-10-18 20:07:04 -05:00
unknown
6850301595 [#184] Added new files. 2014-10-18 19:57:51 -05:00
czaks
3ac3899787 Merge branch 'master' of https://github.com/ctrlcctrlv/8chan 2014-10-18 22:45:02 +02:00
czaks
8f038d3cef Merge https://github.com/vichan-devel/vichan 2014-10-18 22:44:53 +02:00
czaks
b55ebcd0ef custom alert: now alert will be able to display custom HTML 2014-10-18 22:43:35 +02:00
8chan
f1c2388840 8archive.moe 2014-10-18 13:20:46 -07:00
8chan
ba7e3c4aaa use tabs and not spaces 2014-10-16 18:52:28 -07:00
8chan
16c613dad0 SECURITY: Stop showing all mods poster IDs
I'm retarded
2014-10-12 18:31:00 -07:00
8chan
9bf6ebec43 SECURITY: IPs were still being shown on IP_less in a few places 2014-10-12 16:34:34 -07:00
VladVP
14ea4958e5 Added flag icon for Lojban language 2014-10-11 13:18:14 +02:00
8chan
9ddacf0ab4 settings.html i18n 2014-10-10 09:53:10 -07:00
8chan
593c25b77b Force poster IDs in mod.php 2014-10-09 20:27:46 -07:00
8chan
da0ea45730 Merge branch 'master' of https://github.com/ctrlcctrlv/8chan 2014-10-09 21:40:24 -04:00
8chan
fe9297aaaa Attempt to hide IPs from board volunteers 2014-10-09 21:39:37 -04:00
8chan
1ebf9c4d8c Maybe fix locales? 2014-10-09 16:59:40 -07:00
8chan
6267cdcf9a Fix 2014-10-09 03:19:23 +00:00
czaks
3a48cbc790 8chan: allow users to opt out of public ban system 2014-10-09 03:10:47 +02:00
czaks
a94f527bd3 Merge vichan 2014-10-09 01:50:32 +02:00
czaks
948695e73c lel, this one will do 2014-10-09 01:49:29 +02:00
czaks
c1d4390759 Merge vichan 2014-10-09 01:27:09 +02:00
czaks
7719ad3e81 minor bugfix @ banlist 2014-10-09 01:26:34 +02:00
czaks
5c1b5d133c Merge branch 'master' of https://github.com/ctrlcctrlv/8chan 2014-10-09 01:24:14 +02:00
8chan
cedfa42670 Forgot edited at template 2014-10-08 16:23:42 -07:00
czaks
643de18d64 Merge with a private vichan branch
Conflicts:
	inc/bans.php
	inc/mod/pages.php
2014-10-08 23:32:01 +02:00
czaks
9b3fa77719 new banlist implementation; also includes a public banlist 2014-10-08 23:23:59 +02:00
8chan
9dd7e4d486 Sort by unique posters by default 2014-10-08 11:35:28 -07:00
8chan
d58adad48d SECURITY: Move indexed option to table...fixes unindexed boards appearing in search/random 2014-10-07 20:54:00 -07:00
8chan
55905bce1f Update template to reflect new limit...actually it should read from config... 2014-10-07 18:21:54 -07:00
8chan
ba88035109 Edited at feature...add edited_at DATETIME NULL to all tables to use it. 2014-10-07 17:35:50 -07:00
8chan
3da946268a SECURITY: Poster IDs could reveal IPs across boards
Imagine the following scenario:

Alice has permission to view IPs on board A, and Bob has permissions to view IPs on board B.

If the post number was to match, and the same IP made both posts, A and B could trade user IPs which they wouldn't normally have permission to do so. This weird bug has already creeped up on 8chan.co and is now patched.
2014-10-07 08:16:21 -07:00
8chan
d94bff238e Home page for unique IP based featured boards 2014-10-06 18:02:30 -07:00
8chan
93b30d6829 class around poster IDs 2014-10-07 00:19:15 +02:00
8chan
6d19be38e3 Merge https://github.com/ctrlcctrlv/8chan
Conflicts:
	inc/instance-config.php
2014-10-05 17:09:50 +00:00
czaks
8b698e36e7 Merge https://github.com/vichan-devel/vichan
Conflicts:
	inc/mod/pages.php
	js/auto-reload.js
	js/id_colors.js
	js/id_highlighter.js
	stylesheets/style.css
	templates/index.html
2014-10-05 18:12:19 +02:00
czaks
1964279436 Merge branch 'master' of github.com:vichan-devel/Tinyboard
Conflicts:
	stylesheets/style.css
2014-10-05 18:01:01 +02:00
Bui
62b7e02050 give OPs IDs 2014-10-05 17:49:31 +02:00
Bui
1edaea309b quote selected text on cite 2014-10-05 17:49:31 +02:00
czaks
86eed0b349 add stylesheet choice to catalog theme 2014-10-05 17:49:27 +02:00
kaf
296e4fd5fa Added an option to hide sages 2014-10-05 15:29:37 +00:00
Fredrick Brennan
4b3e33c5b0 Merge pull request #118 from topkek/master
404/Error handling for thread updater
2014-10-02 23:19:32 -04:00
Bui
5446791486 lol spaces 2014-10-03 00:16:41 +09:00
Bui
f3bf603698 add id to thread links 2014-10-03 00:12:15 +09:00
8chan
99e95bb807 Merge ../http
Conflicts:
	templates/themes/catalog/catalog.html
2014-09-30 23:10:27 +00:00
8chan
15f2545418 Add disclaimer back 2014-09-30 23:09:33 +00:00
8chan
ff56081a34 Add board title 2014-09-30 23:08:56 +00:00
service
228eeb07b4 Merge ../http 2014-09-30 23:04:54 +00:00
Bui
312ccf6c4e give OPs IDs 2014-09-30 15:24:12 +09:00
Bui
3d58a03a4d quote selected text on cite 2014-09-30 14:45:02 +09:00
topkek
200881cfee Use https for youtube thumbnails 2014-09-29 19:10:18 +01:00
8chan
84d600a880 unique ips column 2014-09-29 07:17:00 +00:00
anonfagola
8f70c7e138 Update catalog.html
Changed title from being - "Catalog /board/" to "/board/ - Catalog"
2014-09-28 10:01:17 -07:00
fourfivesix
1522c0b815 Makes the frontpage template W3C compliant. 2014-09-27 22:02:59 -03:00
8chan
293e30825d Catalog link in templates, not catalog-link.js; fixes mod.php error 2014-09-27 20:06:11 +00:00
8chan
cb7b7d070c threadscroll was in template for no reason 2014-09-27 11:37:50 +02:00
8chan
03439092ee Merge /home/service/www/http 2014-09-27 00:52:31 +00:00
8chan
24caf95f20 Fix mod.php catalog 404 bug 2014-09-27 00:52:21 +00:00
8chan
5357db8475 Merge https://github.com/ctrlcctrlv/8chan
Conflicts:
	inc/instance-config.php
	templates/index.html
2014-09-27 00:47:47 +00:00
8chan
88e7b239e8 threadscroll was in template for no reason 2014-09-26 23:53:52 +00:00
8chan
d5c975622e Use templates for more pages, i18n 2014-09-26 23:52:02 +00:00
anonfagola
b38c265c47 Update index.html
Removed leftover code
2014-09-25 19:34:27 -07:00
8chan
19e864c15c I don't know what I did. 2014-09-25 22:53:56 +00:00
Lineark
f1b3ebcd03 Update report_delete.html
fix title on global report checkbox at bottom
2014-09-25 20:34:50 +00:00
8chan
e81d016ffa Attempt to fix scroll to anchor issue 2014-09-25 06:56:24 +02:00
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
8chan
4238249af6 Merge https://github.com/ctrlcctrlv/8chan 2014-09-24 04:28:10 +00:00
8chan
fb405c9cf0 Reject repost option in ?/settings 2014-09-24 04:25:55 +00:00
anonfagola
45dd9e637f Added scrolling threads with up and down keys
For 8chan X. Redone so it's in js folder.
@KillerWhale321
2014-09-24 04:47:40 +02: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
anonfagola
c3c391be9e Added scrolling threads with up and down keys
For 8chan X. Redone so it's in js folder.
@KillerWhale321
2014-09-23 16:54:19 -07:00
8chan
ec1d55d632 Add templates I forgot 2014-09-23 19:49:52 +00:00
8chan
857e5b69a4 class around poster IDs 2014-09-23 18:17:33 +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
762361d72c KATEX 2014-09-21 17:53:50 +00:00
dubcheck
c2f612bac9 'no comment' in Recent theme 2014-09-21 05:51:17 +02:00
dubcheck
8fd819a93f 'no comment' in Recent theme 2014-09-21 05:51:17 +02:00
czaks
7ec728ffb0 add a go to top link thread view; fixes #82 2014-09-21 02:52:20 +02:00
czaks
19d9047d07 add a go to top link thread view; fixes #82 2014-09-21 02:52:20 +02: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
6f195a033c Merge https://github.com/vichan-devel/vichan 2014-09-20 15:29:05 +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
czaks
ea3c571d6c Merge branch 'catalog-spoiler-fix' of https://github.com/marlencrabapple/vichan 2014-09-20 06:44:03 +02:00
czaks
c16b8e45db 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
czaks
5fe3ceb5e0 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
836374dc96 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
marlencrabapple
a194b142ab 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
Ian Bradley
b4619db814 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
19b08a8ef2 Subjects in catalog 2014-09-15 14:29:39 +00:00
8chan
7005163af3 Merge https://github.com/vichan-devel/vichan 2014-09-13 16:38:06 +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
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
8chan
e642ede1d8 Merge ../http 2014-08-10 14:43:18 +00:00
8chan
e59ee1c80e Pull 8chan 2014-08-10 14:43:16 +00:00
8chan
3b93414e92 indentation 2014-08-10 14:42:57 +00:00
8chan
edc8df469e Merge vichan-devel 2014-08-10 14:41:40 +00:00
czaks
2c99ede62f fix html validity 2014-08-08 23:09:33 +02:00
czaks
f595e8be4e fix html validity 2014-08-08 23:09:33 +02:00
czaks
bc5858fe83 image id buttons should be smaller 2014-08-08 23:08:02 +02:00
czaks
fdcfdc77e7 image id buttons should be smaller 2014-08-08 23:08:02 +02:00
czaks
05e7ad0b56 ongoing catalog cleanup 2014-08-08 22:50:31 +02:00
czaks
9d6d502796 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
czaks
68a6d2664d fix & optimize catalog a little bit, don't expect anything big yet 2014-08-08 22:36: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
czaks
84c8e74ffa Revert "I thought I deleted that"
This reverts commit c6e1afcf65.
2014-08-08 22:09:28 +02:00
czaks
93cedb44aa Revert "I thought I deleted that"
This reverts commit c6e1afcf65.
2014-08-08 22:09:28 +02:00
Jano Slota
31f0c1f1e3 Open image identification links in new tabs 2014-08-08 21:59:06 +02:00
Jano Slota
ad4003bfb9 Open image identification links in new tabs 2014-08-08 21:59:06 +02:00
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