1
0
mirror of https://github.com/vichan-devel/vichan.git synced 2024-12-25 13:54:51 +01:00
Commit Graph

315 Commits

Author SHA1 Message Date
czaks
427a9938a7 Merge 4.5 2014-06-12 03:12:56 +02:00
Chen-Pang He
7933abd271 Fix vichan #65
Conflicts:
	inc/mod/auth.php
	inc/mod/pages.php
2014-06-12 03:12:27 +02:00
czaks
503903ac0f Merge 4.5 2014-06-11 02:05:14 +02:00
czaks
23d6e82038 $_SERVER[HTTPS] isn`t being always set; fixes #65 2014-06-11 02:04:59 +02:00
czaks
c2cbbe7e22 Merge 4.5
Conflicts:
	js/expand-too-long.js
2014-06-10 17:51:03 +02:00
Chen-Pang He
6716a24b68 Send cookie only via HTTPS if a mod logs in via HTTPS, which is the case on this site 2014-06-10 17:42:18 +02:00
Fredrick Brennan
65a14a0d39 Fix moving of deleted files 2014-05-19 14:00:16 -04:00
Fredrick Brennan
5039584a5e Fix ?/recent str_replace issue 2014-05-04 19:24:34 -04:00
Fredrick Brennan
042e7b9c59 Deprecate postControls(), per-file deletion and spoilering 2014-04-30 17:18:35 -04:00
Fredrick Brennan
24753907eb remove var_dump 2014-04-29 20:18:30 -04:00
Fredrick Brennan
53e33d414f Fix mod_move for multi image 2014-04-29 19:14:10 -04:00
Fredrick Brennan
2b3942d19d Fix mod_move for multi image 2014-04-29 19:07:13 -04:00
czaks
bb5446a93d Merge remote-tracking branch 'origin/br-integration' into staging 2014-04-29 21:35:50 +02:00
copypaste
c483e1258c multiimage posting 2014-04-27 15:48:47 +02:00
czaks
9d9d514919 we no have any modpages.html 2014-03-25 11:57:36 +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
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
f5422cad65 Um. I accidentally deleted this code for some reason. 2013-09-30 12:18:56 +10:00
Michael Foster
c8062fbf76 CSRF more mod pages 2013-09-23 16:48:56 +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
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
803f0c8ce1 Fix search for new bans table 2013-09-17 09:35:13 +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
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
5da8f28726 Improvements to ?/debug/antispam and ?/debug/recentc 2013-09-09 20:16:13 +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
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
8d14ef6bf7 lol 2013-08-31 13:33:26 +10:00
Michael Foster
d166fc70bd Fix \t in posts (editing posts, and HTML Tidy) 2013-08-31 13:23:29 +10:00
Michael Foster
46d41cd2a7 More track_cites work 2013-08-30 15:00:33 +10:00
Michael Foster
8921eb9c1a Bugfix: pm_unreadcount cache not working correctly 2013-08-30 08:38:14 +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
ctrlcctrlv
b829d19ec7 Moving threads wasn't working with the catalog theme enabled 2013-08-29 00:38:39 +00: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
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
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
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
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
Michael Foster
5051e0572a Missing theme conf type "checkbox" 2013-08-19 02:03:54 +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
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
0d45fbc799 Add \n before post modifiers. Add flag alt for country flags. 2013-08-17 03:39:58 +10: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
47ddd2f8b2 Fix editing raw HTML posts 2013-08-16 22:18:57 +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
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
e0a8ffcfb9 ?/config: Link URLs in comments 2013-08-12 21:14:32 +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
8534e2cc80 Merge branch 'noko50-new-dev11' of http://github.com/fallenPineapple/Tinyboard
Conflicts:
	inc/functions.php
2013-08-11 17:49:29 -04:00
ctrlcctrlv
b9ec342750 Merge conflict 2013-08-11 15:36:17 +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
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
fallenPineapple
12ee85beaf Adds "noko50" (View Last 50 Posts) pages. (Broken Reply) 2013-08-10 17:16:30 -04:00
czaks
6fb2ea3b31 fix support for board prefixes after merge 2013-08-09 17:42:19 -04: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
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
a59c2e8369 Spoil files moderator action 2013-08-08 19:41:21 +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
Michael Foster
c3da5ab4e1 ?/config: Advanced permissions 2013-08-04 17:53:09 -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
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
c9684fc000 Better/working web config editor 2013-08-03 05:21:02 -04:00
Michael Foster
ea1fe528a4 Fix ordering of notes and bans 2013-08-03 02:06:58 -04:00
Michael Foster
5a44c50811 Simple file editor replacement for ?/config (optional). Issue #127 2013-08-01 17:18:10 -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
Michael Foster
a052a791b5 Add optional database table prefix (issue #118; see issue comments for details) 2013-07-31 22:14:26 -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
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
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
439795e63b Disallow board names which are too large for the filesytem to handle 2013-07-31 06:40:57 -04:00
Michael Foster
42cba53887 Allow Unicode in board URIs. 2013-07-31 02:08:55 -04:00
Michael Foster
343397d561 ?/IP/: Don't show posts for board user doesn't have access to 2013-07-30 23:30:49 -04:00
Michael Foster
1759ac2ea3 Post search: Search other fields too 2013-07-29 20:20:07 -04:00
Michael Foster
58306bdc63 Search posts 2013-07-29 16:18:06 -04:00
Michael Foster
33a1c00bd5 %length% in public ban messages 2013-07-24 11:30:01 -04:00
Michael Foster
31f657e550 Long overdue: Salted password hashes 2013-07-24 11:15:55 -04:00
Czterooki
bc1bc9f6ef Merge branch 'master' of github.com:vichan-devel/Tinyboard 2013-07-20 18:28:57 -04:00
czaks
9f323ae65f 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
67cbc2b1aa Fix permissions with search 2013-07-20 13:15:44 -04:00
Michael Foster
b776e0a7f0 Search update 2013-07-20 12:05:42 -04:00
Michael Foster
e62b83e79c Bring back search (searching posts not implemented yet) 2013-07-20 07:50:33 -04:00
Czterooki
aef4425592 merge with vichan-gold 2013-07-20 00:19:08 -04:00
Czterooki
01d9ad9d43 inc/mod/pages.php 2013-07-20 00:05:08 -04:00
czaks
7bdb96a16b 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
c8f30550af $config['require_ban_view']: Force users to view the "You are banned" page at least once before letting a ban disappear naturally. 2013-07-16 06:33:37 -04:00
Michael Foster
7302fc57a8 Automatically dismiss all reports regarding a thread after it is locked. 2013-07-16 02:32:44 -04:00
Michael Foster
2144d43f2b Fix issue #24 2013-07-16 02:27:20 -04:00
Michael Foster
23b27d8057 Add clean() to mod_move function 2013-07-16 01:38:24 -04:00
czaks
24a520485d Merge branch 'master' of https://github.com/savetheinternet/Tinyboard
Conflicts:
	templates/page.html
2013-06-21 16:41:39 -04:00
Michael
0ac9dd5f25 Merge pull request #115 from Macil/miscfixes
Miscellaneous fixes
2013-06-18 10:45:13 -07:00
Macil Tech
be1e55b9d6 Fix result page after installing theme getting doubled up. 2013-06-18 11:14:02 -05:00
Macil Tech
3bcc87caf2 Fix PM count caching.
cache::get() returns null if the key wasn't found (at least when using
the Redis cache backend).
2013-06-18 11:02:45 -05:00
czaks
258083e5cb Merge branch 'master' of https://github.com/savetheinternet/Tinyboard 2013-05-26 17:53:00 -04:00
undido
b4ff535128 update to pages.php minor exploit
A lot of bans can be removed from a tinyboard database because it isn't limited A staff member could select 100 users all at once with a simple javascript function and unban them all this needs to be limited because a staff member on an image board if they feel hostile they can just remove all bans on the tinyboard site easily without being limited to how many people they can unban at a time, this adds an option to limit it.
2013-04-16 19:09:58 -03:00
Fredrick
bb54605eb7 Fix per-board name not being used 2013-03-20 07:46:48 -04:00
Michael Save
64ae123739 Mod log in ?/IP (ie. ban history) 2013-03-16 18:27:24 +11:00
Michael Save
1816218c64 Fix: Critical security vulnerability 2013-03-15 00:40:02 +11:00
Michael Save
2051018ba1 ... 2013-01-30 05:07:09 +11:00
Michael Save
5661e32b1c Instead of showing $config['error']['malformed'] on corrupt session, just go straight to the login form 2013-01-30 04:45:38 +11:00
Marcin Łabanowski
b4efebae55 Merge branch 'master' of https://github.com/savetheinternet/Tinyboard 2013-01-29 14:31:35 +01:00
Michael Save
774e27caf5 Use === operator in authentication. 2013-01-29 22:13:35 +11:00
Michael Save
e5bf2a91fc Don't always redirect to dashboard on login 2013-01-29 22:11:33 +11:00
Marcin Łabanowski
d1bd4e1f7b Merge branch 'master' of https://github.com/savetheinternet/Tinyboard 2013-01-28 13:29:21 +01:00
Michael Save
1ad71b33e2 More use of mod log 2013-01-27 19:02:47 +11:00
Marcin Łabanowski
e6b9bad788 Merge branch 'master' of https://github.com/savetheinternet/Tinyboard
Conflicts:
	mod.php
2013-01-26 15:08:48 +01:00
Marcin Łabanowski
9b7b1c996f Revert "[EDIT] restore previous behaviour (editing of html, not bbcode)"
This reverts commit 55d752073d.
2013-01-26 15:03:31 +01:00
Michael Save
9a2c33736a New debug page: ?/debug/sql 2013-01-25 23:56:55 +11:00
Michael Save
764d718f84 ?/debug/recent 2013-01-25 22:23:26 +11:00
Michael Save
d5a994537b New debug mod page: ?/debug/recent (recent posts across all boards) 2013-01-25 22:18:03 +11:00
Michael Save
060be53797 Show "most recent" in anti-spam debug page 2013-01-24 19:25:07 +11:00
Michael Save
85710249b7 Raw HTML editing 2013-01-24 19:16:25 +11:00
Marcin Łabanowski
55d752073d [EDIT] restore previous behaviour (editing of html, not bbcode) 2013-01-23 19:06:13 +01:00
Marcin Łabanowski
fabba73ce4 Merge branch 'master' of https://github.com/savetheinternet/Tinyboard into HEAD
Conflicts:
	mod.php
2013-01-23 18:58:38 +01:00
Marcin Łabanowski
e087e9afae Revert "[EDIT] added dummy page"
This reverts commit a051ca64ab.

Conflicts:
	mod.php
2013-01-23 18:57:02 +01:00
Marcin Łabanowski
635cd5a7d9 Revert "[EDIT] added dummy form"
This reverts commit 1a2c859996.
2013-01-23 18:54:48 +01:00
Marcin Łabanowski
b04a05494a Revert "[EDIT] basic edit support"
This reverts commit 9fec3646fa.

Conflicts:
	inc/mod/pages.php
2013-01-23 18:54:41 +01:00
Michael Save
bceb314ce6 Major fixes and clean-up for edit form 2013-01-24 04:16:09 +11:00
asiekierka
c7c5a65a1f [EDIT] basic edit support 2013-01-24 03:53:23 +11:00
asiekierka
64e06dfcf3 [EDIT] added dummy form 2013-01-24 03:53:06 +11:00