1
0
mirror of https://github.com/vichan-devel/vichan.git synced 2024-11-15 03:17:38 +01:00
Commit Graph

658 Commits

Author SHA1 Message Date
Marcin Łabanowski
97a25dad03 Merge pull request #102 from cable6-dev/bugfix-genwebmerror
[bugfix]$config['error']['genwebmerror'] wasn't set in config.php
2014-10-05 17:56:46 +02:00
kaf
3c2529e157 [bugfix]$config['error']['genwebmerror'] wasn't set in config.php 2014-10-05 15:35:52 +00:00
kaf
296e4fd5fa Added an option to hide sages 2014-10-05 15:29:37 +00: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
Ian Bradley
c1ecef3772 Added support for BSD md5 incase md5sum isn't available. 2014-09-15 16:33:37 -07: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
Tomasz Konojacki
1b62fbea6f added support for statcounter.com tracking code 2014-08-24 23:33:53 +02:00
8chan
1ea3da1db6 Merge Barrucadu/diceroll into master 2014-08-10 15:35:11 +00: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
Jano Slota
46c07d3566 Change styling of fileinfo, add iqdb search 2014-08-08 21:58:15 +02:00
Jano Slota
a87dc24169 Minor fixes for embed htmls 2014-08-08 21:57:58 +02:00
Jano Slota
3144e11cf9 Minor fixes for embed htmls 2014-08-08 21:57:11 +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
czaks
57e80951d9 sorta document the changes in config.php 2014-07-28 04:15:09 +02:00
czaks
8d3c3f7ef7 Merge 4.5 2014-07-06 03:58:00 +02:00
czaks
d38433a9c2 fix gzip static 2014-07-06 03:22:40 +02:00
czaks
9b943da60a Revert "Rework the GeoIP code, add country-based poster names"
This reverts commit db3c7f4ee9.
2014-07-06 02:13:08 +02:00
czaks
a9b035d822 Revert "Second rework of the GeoIP code, now supporting cities!"
This reverts commit 2488e77e86.
2014-07-06 02:12:54 +02:00
Jano Slota
2488e77e86 Second rework of the GeoIP code, now supporting cities! 2014-07-06 01:30:38 +02:00
Jano Slota
db3c7f4ee9 Rework the GeoIP code, add country-based poster names 2014-07-06 01:29:12 +02:00
Jano Slota
4adf893c39 Random names for anonymous users - thanks to svnth 2014-07-06 01:27:38 +02:00
czaks
19ce50c545 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
593560956c Added configurabe image identification 2014-05-07 11:14:30 +02:00
czaks
cd15458a32 Merge remote-tracking branch 'origin/4.5' 2014-05-06 21:53:38 +02:00
czaks
f7278e5a61 user moderation support 2014-05-06 21:53:05 +02:00
Fredrick Brennan
d31a353962 Allow post deletion switch 2014-05-05 18:03:51 -04:00
czaks
dafe0d5896 Merge branch 'master' of github.com:vichan-devel/Tinyboard into staging 2014-05-04 00:19:45 +02:00
czaks
45fdd71b63 fix it more 2014-05-04 00:05:55 +02:00
czaks
318d75ac27 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
bb5446a93d Merge remote-tracking branch 'origin/br-integration' into staging 2014-04-29 21:35:50 +02:00
czaks
c1aaf78cbb forgot one place to remove quick-reply-old 2014-04-29 21:35:45 +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
d208789fa7 remove attentionbar. its code is shit and it doesn't belong here tbh. 2014-04-29 18:33:03 +02:00
copypaste
c483e1258c multiimage posting 2014-04-27 15:48:47 +02:00
czaks
4a3dd0cfd6 config.php: i18n one more message 2014-04-21 02:41:01 +02:00
czaks
7e30f1d3cf add user_flag to valid inputs 2014-04-19 19:17:03 +02:00
kaf
b102fd5f4e Typo
Conflicts:
	inc/config.php
2014-04-19 18:49:12 +02: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
czaks
bfc4df8276 Merge branch 'master' of github.com:vichan-devel/Tinyboard into br-integration 2014-04-19 00:24:52 +02:00
czaks
fb94bcca0e add a webm icon 2014-04-06 21:51:41 +02:00
czaks
6c0b745cf4 SECURITY: local path discovery fix 2014-03-31 10:23:34 +02:00
czaks
f0b2240b5f Merge branch 'master' of github.com:vichan-devel/Tinyboard into br-integration 2014-03-25 13:03:37 +01:00
sinuca
fb2b66e2dd Recent posts functionality
Conflicts:
	inc/config.php
	inc/mod/pages.php
	mod.php
2014-03-25 11:35:04 +01:00
czaks
b585fe912e enable 4chan api by default. it bears some extra CPU time with it, but giving API to the users by default is the way to go. 2014-03-09 01:51:39 +01:00
czaks
75cca1ffb2 fix previous commit 2014-02-24 15:29:26 +01:00
czaks
14c499f9d1 Condense flags into one file. Heads-up for people having custom flags, disable $config['country_flags_condensed'] !!! 2014-02-24 00:06:01 +01:00
czaks
ff9b684f7e remove old oekaki; see vichan-devel#20 2014-01-29 22:59:29 +01:00
czaks
858ebbe68f delegate youtube.js embed html code to config.php 2014-01-09 18:25:00 +01:00
czaks
8a2df689df config.php: clarify comment to mean quick-reply-old, as now it's named 2013-12-25 16:28:50 +01:00
czaks
f5657caf24 Merge branch 'master' of https://github.com/savetheinternet/Tinyboard into vichan-devel-4.5
Conflicts:
	inc/config.php
	install.php
	post.php
	stylesheets/style.css
2013-11-11 21:54:35 +01:00
Michael Foster
de70fb6253 $config['error']['lurk'] was last used in 2010 I think 2013-09-23 15:52:45 +10:00
Michael Foster
39be89ba49 ?/debug/apc 2013-09-23 10:11:16 +10:00
Michael Foster
ff4352d914 Fixed automatic $config['root'] detection with mod.php 2013-09-22 08:13:19 +10:00
Michael Foster
a9b7f9b1bc begin implementation of in-built ban appealing 2013-09-21 12:51:23 +10:00
ctrlcctrlv
0a58973631 Make it so that users can't insert code w/syntax errors into ?/config 2013-09-21 02:21:05 +00:00
czaks
8ca495e5b8 Merge branch 'master' of https://github.com/savetheinternet/Tinyboard into vichan-devel-4.5
Conflicts:
	inc/config.php
2013-09-17 19:12:19 -04:00
Michael Foster
3471f7c668 Optionally show post user was banned for 2013-09-18 08:47:34 +10:00
czaks
6cb7eb939e Merge branch 'master' of https://github.com/savetheinternet/Tinyboard into vichan-devel-4.5
Conflicts:
	inc/config.php
	inc/display.php
	inc/mod/pages.php
	install.php
	js/quick-reply.js
	post.php
	templates/index.html
2013-09-17 10:43:44 -04:00
Michael Foster
3e57bb04d7 Begin upgrade to much better bans table. DO NOT PULL YET; It won't work. 2013-09-17 09:15:24 +10:00
Michael Foster
00833eeafd js/ajax.js: post with ajax 2013-09-15 14:03:27 +10:00
Michael Foster
32c999346f Remove $config['url_regex']; 2013-09-15 05:46:08 +10:00
Michael Foster
c4a6116722 Optionally show page navigation bar at the top too. 2013-09-15 00:42:20 +10:00
Michael Foster
eea4e42609 Add ability to create custom user/permissions groups 2013-09-09 01:33:51 +10:00
Michael Foster
9a846d5ad5 Use Unicode in antispam stuff 2013-09-08 17:01:55 +10:00
Michael Foster
d4cf4c7afb flood-count condition 2013-09-08 15:07:55 +10:00
Michael Foster
a13571cdad Comment mistake 2013-09-08 14:59:43 +10:00
Michael Foster
b7f16dee0f Add ! syntax (NOT) to filters. Don't throttle duplicate post bodies when they are empty 2013-09-07 12:58:23 +10:00
Michael Foster
e9ccc5d72d Optionally EXPLAIN all SQL queries when in debug mode 2013-09-07 12:40:35 +10:00
Michael Foster
f309e4037c Better and faster basic flood prevention, while merging it into $config['filters']. 2013-09-06 23:09:18 +10:00
czaks
069f1def9b Merge branch 'master' of https://github.com/savetheinternet/Tinyboard
Conflicts:
	install.php
2013-09-01 11:25:19 -04:00
Michael Foster
f1b1d41230 Update comments for persistent database connections and increase timeout 2013-08-30 15:05:13 +10:00
czaks
8de81d176c Merge branch 'master' of https://github.com/savetheinternet/Tinyboard
Conflicts:
	inc/config.php
2013-08-29 07:33:19 -04:00
Michael Foster
3f26aa5ac3 . 2013-08-29 20:05:24 +10:00
Michael Foster
eb7cb42e93 $config['markup_repair_tidy']: Better comment 2013-08-29 18:59:36 +10:00
Michael Foster
7b817eea11 Fix markup again. And add the option to repair fucked up nesting (and more) with HTML Tidy ($config['markup_repair_tidy']) 2013-08-29 15:56:36 +10:00
Michael Foster
abd013d6e4 Add $config['always_regenerate_markup'] (99.9% of Tinyboard users should ignore this) 2013-08-29 15:28:45 +10:00
czaks
8503e65858 Merge branch 'master' of https://github.com/savetheinternet/Tinyboard
Conflicts:
	inc/config.php
	inc/functions.php
	install.php
	stylesheets/dark_roach.css
2013-08-28 12:41:36 -04:00
Michael Foster
c31e374a71 Allow Unix sockets for database connection 2013-08-28 20:09:30 +10:00
Michael Foster
b01a402d23 4chan-compatible api: better config.php comments 2013-08-21 22:41:42 +10:00
ctrlcctrlv
ecda099dfb Custom fields in API, read config.php for info. Non-4chan compatible fields removed. 2013-08-21 22:35:01 +10:00
ctrlcctrlv
01e906b1d3 Make it possible to disable API, disable it by default
Conflicts:
	inc/functions.php
2013-08-21 22:34:52 +10:00
czaks
de035f4a7e Merge branch 'master' of https://github.com/savetheinternet/Tinyboard
Conflicts:
	stylesheets/dark_roach.css
	stylesheets/style.css
2013-08-20 18:22:37 -04:00
ctrlcctrlv
3e9f4f101a Custom fields in API, read config.php for info. Non-4chan compatible fields removed. 2013-08-20 18:17:05 +00:00
ctrlcctrlv
a29a9324ea Make it possible to disable API, disable it by default 2013-08-20 16:53:05 +00:00
Michael Foster
e45ffb8592 custom timeouet for curl'ing upload urls 2013-08-19 18:54:10 +10:00
ctrlcctrlv
9773416553 Better setting name 2013-08-19 03:01:30 +10:00
ctrlcctrlv
47dec49465 Optionally access mod cookie in JavaScript 2013-08-19 03:01:15 +10:00
ctrlcctrlv
2eb68ac398 Better setting name 2013-08-18 01:53:39 +00:00
ctrlcctrlv
52fe0c8989 Optionally access mod cookie in JavaScript 2013-08-18 01:44:36 +00:00
ctrlcctrlv
5c2ec21e13 Bundle jscolor 2013-08-17 19:42:00 +00:00
ctrlcctrlv
e3600131fc Configurable canvas size 2013-08-17 18:00:26 +00:00
czaks
146243c473 Merge branch 'master' of https://github.com/savetheinternet/Tinyboard
Conflicts:
	inc/config.php
	inc/display.php
	inc/functions.php
2013-08-16 10:07:24 -04:00
Michael Foster
0ad1c03997 Optional "flag style" and "flag alt" modifiers 2013-08-16 23:12:40 +10:00
Michael Foster
b666886416 A few modifications:
1. Finally, clean up some of the crappy code in inc/display.php; no more extreme clutter. new Thread() and new Post() take an array as the first parameter now.

2. Poster country flags. Currently requires the "geoip" extension.

3. Give post images a classname. This was also long-overdue.
2013-08-16 21:08:01 +10:00
Michael Foster
88dff2a683 Set $config['try_smarter'] to true. If you notice any problems, please report them to us. 2013-08-16 20:16:09 +10:00
czaks
4f855cf3b3 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
0de0bc6ceb Optional: Allow uploading by URL 2013-08-12 22:51:46 +10:00
Michael Foster
a7a93ece3d $config['error']['invalidzip'] isn't used anywhere anymore 2013-08-12 22:14:26 +10:00
Michael Foster
adbb0c1fdf ... 2013-08-12 13:01:34 +10:00
czaks
0f5f44bc95 spoilerimage config variable: this got fixed doubly, once wrong, merge both fixes
Conflicts:
	inc/config.php
2013-08-12 13:01:02 +10:00
Michael Foster
3a5f25f751 what 2013-08-12 13:00:06 +10:00
czaks
96122c3fc2 fix notice for mod spoiler image 2013-08-12 12:59:52 +10:00
ctrlcctrlv
d846fe6370 forgot to rename config option 2013-08-12 12:58:04 +10:00
ctrlcctrlv
2018fd206b Improve spoiler action
Conflicts:
	inc/mod/pages.php
2013-08-12 12:57:54 +10:00
ctrlcctrlv
ed04525994 Spoil files moderator action 2013-08-12 12:55:44 +10:00
czaks
92edc1d0a5 noko50: clarify in config how to disable it 2013-08-11 17:53:42 -04:00
czaks
8534e2cc80 Merge branch 'noko50-new-dev11' of http://github.com/fallenPineapple/Tinyboard
Conflicts:
	inc/functions.php
2013-08-11 17:49:29 -04:00
czaks
500468336e spoilerimage config variable: this got fixed doubly, once wrong, merge both fixes 2013-08-11 17:34:43 -04:00
czaks
6e26c76c56 Merge branch 'master' of http://github.com/ctrlcctrlv/Tinyboard 2013-08-11 17:32:57 -04:00
czaks
c3cb0f171b fix notice for mod spoiler image 2013-08-11 17:22:39 -04:00
ctrlcctrlv
b9ec342750 Merge conflict 2013-08-11 15:36:17 +00:00
ctrlcctrlv
efebd30221 forgot to rename config option 2013-08-11 13:55:15 +00:00
ctrlcctrlv
fd54de7126 Improve spoiler action 2013-08-11 13:54:11 +00:00
czaks
fa9bf536c3 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
4fb941dbfe $config['boardlist_wrap_bracket'] default to true 2013-08-11 21:30:46 +10:00
ctrlcctrlv
39f542704b Option to have a message on the ban page
Conflicts:
	inc/config.php
2013-08-11 21:29:02 +10:00
ctrlcctrlv
acb4c47a9f Allow for HTML in the board subtitle
Conflicts:
	inc/config.php
2013-08-11 21:08:19 +10:00
Michael Foster
4bce3d7584 Clean: Make boardlist bracket wrapping optional 2013-08-11 21:06:13 +10:00
ctrlcctrlv
7d1acd4a05 Make boardlist bracket wrapping optional 2013-08-11 21:04:45 +10:00
fallenPineapple
12ee85beaf Adds "noko50" (View Last 50 Posts) pages. (Broken Reply) 2013-08-10 17:16:30 -04:00
czaks
98fa92f684 Fix boardlist bracketing issue 2013-08-09 17:16:25 -04:00
ctrlcctrlv
ecb15c7dcb Option to have a message on the ban page 2013-08-09 19:52:19 +00:00
ctrlcctrlv
78ea9af97c Oekaki 2013-08-08 22:15:59 +00:00
ctrlcctrlv
d4a1ae3595 Advertisements 2013-08-08 21:57:52 +00:00
ctrlcctrlv
ddbe562f9c Optionally allow the moving of single replies 2013-08-08 21:08:01 +00:00
ctrlcctrlv
a59c2e8369 Spoil files moderator action 2013-08-08 19:41:21 +00:00
ctrlcctrlv
7205801ced Optionally use email selectbox 2013-08-08 19:30:05 +00:00
ctrlcctrlv
b8921508fe Allow for HTML in the board subtitle 2013-08-08 18:58:44 +00:00
ctrlcctrlv
3aa1305dab Make boardlist bracket wrapping optional 2013-08-08 18:43:24 +00:00
czaks
2cc0769f54 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
a84c4510fc Merge branch 'master' of github.com:vichan-devel/Tinyboard
Conflicts:
	js/post-hider.js
2013-08-05 06:03:40 -04:00
czaks
c669b087fa bring back ==tags== by default 2013-08-04 23:06:54 -04:00
czaks
f494b34562 Merge branch 'master' of https://github.com/savetheinternet/Tinyboard
Conflicts:
	inc/image.php
2013-08-04 21:17:38 -04:00
Michael Foster
0c829aa8f6 bugfix 2013-08-04 18:48:32 -04:00
Michael Foster
7a51444110 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
c3da5ab4e1 ?/config: Advanced permissions 2013-08-04 17:53:09 -04:00
Michael Foster
6e0e5b1e8a 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
0890557ebb 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
7ed01737c7 Merge branch 'master' of https://github.com/savetheinternet/Tinyboard 2013-08-04 01:00:23 -04:00
Michael Foster
0387ae1b46 Use exiftool to patch bug for now. 2013-08-04 00:48:28 -04:00
czaks
f128811dd3 Merge branch 'master' of https://github.com/savetheinternet/Tinyboard 2013-08-03 22:18:46 -04:00
Michael Foster
de62cced6f fix last commit 2013-08-03 22:16:17 -04:00
Michael Foster
ac4306555b Fix for instances with old GraphicsMagick or ImageMagick versions (no -auto-orient). 2013-08-03 22:14:25 -04:00
root
1f5ce14f59 Merge branch 'master' of https://github.com/savetheinternet/Tinyboard 2013-08-03 21:49:38 -04:00
Michael Foster
b373b39f44 Bugfix: gm and auto-orient thumbnailing 2013-08-03 21:47:24 -04:00
Michael Foster
8fe33d3b79 Fix some indent-formatting. Tab = 8 chars 2013-08-03 21:04:45 -04:00
czaks
d79da75fa9 Merge branch 'master' of https://github.com/savetheinternet/Tinyboard 2013-08-03 21:01:26 -04:00
Michael Foster
5300ffadf1 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