Michael Foster
45b806f43f
single quotation marks please
2013-08-21 22:43:35 +10:00
Michael Foster
21a089a05f
merge fail
2013-08-21 22:36:48 +10:00
ctrlcctrlv
9d21d0665d
;_;
2013-08-21 22:35:19 +10:00
ctrlcctrlv
e241500a0b
Custom fields in API, read config.php for info. Non-4chan compatible fields removed.
2013-08-21 22:35:01 +10:00
ctrlcctrlv
34c8348ed3
Make it possible to disable API, disable it by default
...
Conflicts:
inc/functions.php
2013-08-21 22:34:52 +10:00
K
1d3ef3a28b
Add support for 4chan-compatible json API.
...
Conflicts:
inc/functions.php
2013-08-21 22:32:44 +10:00
ctrlcctrlv
485d4f4087
;_;
2013-08-20 21:35:16 +00:00
ctrlcctrlv
0c28056e40
Delete JSON when thread deleted
2013-08-20 19:53:11 +00:00
ctrlcctrlv
036419cabe
Oops, forgot to check if enabled at one point
2013-08-20 18:59:20 +00:00
ctrlcctrlv
abcad33df9
Custom fields in API, read config.php for info. Non-4chan compatible fields removed.
2013-08-20 18:17:05 +00:00
ctrlcctrlv
4d510180cd
Make it possible to disable API, disable it by default
2013-08-20 16:53:05 +00:00
czaks
311c18b34d
Merge branch 'master' of https://github.com/savetheinternet/Tinyboard
...
Conflicts:
install.php
2013-08-18 13:16:31 -04:00
Michael Foster
fd47236c7e
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
d6d9e0f260
Merge branch 'master' of https://github.com/savetheinternet/Tinyboard
...
Conflicts:
js/post-hover.js
2013-08-17 16:21:40 -04:00
Michael Foster
4b5e1909f5
Bugfix: raw html posting
2013-08-18 04:49:56 +10:00
Michael Foster
e4a07b9103
keep casing of escape modifiers
2013-08-17 17:56:38 +10:00
Michael Foster
3e7996f3ee
better modifier escaping again
2013-08-17 17:53:39 +10:00
Michael Foster
acb68a6240
escape_markup_modifiers: make it case insensitive
2013-08-17 17:41:22 +10:00
Michael Foster
0ff4e567bc
add delete event
2013-08-17 16:06:45 +10:00
czaks
2cc47eae5f
noko50 fix previous commit
2013-08-16 10:10:18 -04:00
czaks
8114e927d0
fix noko50 for new new Post and new Thread syntax
2013-08-16 10:09:37 -04:00
czaks
e440851526
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
44e16593b6
Much better post modifiers: raw HTML, ban messages, etc.
2013-08-16 21:25:56 +10:00
Michael Foster
5fdc0878c9
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
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
czaks
e968fd6ce9
localise time values
2013-07-31 04:55:34 -04:00
Michael Foster
84252f1c8a
Rename $config['url_ads'] to $config['link_prefix']
2013-07-31 03:43:01 -04:00
Marcin Łabanowski
61c0280288
url_ads: fix it not working
2013-07-31 03:39:20 -04:00
szalej
f42121db4a
Update inc/functions.php
...
url ads
2013-07-31 03:39:15 -04:00
szalej
8021d22e3b
Update inc/functions.php
...
Hide Referrer (nullrefer.com)
2013-07-31 03:39:10 -04:00
czaks
6eaff24cdc
Merge branch 'master' of https://github.com/savetheinternet/Tinyboard
2013-07-31 03:18:11 -04:00
Michael Foster
a15a37cd4e
Previous commit comment fix
2013-07-31 03:13:51 -04:00
Michael Foster
a8918d3bbe
Markup/quote fix for multibyte
2013-07-31 03:12:06 -04:00
czaks
eed8767039
Merge branch 'master' of https://github.com/savetheinternet/Tinyboard
...
Conflicts:
inc/functions.php
inc/mod/pages.php
install.php
js/expand.js
mod.php
2013-07-31 02:30:44 -04:00
Michael Foster
c823bcb2c3
Fix last commit: purge() issue
2013-07-31 02:19:58 -04:00
Michael Foster
ca6cb1fdea
Allow Unicode in board URIs.
2013-07-31 02:08:55 -04:00
Michael Foster
a01f53b4a4
Upgrade to utf8mb4 charset for MySQL server versions above 5.5.3. Keep support for older versions. Fix charsets for multiple columns and tables.
2013-07-30 22:08:56 -04:00
Michael Foster
e2adc0093d
MySQL's utf8 charset only supports up to 3-byte symbols. Insterting four byte symbols (U+010000 to U+10FFFF) can be done maliciously to break HTML mark-up.
...
The ideal solution was to convert to MySQL's utf8mb4 charset, but then we would lose support for MySQL < 5.5.3. In this fix, incompatible characters are encoded as HTML numeric character references (eg. #65536 ) and just stripped from body_nommarkup.
2013-07-30 16:41:10 -04:00
czaks
f5115f1945
Merge branch 'master' of https://github.com/savetheinternet/Tinyboard
2013-07-28 20:51:43 -04:00
Michael Foster
d9dfed5e1c
Fix for last commit
2013-07-28 20:46:00 -04:00
Michael Foster
9a14d32c77
Strip combining characters from Unicode strings (eg. Zalgo)
2013-07-28 20:33:26 -04:00
czaks
a61c7a32bb
localise time values
2013-07-27 01:50:38 -04:00
czaks
56206315c6
i18n one more string in inc/functions.php
2013-07-27 01:21:30 -04:00
czaks
e1d4b9edf1
Merge branch 'master' of https://github.com/savetheinternet/Tinyboard
...
Conflicts:
inc/functions.php
2013-07-26 13:47:53 -04:00
Michael Foster
5359769088
Fix markup overlapping. Issue #124
2013-07-26 11:01:13 -04:00
czaks
495c6fa846
Merge branch 'master' of https://github.com/savetheinternet/Tinyboard
...
Conflicts:
post.php
2013-07-18 15:19:03 -04:00
Michael Foster
34b5f62600
Themes edit: Split "post" into two seperate actions: "post" (replies) and "post-thread". And add a $board variable.
2013-07-18 12:06:26 -04:00
czaks
49f968fa5d
Merge branch 'master' of https://github.com/kaja47/Tinyboard
2013-07-16 13:40:56 -04:00
czaks
6152ed43bd
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
390e529717
More ban stuff: Show whether or not user has "seen" a ban yet in the ban list and on IP address pages. Purge useless expired ban records.
2013-07-16 08:50:39 -04:00
Michael Foster
4340e74569
$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