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

221 Commits

Author SHA1 Message Date
czaks
d1a5e9d2cf Merge branch 'master' of https://github.com/savetheinternet/Tinyboard
Conflicts:
	stylesheets/dark.css
	stylesheets/futaba+vichan.css
	stylesheets/miku.css
	stylesheets/stripes.css
	stylesheets/testorange.css
	stylesheets/wasabi.css
2013-08-01 23:43:20 -04:00
Michael Foster
d71f49c801 Don't redraw image again after correcting image orientation; Correct image orientation with convert+gifsicle too 2013-08-01 21:28:16 -04:00
czaks
926b2c31ed Merge branch 'master' of https://github.com/savetheinternet/Tinyboard 2013-08-01 00:47:33 -04:00
Michael Foster
d379224e3f Add optional database table prefix (issue #118; see issue comments for details) 2013-07-31 22:14:26 -04:00
czaks
ef9ede073f Merge branch 'master' of https://github.com/savetheinternet/Tinyboard
Conflicts:
	inc/functions.php
2013-07-31 21:03:13 -04:00
Michael Foster
da5048a0e4 SQL cleanup 2013-07-31 20:51:43 -04:00
czaks
0eaf52583f Merge branch 'master' of https://github.com/savetheinternet/Tinyboard
Conflicts:
	templates/thread.html
2013-07-31 19:25:04 -04:00
Michael Foster
2b74f8b37d Markup modifiers: raw HTML 2013-07-31 19:18:55 -04:00
Michael Foster
be11041471 Markup modifiers. Fix issue #66 (public ban message lost when rebuilding post body) 2013-07-31 18:59:54 -04:00
czaks
625a7961bd Merge branch 'master' of https://github.com/savetheinternet/Tinyboard 2013-07-31 17:02:30 -04:00
Michael Foster
a8c929e0e7 Fix issue #74. Note: This bug may break the display of certain filenames prior to upgrade. 2013-07-31 16:34:50 -04:00
czaks
7e58e50516 Merge branch 'master' of https://github.com/savetheinternet/Tinyboard
Conflicts:
	inc/config.php
	inc/display.php
	inc/functions.php
	inc/image.php
	js/expand.js
	js/hide-threads.js
	js/local-time.js
	js/smartphone-spoiler.js
	templates/header.html
	templates/index.html
	templates/main.js
	templates/page.html
	templates/post_reply.html
	templates/post_thread.html
	templates/thread.html
2013-07-31 14:54:20 -04:00
Michael Foster
bb820f6da9 Issue #126 2013-07-31 12:05:19 -04:00
czaks
eed8767039 Merge branch 'master' of https://github.com/savetheinternet/Tinyboard
Conflicts:
	inc/functions.php
	inc/mod/pages.php
	install.php
	js/expand.js
	mod.php
2013-07-31 02:30:44 -04:00
Michael Foster
ca6cb1fdea Allow Unicode in board URIs. 2013-07-31 02:08:55 -04:00
Michael Foster
a01f53b4a4 Upgrade to utf8mb4 charset for MySQL server versions above 5.5.3. Keep support for older versions. Fix charsets for multiple columns and tables. 2013-07-30 22:08:56 -04:00
Michael Foster
e2adc0093d MySQL's utf8 charset only supports up to 3-byte symbols. Insterting four byte symbols (U+010000 to U+10FFFF) can be done maliciously to break HTML mark-up.
The ideal solution was to convert to MySQL's utf8mb4 charset, but then we would lose support for MySQL < 5.5.3. In this fix, incompatible characters are encoded as HTML numeric character references (eg. #65536) and just stripped from body_nommarkup.
2013-07-30 16:41:10 -04:00
czaks
f5115f1945 Merge branch 'master' of https://github.com/savetheinternet/Tinyboard 2013-07-28 20:51:43 -04:00
Michael Foster
d9dfed5e1c Fix for last commit 2013-07-28 20:46:00 -04:00
Michael Foster
9a14d32c77 Strip combining characters from Unicode strings (eg. Zalgo) 2013-07-28 20:33:26 -04:00
czaks
73414519ba Merge branch 'master' of https://github.com/savetheinternet/Tinyboard 2013-07-22 10:14:17 -04:00
Michael Foster
f798bb5209 Option to automatically strip EXIF metadata from JPEGs 2013-07-21 15:50:45 -04:00
czaks
600324b137 Remove imgcaptcha, this code is unused in any of our forks and needs work to get here back.
Revert "Merge branch 'imgcaptcha' of https://github.com/asiekierka/Tinyboard"

This reverts commit 49afb685c8, reversing
changes made to 2451a0f29c.

Conflicts:

	js/imgcaptcha.js
2013-07-20 22:47:26 -04:00
czaks
274a86dd03 Merge branch 'master' of https://github.com/savetheinternet/Tinyboard
Conflicts:
	templates/themes/sitemap/info.php
2013-07-20 17:28:34 -04:00
Michael Foster
731cfba33b Only store video URLs in database, instead of the generated player HTML. 2013-07-19 18:36:12 -04:00
Michael Foster
2650da760c I just realized that ImageMagick had a -auto-orient switch. No need for all that code. 2013-07-19 09:39:46 -04:00
czaks
495c6fa846 Merge branch 'master' of https://github.com/savetheinternet/Tinyboard
Conflicts:
	post.php
2013-07-18 15:19:03 -04:00
Michael Foster
34b5f62600 Themes edit: Split "post" into two seperate actions: "post" (replies) and "post-thread". And add a $board variable. 2013-07-18 12:06:26 -04:00
czaks
6152ed43bd Merge branch 'master' of https://github.com/savetheinternet/Tinyboard
Conflicts:
	install.php
	templates/index.html
	templates/thread.html
2013-07-16 13:02:13 -04:00
Michael Foster
2ec71f9b3e incrementSpamHash() was duplicated for some reason 2013-07-16 01:34:36 -04:00
czaks
a139c44a80 Merge branch 'master' of https://github.com/savetheinternet/Tinyboard
Conflicts:
	templates/page.html
2013-06-21 16:41:39 -04:00
czaks
2542aec237 SPDY: send back updated thread/index after post
Sets X-Associated-Content header, which is at least recognized
by Apache mod_spdy.
2013-06-21 16:37:56 -04:00
Macil Tech
aa881058a3 Adds image_hard_limit and reply_hard_limit options.
Also reworks the numPosts() function and uses it elsewhere too.
2013-06-18 12:21:41 -05:00
Marcin Łabanowski
5cc2a67e63 Merge branch 'master' of https://github.com/savetheinternet/Tinyboard into HEAD
Conflicts:
	mod.php
2013-01-23 18:58:38 +01:00
Michael Save
53fa21b76c Automatically rotate and mirror images based on EXIF orientation (only compatiable with "convert" option selected at the moment) 2013-01-24 03:24:38 +11:00
Marcin Łabanowski
6990cab263 Merge branch 'master' of https://github.com/savetheinternet/Tinyboard 2013-01-21 13:17:13 +01:00
Michael Save
4f58617507 Copyright and license update for 2013. 2013-01-20 21:23:46 +11:00
Marcin Łabanowski
f6b7b3901a Merge branch 'master' of https://github.com/savetheinternet/Tinyboard 2013-01-19 16:23:02 +01:00
Macil Tech
ef7c998b02 Add field_disable_subject and field_disable_reply_subject config options. 2013-01-19 01:37:48 -06:00
Michael
b91845ea7e Merge pull request #93 from Macil/image_reject_repost_in_thread
Add image_reject_repost_in_thread option
2013-01-18 23:03:16 -08:00
Macil Tech
14469f80a9 Removed redundant code in image processing.
Both paths of the code here did the same thing.
2013-01-19 00:39:29 -06:00
Macil Tech
15043b39cf Add image_reject_repost_in_thread option 2013-01-19 00:25:24 -06:00
asiekierka
f030a0e95a fixed to actually work 2012-12-22 18:16:09 +01:00
Michael Save
c0760892b5 Merge branch 'mod-rewrite'
Conflicts:
	inc/lib/Twig/Extensions/Extension/Tinyboard.php
	install.php
	mod.php
	stylesheets/style.css
	templates/index.html
	templates/page.html
	templates/thread.html
2012-08-27 02:28:04 +10:00
Michael Save
fa24147525 Temporary bugfix for incorrectly escaped email field 2012-08-27 02:18:31 +10:00
Michael Save
9062a7cf34 $post['id'] 2012-05-27 20:55:56 +10:00
Michael Save
c1c7adb0e9 Bugfix: the number of successful passes for an anti-spam "hash" was often incorrectly incremented 2012-05-07 23:51:58 +10:00
Michael Save
7af775cf80 Bugfix: the number of successful passes for an anti-spam "hash" was often incorrectly incremented 2012-05-07 23:51:15 +10:00
Michael Save
8b2e62f105 custom capcode permissions 2012-05-07 18:22:20 +10:00
Michael Save
36b8397f9f Bugfix: with file uploading (introduced with last commit) 2012-05-05 18:12:11 +10:00