1
0
mirror of https://github.com/vichan-devel/vichan.git synced 2024-11-30 10:14:37 +01:00
Commit Graph

425 Commits

Author SHA1 Message Date
czaks
13e0e451da Merge branch 'master' of https://github.com/savetheinternet/Tinyboard
Conflicts:
	inc/config.php
	inc/display.php
	inc/functions.php
2013-08-13 14:46:16 -04:00
Michael Foster
34c3111557 Don't create anti-bot stuff in buildThread() when asked to return HTML as a string. 2013-08-13 21:53:23 +10:00
Michael Foster
86e8b78c02 allow wordfilters to be callbacks 2013-08-13 01:53:23 +10:00
czaks
0c52d1b93c Merge branch 'noko50-new-dev11' of http://github.com/fallenPineapple/Tinyboard
Conflicts:
	inc/functions.php
2013-08-11 17:49:29 -04:00
fallenPineapple
42f6b8e0bb Adds "noko50" (View Last 50 Posts) pages. (Broken Reply) 2013-08-10 17:16:30 -04:00
czaks
fe215612ce critical fix for merge 4chanapi+try_smarter: make even pages work 2013-08-09 19:46:28 -04:00
czaks
3ca29fbe17 fix api issue 2013-08-05 06:09:15 -04:00
czaks
ea46f671e4 that wasn't meant to be committed 2013-08-05 05:03:46 -04:00
czaks
9054b67e7f tinyboard special markup: allow content to span multiple lines 2013-08-05 05:02:37 -04:00
czaks
769db5e784 fix Varnish compatibility when characters such as * are in use for a boardname 2013-08-05 04:51:48 -04:00
czaks
3f008d8870 fix Varnish compatibility when characters such as * are in use for a boardname 2013-08-04 22:12:21 -04:00
czaks
24e07aedcc Merge branch 'master' of https://github.com/savetheinternet/Tinyboard
Conflicts:
	inc/image.php
2013-08-04 21:17:38 -04:00
Michael Foster
9935fb3024 gifsicle: redirect stdout to /dev/null but keep stderr going to stdout 2013-08-04 16:32:36 -04:00
Michael Foster
da18afabdd Use new shell_exec function for $config['dns_system'] host queries too 2013-08-04 05:03:21 -04:00
Michael Foster
41f93845de fix last commit 2013-08-04 04:49:21 -04:00
Michael Foster
d60c015fe9 Don't purge the ban list of expires bans every time somebody posts. Add a timer option. Less SQL queries when posting. 2013-08-04 04:48:13 -04:00
Michael Foster
6bd6faa57d Fix for instances with old GraphicsMagick or ImageMagick versions (no -auto-orient). 2013-08-03 22:14:25 -04:00
Michael Foster
ac931e8cd7 shell_exec_error() fix 2013-08-03 21:53:09 -04:00
czaks
9d6f58d226 Merge branch 'master' of https://github.com/savetheinternet/Tinyboard 2013-08-03 21:01:26 -04:00
Michael Foster
67da80e354 Better image processing. Add support for GraphicsMagick (a fork of ImageMagick) and exiftool (for stripping EXIF metadata quickly). 2013-08-03 20:34:59 -04:00
czaks
8f7367d925 Merge branch 'master' of https://github.com/savetheinternet/Tinyboard
Conflicts:
	inc/config.php
	inc/functions.php
	templates/generic_page.html
	templates/index.html
2013-08-03 19:05:25 -04:00
Michael Foster
ad5570ada2 Update $config['try_smarter']. Should be working now. 2013-08-03 17:42:34 -04:00
Michael Foster
e9ebf724fe EXPERIMENTAL: Try not to build pages when we shouldn't have to. 2013-08-03 07:50:25 -04:00
Michael Foster
e275a1b7fb Better/working web config editor 2013-08-03 05:21:02 -04:00
Michael Foster
f18f41f984 Why is this escaped? 2013-08-03 03:36:20 -04:00
Michael Foster
4f4e0b73a8 Erorr handling update 2013-08-03 02:01:52 -04:00
Michael Foster
3a0ed6fad3 Better error handling/displaying with $config['debug'] and $config['verbose_errors'] 2013-08-03 00:22:28 -04:00
Michael Foster
d59e74f394 Major config.php cleanup and a few minor misc fixes. 2013-08-02 20:52:58 -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
a902bf6cba Merge branch 'master' of https://github.com/savetheinternet/Tinyboard 2013-07-31 21:36:54 -04:00
czaks
4d8c7f67cd markup modifiers: make it even harder to escape 2013-07-31 21:27:50 -04:00
Michael Foster
e740f45ed1 Bugfix: HTML injection in post editing (introduces and fixes yet another bug) 2013-07-31 21:24:17 -04:00
czaks
164d0e6e3b Revert "markup modifiers: make it even harder to escape"
This reverts commit d7ea47a91f.
2013-07-31 21:22:57 -04:00
czaks
07f8aa8c4c Revert "facilitate using markup modifiers multiple times; make raw html not consume the whole post"
This reverts commit e7dd0bbc4a.
2013-07-31 21:22:32 -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
d30d94960c Allow public ban messages on raw HTML posts 2013-07-31 21:02:26 -04:00
Michael Foster
da5048a0e4 SQL cleanup 2013-07-31 20:51:43 -04:00
czaks
99427246e1 markup modifiers: make it even harder to escape 2013-07-31 20:13:19 -04:00
czaks
ada248ce4a facilitate using markup modifiers multiple times; make raw html not consume the whole post 2013-07-31 20:11:11 -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
2c8bd71a9a Merge branch 'master' of https://github.com/savetheinternet/Tinyboard 2013-07-31 17:05:53 -04:00
Michael Foster
19b719f0af Fix last commit 2013-07-31 17:04:36 -04:00
Michael Foster
7619d23499 Only run SQL query to count threads if we really need to 2013-07-31 17:02:42 -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
18017ff761 Javascript l10n: Work without $config['additional_javascript_compile'] 2013-07-31 06:54:53 -04:00
czaks
1924e15354 js i18n: finish implementation with addition of the compiled locale strings file to additional javascripts 2013-07-31 04:57:50 -04:00
czaks
fb1968c0b9 i18n one more string in inc/functions.php 2013-07-31 04:56:42 -04:00