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
Michael Foster
9825d8611f
Outputting thread subject in header/title (issue #122 )
2013-07-16 02:48:20 -04:00
Michael Foster
5c7e328f5d
Add "write" (files written to) to debug section
2013-07-16 01:21:06 -04:00
czaks
7503a1a7b6
js i18n: finish implementation with addition of the compiled locale strings file to additional javascripts
2013-07-03 00:25:32 -04:00
K
1b3852c8b4
Add support for 4chan-compatible json API.
2013-07-02 19:52:29 +02:00