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

450 Commits

Author SHA1 Message Date
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
czaks
ca6373a077 spoilerimage config variable: this got fixed doubly, once wrong, merge both fixes 2013-08-11 17:34:43 -04:00
czaks
7474bd82d7 Merge branch 'master' of http://github.com/ctrlcctrlv/Tinyboard 2013-08-11 17:32:57 -04:00
czaks
b558ba60a2 fix notice for mod spoiler image 2013-08-11 17:22:39 -04:00
ctrlcctrlv
06d2f7ffb4 Merge conflict 2013-08-11 15:36:17 +00:00
ctrlcctrlv
c31a610914 forgot to rename config option 2013-08-11 13:55:15 +00:00
ctrlcctrlv
5786c7dbc0 Improve spoiler action 2013-08-11 13:54:11 +00:00
czaks
24b1adc501 Merge branch 'master' of https://github.com/savetheinternet/Tinyboard
Conflicts:
	inc/config.php
	inc/display.php
	inc/mod/pages.php
	js/catalog-link.js
	post.php
	templates/banned.html
2013-08-11 09:50:33 -04:00
Michael Foster
4fbbec0e5d $config['boardlist_wrap_bracket'] default to true 2013-08-11 21:30:46 +10:00
ctrlcctrlv
edd197586f Option to have a message on the ban page
Conflicts:
	inc/config.php
2013-08-11 21:29:02 +10:00
ctrlcctrlv
48ac445038 Allow for HTML in the board subtitle
Conflicts:
	inc/config.php
2013-08-11 21:08:19 +10:00
Michael Foster
172effc889 Clean: Make boardlist bracket wrapping optional 2013-08-11 21:06:13 +10:00
ctrlcctrlv
51d1d4eb5c Make boardlist bracket wrapping optional 2013-08-11 21:04:45 +10:00
fallenPineapple
42f6b8e0bb Adds "noko50" (View Last 50 Posts) pages. (Broken Reply) 2013-08-10 17:16:30 -04:00
czaks
62e4b854c3 Fix boardlist bracketing issue 2013-08-09 17:16:25 -04:00
ctrlcctrlv
68bd3150f1 Option to have a message on the ban page 2013-08-09 19:52:19 +00:00
ctrlcctrlv
013ca134be Oekaki 2013-08-08 22:15:59 +00:00
ctrlcctrlv
3204b57b5b Advertisements 2013-08-08 21:57:52 +00:00
ctrlcctrlv
dc40137b97 Optionally allow the moving of single replies 2013-08-08 21:08:01 +00:00
ctrlcctrlv
24a015eed4 Spoil files moderator action 2013-08-08 19:41:21 +00:00
ctrlcctrlv
52b7254d4b Optionally use email selectbox 2013-08-08 19:30:05 +00:00
ctrlcctrlv
074217ec3c Allow for HTML in the board subtitle 2013-08-08 18:58:44 +00:00
ctrlcctrlv
1e2b4645df Make boardlist bracket wrapping optional 2013-08-08 18:43:24 +00:00
czaks
585f75fcaf Revert "Merge branch 'master' of github.com:vichan-devel/Tinyboard"
This reverts commit a84c4510fc, reversing
changes made to a8327c3a37.
2013-08-05 06:17:01 -04:00
czaks
c3def0e453 Merge branch 'master' of github.com:vichan-devel/Tinyboard
Conflicts:
	js/post-hider.js
2013-08-05 06:03:40 -04:00
czaks
715111e4c5 bring back ==tags== by default 2013-08-04 23:06:54 -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
c17ab961be bugfix 2013-08-04 18:48:32 -04:00
Michael Foster
d3e9bd18f7 This should probably still be ADMIN. By default, don't let mods or janitors edit any of the config. 2013-08-04 17:53:55 -04:00
Michael Foster
39a8771706 ?/config: Advanced permissions 2013-08-04 17:53:09 -04:00
Michael Foster
7ab7e0a862 Not the nicest-looking fix, but comments (actual comments, not code examples) beginning with "$" are ignored by ?/config. 2013-08-04 16:46:08 -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
czaks
64147c93fa Merge branch 'master' of https://github.com/savetheinternet/Tinyboard 2013-08-04 01:00:23 -04:00
Michael Foster
da73fd3283 Use exiftool to patch bug for now. 2013-08-04 00:48:28 -04:00
czaks
381a0d5823 Merge branch 'master' of https://github.com/savetheinternet/Tinyboard 2013-08-03 22:18:46 -04:00
Michael Foster
c169b7ebe2 fix last commit 2013-08-03 22:16:17 -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
root
82f4a3d58f Merge branch 'master' of https://github.com/savetheinternet/Tinyboard 2013-08-03 21:49:38 -04:00
Michael Foster
593f8757f2 Bugfix: gm and auto-orient thumbnailing 2013-08-03 21:47:24 -04:00
Michael Foster
afa37411c0 Fix some indent-formatting. Tab = 8 chars 2013-08-03 21:04:45 -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
bb24c0b0f8 no 2013-08-03 05:25:41 -04:00
Michael Foster
e275a1b7fb Better/working web config editor 2013-08-03 05:21:02 -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
c6499dacce Better command-line ImageMagick image processing 2013-08-02 23:18:25 -04:00
Michael Foster
9ef34efc0d $config['dir']['static'] doesn't exist. 2013-08-02 21:01:04 -04:00