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

1590 Commits

Author SHA1 Message Date
Michael Foster
9cf6814776 Fix secure tripcode hardening 2013-09-23 12:53:44 +10:00
Michael Foster
699279d84a Hardened secure tripcode? 2013-09-23 12:41:27 +10:00
Michael Foster
d234c014f0 ?/debug/apc with cache prefixes 2013-09-23 10:41:47 +10:00
Michael Foster
fcbc211314 Fixed weird bug with ?/debug/sql trying to allocate a few GB on some instances. Assuming bug with APCu. 2013-09-23 10:21:18 +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
Michael Foster
df143c6b50 fix Twig permissions 2013-09-19 16:09:35 +10:00
Michael Foster
9c48084f3b upgrade twig library 2013-09-19 16:08:25 +10:00
czaks
99a2e1cf3d Merge branch 'master' of https://github.com/savetheinternet/Tinyboard into vichan-devel-4.5
Conflicts:
	js/quick-reply.js
2013-09-18 09:00:22 -04:00
Michael Foster
cff15bd765 bugfix: bans 2013-09-18 14:02:01 +10: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
840e8cd093 use own class's delete function when removing expiring ban 2013-09-18 08:59:36 +10:00
Michael Foster
57e4292e9d Improvements to showing post in ban 2013-09-18 08:56:04 +10: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
803f0c8ce1 Fix search for new bans table 2013-09-17 09:35:13 +10:00
Michael Foster
b5ebd265f2 Forgot to include this file 2013-09-17 09:28:06 +10:00
Michael Foster
f53348d7c8 Add this library I found 2013-09-17 09:18:59 +10: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
dd1bec687b bugfix: disable javascript on mod pages 2013-09-16 06:37:14 +10:00
Michael Foster
00833eeafd js/ajax.js: post with ajax 2013-09-15 14:03:27 +10:00
Michael Foster
4cd2389655 lol 2013-09-15 05:48:37 +10:00
Michael Foster
32c999346f Remove $config['url_regex']; 2013-09-15 05:46:08 +10:00
Michael Foster
b038e0b244 fix last commit 2013-09-15 04:23:47 +10:00
Michael Foster
2230f0a051 disable $config['try_smarter'] on ?/rebuild 2013-09-15 04:22:27 +10:00
Michael Foster
9d770f456f show-thread event 2013-09-15 03:54:09 +10:00
Michael Foster
c4a6116722 Optionally show page navigation bar at the top too. 2013-09-15 00:42:20 +10:00
Michael Foster
104e2bce6d Combine ban checking into single SQL query. Messy/inefficient query, but good enough. 2013-09-10 16:20:54 +10:00
Michael Foster
99fa2f7cda Bugfix: SQL error, issue #141 2013-09-10 03:54:23 +10:00
Michael Foster
5da8f28726 Improvements to ?/debug/antispam and ?/debug/recentc 2013-09-09 20:16:13 +10:00
Michael Foster
4ec50aad80 case-insensitive, debug bugfix 2013-09-09 19:53:27 +10:00
Michael Foster
6f62499160 Bugfix: Undefined $cached (when caching is disabled) 2013-09-09 19:19:11 +10:00
Michael Foster
cc37d79c0d Fix last commit. 2013-09-09 01:38:32 +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
d80af7d077 Bugfix: Sometimes caching here fucks up. Not really sure why yet. 2013-09-08 13:35:02 +10:00
Michael Foster
0e23a6a2b4 "flood filter" becomes "filter" 2013-09-07 13:14:55 +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
55dc5cedc3 Steal make_comment_hex() from plainib 2013-09-07 12:50:32 +10:00
Michael Foster
e9ccc5d72d Optionally EXPLAIN all SQL queries when in debug mode 2013-09-07 12:40:35 +10:00
Michael Foster
9ccf62bb61 yeah 2013-09-07 03:09:52 +10:00
Michael Foster
7b1a08d85c purge flood cache table after filter stuff, not before 2013-09-07 02:57:42 +10:00
Michael Foster
ecda7abe92 bugfix lol 2013-09-07 00:04:22 +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
Michael Foster
14ff0fbeb3 inc/mod.php has been irrelevant for a while. Time to remove it. 2013-09-06 20:12:34 +10:00
Michael Foster
7f0de93608 Cleaner check to make sure inc/ files aren't accessed directly. 2013-09-06 20:12:04 +10:00
czaks
8a244ab61e Fixed working on some broken shared hostings. Thanks for Belarussian anon for reporting. 2013-09-02 13:41:28 +10:00
czaks
069f1def9b Merge branch 'master' of https://github.com/savetheinternet/Tinyboard
Conflicts:
	install.php
2013-09-01 11:25:19 -04:00
czaks
c240056865 Fixed working on some broken shared hostings. Thanks for Belarussian anon for reporting. 2013-09-01 11:20:57 -04:00
Michael Foster
b51fc38783 Some SQL and indexes improvements 2013-09-01 02:04:42 +10:00
Michael Foster
8d14ef6bf7 lol 2013-08-31 13:33:26 +10:00
Michael Foster
94ac200d57 fix pm_snippet bug 2013-08-31 13:26:53 +10:00
Michael Foster
d166fc70bd Fix \t in posts (editing posts, and HTML Tidy) 2013-08-31 13:23:29 +10:00
Michael Foster
f1b1d41230 Update comments for persistent database connections and increase timeout 2013-08-30 15:05:13 +10:00
Michael Foster
46d41cd2a7 More track_cites work 2013-08-30 15:00:33 +10:00
Michael Foster
2d3846384a Rendering $debug: Copy to $_debug so that $debug doesn't become broken if we want to generate more than one file in a request 2013-08-30 09:00:47 +10:00
Michael Foster
343803afb9 More $config['debug'] improvements to time-related stuff 2013-08-30 08:39:11 +10:00
Michael Foster
8921eb9c1a Bugfix: pm_unreadcount cache not working correctly 2013-08-30 08:38:14 +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
czaks
b61772361c Merge https://github.com/ctrlcctrlv/Tinyboard 2013-08-29 07:32:06 -04:00
Michael Foster
738179c766 HTML Tidy bug fix: broken attributes, and preserve whitespace properly 2013-08-29 21:24:38 +10:00
Michael Foster
471525a58b HTML Tidy fixes: UTF-8, preserving whitespace, keep attributes literal, don't wrap text 2013-08-29 21:05:03 +10:00
Michael Foster
8144e517e9 Don't set arbitrary cache timeouts for DNS stuff 2013-08-29 20:40:39 +10: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
a8e3754375 Minor $config['try_smarter'] work 2013-08-29 18:55:25 +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
3b63cad71f $config['always_regenerate_markup'] 2013-08-29 15:29:04 +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
ctrlcctrlv
5f977ee593 Moving threads wasn't working with the catalog theme enabled
Conflicts:
	inc/mod/pages.php
2013-08-29 15:18:45 +10:00
Michael Foster
334e69b69f Remove old code 2013-08-29 13:32:55 +10:00
Michael Foster
3545e2406e Perforamnce: Much more efficient >>X and >>>/board/X 2013-08-29 13:31:02 +10:00
Michael Foster
577a8b991d Performance: Use only one query for validating >>X links in posts 2013-08-29 12:52:31 +10:00
ctrlcctrlv
b829d19ec7 Moving threads wasn't working with the catalog theme enabled 2013-08-29 00:38:39 +00:00
czaks
b95840adcb Merge branch 'master' of https://github.com/savetheinternet/Tinyboard
Conflicts:
	inc/functions.php
2013-08-28 20:34:06 -04:00
Michael Foster
90eb8f1f37 redundant ORDER BY 2013-08-29 08:41:36 +10:00
Michael Foster
8257773807 $config['debug']: Show time initializing Tinyboard (before $debug was created) 2013-08-29 08:30:21 +10:00
Michael Foster
3fbd051737 Record time started (in milliseconds) at the very beginning of inc/functions.php, even when $config['debug'] is disabled (because we can't tell, yet). Gets a more accurate time for page generation. 2013-08-29 08:25:15 +10:00
Michael Foster
aa27a22f7c wtf? duplicate code 2013-08-29 08:17:32 +10:00
Michael Foster
09027cd8ae Better cache debugging: Show hit/miss, etc. 2013-08-29 08:07:27 +10:00
ctrlcctrlv
3b5561d1a4 Bugfix: Circlepuller is a dumbass and broke many mod actions, don't merge his commits without testing them 2013-08-29 07:32:29 +10:00
ctrlcctrlv
e34c0f4b65 Bugfix: Circlepuller is a dumbass and broke many mod actions, don't merge his commits without testing them 2013-08-28 21:31:10 +00: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
7a4e481333 Huge bugfix: Old tracked cites where not being purged correctly. Recommend query: "TRUNCATE TABLE cites;" to start over 2013-08-28 22:30:56 +10:00
Michael Foster
c31e374a71 Allow Unix sockets for database connection 2013-08-28 20:09:30 +10:00
Michael Foster
fcb88b16cd Bugfix: Corrupt images were not getting removed from /tmp (convert, gm, and gifsicle) 2013-08-28 17:20:29 +10:00
Michael Foster
dc8b1948dd Performance: Only purge old antispam hashes once per request (at most) 2013-08-28 17:08:56 +10:00
Michael Foster
a7ac3339de DNS(): Cache NXDOMAIN 2013-08-28 17:00:41 +10:00
ctrlcctrlv
753b67aa71 Hopefully fix spam filter problems caused by noko 50 (thanks to savetheinternet) 2013-08-27 23:44:59 +00:00
Michael Foster
6ce78cb1a4 Bugfix: post editing: should be $board here, not $board['uri'] 2013-08-27 17:27:17 +10:00
Dan Saunders
00a1841cbc Regenerate themes after editing a post 2013-08-27 06:56:53 +10:00
Dan Saunders
08bb2894bc Rebuild themes when a post or file is deleted...
Rebuild themes when a post or file is deleted in the moderation panel.
2013-08-27 06:56:46 +10:00
ctrlcctrlv
97a56a7ec1 Fix try_smarter with deletePost 2013-08-22 17:08:26 +00:00
ctrlcctrlv
c7a1ee3121 Bug: deleting posts doesn't rebuld index 2013-08-22 16:51:28 +00:00
Michael Foster
5cc7bd860f Add cache and gm to pre-installation test. Don't die when we can't write to templates/cache. 2013-08-22 03:35:57 +10:00
Michael Foster
d92b138762 Accidentally merged noko50 stuff 2013-08-21 22:53:48 +10:00
Michael Foster
11fa73e4d1 automatically initialize $config['api'] 2013-08-21 22:44:23 +10:00
Michael Foster
a83715dcb0 single quotation marks please 2013-08-21 22:43:35 +10:00
Michael Foster
b01a402d23 4chan-compatible api: better config.php comments 2013-08-21 22:41:42 +10:00
Michael Foster
cbfafeea36 merge fail 2013-08-21 22:36:48 +10:00
ctrlcctrlv
9d77a4cc4c Only add country to JSON if flag fits country code regex 2013-08-21 22:35:24 +10:00
ctrlcctrlv
ed142a5e5d ;_; 2013-08-21 22:35:19 +10:00
ctrlcctrlv
ddd34347f8 Make file/thumb dimensons actually work (thanks sti) 2013-08-21 22:35:11 +10:00
ctrlcctrlv
618d979ec4 Country flags in API if they are enabled 2013-08-21 22:35:07 +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
K
0cb54b15dc Add support for 4chan-compatible json API.
Conflicts:
	inc/functions.php
2013-08-21 22:32:44 +10:00
Michael Foster
54a8c72121 Huge bug with deleting boards: $tmp_board unused; sometimes it would delete the wrong board's directory 2013-08-21 21:34:18 +10:00
Michael Foster
72beacc1da allow moving threads with non-image uploads 2013-08-21 20:54:46 +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
07bf8914e6 Only add country to JSON if flag fits country code regex 2013-08-20 22:11:32 +00:00
ctrlcctrlv
c617603179 ;_; 2013-08-20 21:35:16 +00:00
ctrlcctrlv
31aad827ad Make file/thumb dimensons actually work (thanks sti) 2013-08-20 21:31:46 +00:00
ctrlcctrlv
8794fe0149 Delete JSON when thread deleted 2013-08-20 19:53:11 +00:00
ctrlcctrlv
8c081a4ab5 Oops, forgot to check if enabled at one point 2013-08-20 18:59:20 +00:00
ctrlcctrlv
cc5173f430 Country flags in API if they are enabled 2013-08-20 18:52:12 +00: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
abfdd38e59 Unicode bi-directional text: Finally a working fix 2013-08-19 23:47:56 +10:00
ctrlcctrlv
db5ce2cb8f Merge remote-tracking branch 'upstream/master' 2013-08-19 13:21:25 +00:00
ctrlcctrlv
fd398f82ed Fix reply moving 2013-08-19 13:20:10 +00:00
Michael Foster
69741e6c08 deleting boards: cache purging, delete directory after sql queries (in case we have permission errors, etc.) 2013-08-19 20:00:16 +10:00
Michael Foster
e45ffb8592 custom timeouet for curl'ing upload urls 2013-08-19 18:54:10 +10:00
czaks
6634b43572 Merge branch 'master' of https://github.com/ctrlcctrlv/Tinyboard 2013-08-18 19:26:51 -04:00
czaks
5389b0f358 Merge branch 'master' of https://github.com/savetheinternet/Tinyboard 2013-08-18 19:26:31 -04:00
ctrlcctrlv
affad5594e Fix compatibility with php<5.4, sorry anachronos ;_; 2013-08-18 22:51:09 +00:00
Michael Foster
c8fcba9439 disregard 2013-08-19 05:22:08 +10:00
Michael Foster
d2fdeead64 bidi_cleanup: Just replace with HTML5's <bdi> (for now, at least). The old code was hardly working, and had issued with older PHP versions. 2013-08-19 05:19:54 +10:00
czaks
da1b7d087e Merge branch 'master' of https://github.com/savetheinternet/Tinyboard
Conflicts:
	install.php
2013-08-18 13:16:31 -04: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
czaks
45bfd2a095 fix Polish translation 2013-08-19 03:00:44 +10:00
czaks
a297ce4af5 Update Polish translation 2013-08-19 03:00:38 +10:00
Michael Foster
5051e0572a Missing theme conf type "checkbox" 2013-08-19 02:03:54 +10:00
Michael Foster
154fbf5070 Huge bug: undoImage() was not working at all. This means lots of Tinyboard users probably have lone/permanent images. Working on Tinyboard-Tools script to remove all images/thumbs that don't belong. 2013-08-19 01:07:04 +10:00
czaks
f6c25382b9 Merge branch 'master' of https://github.com/ctrlcctrlv/Tinyboard 2013-08-17 22:42:28 -04:00
czaks
946c49ac5a boardlist work part 1: boardname in subtitle; work to make js restyling feasible 2013-08-17 22:41:40 -04: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
czaks
7aaeb1fdf3 fix Polish translation 2013-08-17 19:00:00 -04:00
czaks
8f34bb875f Update Polish translation 2013-08-17 18:44:37 -04:00
czaks
ff479e8bcb Merge branch 'master' of https://github.com/ctrlcctrlv/Tinyboard 2013-08-17 16:22:04 -04:00
czaks
bf119b7abd Merge branch 'master' of https://github.com/savetheinternet/Tinyboard
Conflicts:
	js/post-hover.js
2013-08-17 16:21:40 -04:00
ctrlcctrlv
5c2ec21e13 Bundle jscolor 2013-08-17 19:42:00 +00:00
ctrlcctrlv
979e5754a5 Better error handling 2013-08-17 19:08:54 +00:00
Michael Foster
cff62b250c Bugfix: raw html posting 2013-08-18 04:49:56 +10:00
ctrlcctrlv
e3600131fc Configurable canvas size 2013-08-17 18:00:26 +00:00
Michael Foster
28f366b686 keep casing of escape modifiers 2013-08-17 17:56:38 +10:00
Michael Foster
998002fd34 better modifier escaping again 2013-08-17 17:53:39 +10:00
Michael Foster
b2d5ec253b escape_markup_modifiers: make it case insensitive 2013-08-17 17:41:22 +10:00
Michael Foster
e7f25aa480 add delete event 2013-08-17 16:06:45 +10:00
czaks
ca565d07c2 Merge branch 'master' of https://github.com/savetheinternet/Tinyboard
Conflicts:
	inc/display.php
2013-08-16 16:06:54 -04:00
Michael Foster
e5103b543a fix aspect ratio displaying 2013-08-17 04:11:24 +10:00
Michael Foster
0d45fbc799 Add \n before post modifiers. Add flag alt for country flags. 2013-08-17 03:39:58 +10:00
czaks
3696ffd035 noko50 fix previous commit 2013-08-16 10:10:18 -04:00
czaks
8a4b7c3349 fix noko50 for new new Post and new Thread syntax 2013-08-16 10:09:37 -04: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
47ddd2f8b2 Fix editing raw HTML posts 2013-08-16 22:18:57 +10:00
Michael Foster
aaeac9de3c forgot this here 2013-08-16 21:51:10 +10:00
Michael Foster
57e69268ef This wasn't usd anywhere. 2013-08-16 21:46:51 +10:00
Michael Foster
4876a27232 Much better post modifiers: raw HTML, ban messages, etc. 2013-08-16 21:25:56 +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
07b825c6d2 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
c6e629bf89 allow wordfilters to be callbacks 2013-08-13 01:53:23 +10: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
e0a8ffcfb9 ?/config: Link URLs in comments 2013-08-12 21:14:32 +10:00
Michael Foster
169c68e862 use single quotes 2013-08-12 21:08:40 +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
Vasiliy Shikhachevskiy
8c3ae439c9 Added Czech translation 2013-08-12 12:58:29 +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
6e74f2a1a6 accidentally spaces 2013-08-12 12:55:52 +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
Vasiliy Shikhachevskiy
25b6dfd06a Added Czech translation 2013-08-11 13:59:07 -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
38c9ac65d8 Critical bug: could not move threads/posts with spoiler images, resulted in I/O error
Conflicts:
	inc/mod/pages.php
2013-08-11 21:26: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
czaks
c672b700b0 gifsicle: temporary fix; STI: gifsicle REALLY sends that to stderr for every gif shorter than 50 frames 2013-08-11 21:04:20 +10:00
czaks
8b26201a05 Update Polish translation 2013-08-11 21:02:50 +10:00
fallenPineapple
12ee85beaf Adds "noko50" (View Last 50 Posts) pages. (Broken Reply) 2013-08-10 17:16:30 -04:00
czaks
ebac98e207 critical fix for merge 4chanapi+try_smarter: make even pages work 2013-08-09 19:46:28 -04:00
czaks
6fb2ea3b31 fix support for board prefixes after merge 2013-08-09 17:42:19 -04:00
czaks
890718f89f i18n work on ctrlcctrlv's additions 2013-08-09 17:21:40 -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
379eb7d553 Critical bug: could not move threads/posts with spoiler images, resulted in I/O error 2013-08-09 19:40:49 +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
1b10821603 mistake in last commit 2013-08-08 21:09:38 +00:00
ctrlcctrlv
ddbe562f9c Optionally allow the moving of single replies 2013-08-08 21:08:01 +00:00
ctrlcctrlv
2b6fa9342b accidentally spaces 2013-08-08 19:43:40 +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
73f53d3529 gifsicle: temporary fix; STI: gifsicle REALLY sends that to stderr for every gif shorter than 50 frames 2013-08-06 19:40:17 -04: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
0d8e2a65ab fix api issue 2013-08-05 06:09:15 -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
926fedd576 Update Polish translation 2013-08-05 05:32:18 -04:00
czaks
ea97efc8f3 that wasn't meant to be committed 2013-08-05 05:03:46 -04:00
czaks
6267876758 tinyboard special markup: allow content to span multiple lines 2013-08-05 05:02:37 -04:00
czaks
67daf109f2 fix Varnish compatibility when characters such as * are in use for a boardname 2013-08-05 04:51:48 -04:00
czaks
06d2dafa2a Merge branch 'master' of https://github.com/savetheinternet/Tinyboard 2013-08-04 23:31:53 -04:00
czaks
c669b087fa bring back ==tags== by default 2013-08-04 23:06:54 -04:00
Michael Foster
373fb99a7f Bugfix: exif_read_data() Incorrect APP1 Exif Identifier Code 2013-08-04 23:02:15 -04:00
czaks
8ad36a851c fix Varnish compatibility when characters such as * are in use for a boardname 2013-08-04 22:12:21 -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
acfda35648 gifsicle: redirect stdout to /dev/null but keep stderr going to stdout 2013-08-04 16:32:36 -04:00
czaks
a3cf56a768 gifsicle: make it finally work 2013-08-04 16:27:58 -04:00
czaks
7407593ec5 gifsicle: make it finally work 2013-08-04 15:29:18 -04:00
Michael Foster
b7070aeac6 Fix issue with installing and creating boards with MySQL < 5.5.3. Issue #129 2013-08-04 15:23:26 -04:00
Michael Foster
33a07e9ee0 bug fix, wrong index 2013-08-04 05:11:46 -04:00
Michael Foster
0f00f800b9 Use new shell_exec function for $config['dns_system'] host queries too 2013-08-04 05:03:21 -04:00
czaks
76101cad51 fix gifsicle issue connected with frame limit 2013-08-04 04:49:47 -04:00
Michael Foster
6409ac6163 fix last commit 2013-08-04 04:49:21 -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
3e4545d1b8 fix gifsicle issue connected with frame limit 2013-08-04 04:46:30 -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
1e6b4cbd4a Merge branch 'master' of https://github.com/savetheinternet/Tinyboard 2013-08-03 22:21:02 -04:00
Michael Foster
3d2de07a1f Can't auto-orient a non-JPEG 2013-08-03 22:20:39 -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
Michael Foster
486eccba2e shell_exec_error() fix 2013-08-03 21:53:09 -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
b67fc7d54e Only use identify if we have to 2013-08-03 20:50:37 -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
czaks
a0855cdcf5 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
a3fbff2259 Update $config['try_smarter']. Should be working now. 2013-08-03 17:42:34 -04:00
Michael Foster
f7d068536a EXPERIMENTAL: Try not to build pages when we shouldn't have to. 2013-08-03 07:50:25 -04:00
Michael Foster
2f4e2daa61 Fix redirect with board config editor (raw php) 2013-08-03 06:27:13 -04:00
Michael Foster
424de7561d Web config editor: board configs 2013-08-03 06:26:17 -04:00
Michael Foster
0d1bfa47f1 Web config editor: Write "MOD", "JANITOR", etc. to instance-config instead of just int representations 2013-08-03 05:41:01 -04:00
Michael Foster
d4ad874e09 no 2013-08-03 05:25:41 -04:00
Michael Foster
c9684fc000 Better/working web config editor 2013-08-03 05:21:02 -04:00
Michael Foster
3ed15565b0 Why is this escaped? 2013-08-03 03:36:20 -04:00
Michael Foster
ea1fe528a4 Fix ordering of notes and bans 2013-08-03 02:06:58 -04:00
Michael Foster
056a6001ac Erorr handling update 2013-08-03 02:01:52 -04:00
Michael Foster
784c3ffadb Accidentally commit'd debug stuff/errors 2013-08-03 00:28:54 -04:00
Michael Foster
1d37e81ade Better error handling/displaying with $config['debug'] and $config['verbose_errors'] 2013-08-03 00:22:28 -04:00
Michael Foster
62f8ea4813 Better command-line ImageMagick image processing 2013-08-02 23:18:25 -04:00
Michael Foster
d99eba2c18 syntax error in last commit 2013-08-02 21:37:44 -04:00
Michael Foster
1d7de12281 Fix bug 2013-08-02 21:23:18 -04:00
Michael Foster
934c00f488 $config['dir']['static'] doesn't exist. 2013-08-02 21:01:04 -04:00
Michael Foster
169dc74938 Fix last commit 2013-08-02 20:56:30 -04:00
Michael Foster
4fce9b63ae Major config.php cleanup and a few minor misc fixes. 2013-08-02 20:52:58 -04:00
czaks
a15e0ffa98 Merge branch 'master' of https://github.com/savetheinternet/Tinyboard 2013-08-02 00:09:07 -04:00
Michael Foster
f06978659b Installer: Nicer pre-installation test 2013-08-02 00:08:37 -04:00
czaks
1ed45ebe9e 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
40ab2e0c17 Don't redraw image again after correcting image orientation; Correct image orientation with convert+gifsicle too 2013-08-01 21:28:16 -04:00
Michael Foster
5a44c50811 Simple file editor replacement for ?/config (optional). Issue #127 2013-08-01 17:18:10 -04:00
Michael Foster
157dcf9fb1 Continue upgrading Twig 2013-08-01 15:55:28 -04:00
Michael Foster
6b6f32949d Web config editor: Use a <select> for JANITOR/MOD/ADMIN permissions 2013-08-01 15:20:25 -04:00
Michael Foster
0fe5528574 Upgrade Twig library 2013-08-01 15:20:12 -04:00
Michael Foster
22f3a95e0e convert+gifscale didn't respect $config['thumb_keep_animation_frames'] 2013-08-01 04:24:34 -04:00
Michael Foster
4851d4cabe Forgot "global $config" here 2013-08-01 03:51:50 -04:00
czaks
9487eb4ac7 Compile Polish locale 2013-08-01 03:22:58 -04:00
Jakub Skrzypnik
00600f241f Correcting polish locale a bit 2013-08-01 03:22:48 -04:00
Jakub Skrzypnik
0a026c8f3f Correcting polish locale a bit 2013-08-01 03:22:39 -04:00
czaks
7dd57432a2 Compile Polish locale 2013-08-01 02:52:35 -04:00
Jakub Skrzypnik
731905ed05 Correcting polish locale a bit 2013-08-01 08:49:14 +02:00
Jakub Skrzypnik
0aac198c42 Correcting polish locale a bit 2013-08-01 08:46:24 +02:00
czaks
6c2887ba9f Update Polish locale 2013-08-01 02:39:54 -04:00
czaks
9769e1f964 i18n even more strings in inc/display.php 2013-08-01 02:39:41 -04:00
czaks
bea5509d63 Update Polish locale 2013-08-01 02:06:34 -04:00
czaks
3b03e18d68 i18n even more strings in inc/display.php 2013-08-01 01:56:04 -04:00
czaks
b9769d0cea i18n strings in inc/display.php 2013-08-01 01:53:13 -04:00
czaks
e109d8179f the prefix work: fix it to be dependent on a board_regex config value 2013-08-01 01:53:07 -04:00
czaks
a1e105a470 i18n strings in inc/display.php 2013-08-01 01:47:15 -04:00
czaks
4764764885 the prefix work: fix it to be dependent on a board_regex config value 2013-08-01 01:43:33 -04:00
czaks
bc76d934fe fix previous commit; markup is called via reference 2013-08-01 01:09:54 -04:00
czaks
05fb4cbca4 markup modifiers: there was a plan for adding markup to ban reasons, but assignment was missing; escape markup there too 2013-08-01 01:09:21 -04:00
czaks
235ee484fd removed a relict from older post hider 2013-08-01 01:04:19 -04:00
czaks
168a4d73cc Merge branch 'master' of https://github.com/savetheinternet/Tinyboard 2013-08-01 00:47:33 -04:00
Michael Foster
a052a791b5 Add optional database table prefix (issue #118; see issue comments for details) 2013-07-31 22:14:26 -04:00
czaks
cefd5517ac Merge branch 'master' of https://github.com/savetheinternet/Tinyboard 2013-07-31 21:36:54 -04:00
czaks
232f4ff868 markup modifiers: make it even harder to escape 2013-07-31 21:27:50 -04:00
czaks
ab36452543 fix post editing for tinyboard markup 2013-07-31 21:26:55 -04:00
Michael Foster
ea2b8cce07 Bugfix: HTML injection in post editing (introduces and fixes yet another bug) 2013-07-31 21:24:17 -04:00
czaks
e93d5b2f8e Revert "markup modifiers: make it even harder to escape"
This reverts commit d7ea47a91f.
2013-07-31 21:22:57 -04:00
czaks
055c3a7382 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
83844b5e3e Merge branch 'master' of https://github.com/savetheinternet/Tinyboard
Conflicts:
	inc/functions.php
2013-07-31 21:03:13 -04:00
Michael Foster
a5312ebe89 Allow public ban messages on raw HTML posts 2013-07-31 21:02:26 -04:00
Michael Foster
0f9df0ac66 Newline before <tinyboard ban message> 2013-07-31 20:54:20 -04:00
Michael Foster
328484bee7 SQL cleanup 2013-07-31 20:51:43 -04:00
czaks
03d91df1d8 fix previous commit; markup is called via reference 2013-07-31 20:41:56 -04:00
czaks
ce2af291b0 markup modifiers: there was a plan for adding markup to ban reasons, but assignment was missing; escape markup there too 2013-07-31 20:33:27 -04:00
czaks
d7ea47a91f markup modifiers: make it even harder to escape 2013-07-31 20:13:19 -04:00
czaks
e7dd0bbc4a facilitate using markup modifiers multiple times; make raw html not consume the whole post 2013-07-31 20:11:11 -04:00
czaks
fa5922b45e fix post editing for tinyboard markup 2013-07-31 19:50:25 -04:00
czaks
b35ea55763 Merge branch 'master' of https://github.com/savetheinternet/Tinyboard
Conflicts:
	templates/thread.html
2013-07-31 19:25:04 -04:00
Michael Foster
6bbe407e18 Markup modifiers: raw HTML 2013-07-31 19:18:55 -04:00
Michael Foster
6d52c8b428 Markup modifiers. Fix issue #66 (public ban message lost when rebuilding post body) 2013-07-31 18:59:54 -04:00
Michael Foster
4891735c49 Fix issue #72 2013-07-31 18:29:09 -04:00
czaks
dc9df2b9b3 Merge branch 'master' of https://github.com/savetheinternet/Tinyboard 2013-07-31 17:05:53 -04:00
Michael Foster
3a8736cdc0 Fix last commit 2013-07-31 17:04:36 -04:00
Michael Foster
c2a287cd14 Only run SQL query to count threads if we really need to 2013-07-31 17:02:42 -04:00
czaks
c0abd1d851 Merge branch 'master' of https://github.com/savetheinternet/Tinyboard 2013-07-31 17:02:30 -04:00
Michael Foster
6cdf603875 Fix last commit; Make Tinyboard Twig extension more mb-safe 2013-07-31 16:38:09 -04:00
Michael Foster
dc1d1a3fcd Issue #125 2013-07-31 16:22:27 -04:00
czaks
3d979750b1 fix merge 2013-07-31 15:01:44 -04:00
czaks
55c7146d88 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
659310663e i18n some more strings in inc/config.php 2013-07-31 06:56:57 -04:00
Michael Foster
42e16e233a Javascript l10n: Work without $config['additional_javascript_compile'] 2013-07-31 06:54:53 -04:00
Michael Foster
439795e63b Disallow board names which are too large for the filesytem to handle 2013-07-31 06:40:57 -04:00
Michael Foster
81da2fea04 Undo 7e0cec for now. Will restore later once I resolve issues 2013-07-31 05:03:50 -04:00
czaks
67db0a878a js i18n: finish implementation with addition of the compiled locale strings file to additional javascripts 2013-07-31 04:57:50 -04:00
czaks
3f98522ff2 i18n one more string in inc/functions.php 2013-07-31 04:56:42 -04:00
czaks
babeec8bb9 localise time values 2013-07-31 04:55:34 -04:00
czaks
be2e7d9782 i18n some strings in inc/config.php 2013-07-31 04:54:08 -04:00
Michael Foster
123a72d7de Convert to UNIX line endings 2013-07-31 04:28:26 -04:00
Marcin Łabanowski
7e0cec3d9d Facilitate styling of subboard listings 2013-07-31 04:09:35 -04:00
czaks
22556f43f5 Update Polish locale 2013-07-31 04:07:15 -04:00
czaks
b772be7c5b Update Polish translation 2013-07-31 04:07:03 -04:00
czaks
ba27016813 locale: update polish translation 2013-07-31 04:06:57 -04:00
czaks
0ffa0b3adf Update Polish translation; javascript l10n 2013-07-31 04:06:52 -04:00
55ch
dd01c8308d Brazilian Portuguese translation for Tinyboard 2013-07-31 04:05:55 -04:00
Marcin Łabanowski
5ea2f02e7d Fixed typo in Polish translation 2013-07-31 04:05:49 -04:00