kashire/lainchan
4
0
Fork 0
Code Issues 9 Pull Requests Releases Wiki Activity
2,272 Commits 3 Branches 26 Tags 120 MiB
ca565d07c2
Commit Graph

1135 Commits

Author SHA1 Message Date
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
Marcin Łabanowski
39cf9e7de5 Updated Polish translation (3) 2013-07-31 04:05:44 -04:00
Marcin Łabanowski
4266c412b5 Updated Polish translation (2) 2013-07-31 04:05:38 -04:00
Marcin Łabanowski
cbab1f9ac2 Updated Polish translation 2013-07-31 04:05:29 -04:00
Michael Foster
64bc410484 Small comment change 2013-07-31 04:02:40 -04:00
Marcin Łabanowski
7c8bbe8527 Implement image identification buttons using regex.info/exif, google images and tineye 2013-07-31 04:00:22 -04:00
Michael Foster
18516ff828 Rename $config['url_ads'] to $config['link_prefix'] 2013-07-31 03:43:01 -04:00
szalej
51efd817c8 Update inc/config.php 
hide referrer option
 2013-07-31 03:39:51 -04:00
Marcin Łabanowski
3ef2c05bb2 url_ads: fix it not working 2013-07-31 03:39:20 -04:00
szalej
5bf53cb581 Update inc/functions.php 
url ads
 2013-07-31 03:39:15 -04:00
szalej
220609999a Update inc/functions.php 
Hide Referrer (nullrefer.com)
 2013-07-31 03:39:10 -04:00
asiekierka
44d3b12cef Embedding: added vocaroo support 2013-07-31 03:37:09 -04:00
Michael Foster
573f86ccae Tiny code clean-up 2013-07-31 03:35:07 -04:00
Marcin Łabanowski
73cb2bdf2c convert+gifsicle: fix previous commit 2013-07-31 03:33:12 -04:00
Marcin Łabanowski
b7e725bf3e Support for resizing gifs using gifsicle with resizing the rest using ImageMagick 2013-07-31 03:33:06 -04:00
Marcin Łabanowski
f9cdf31ede Fix animated .gif conversion when $config['thumb_ext'] == '' 2013-07-31 03:32:44 -04:00
czaks
ee23ec1e24 Merge branch 'master' of https://github.com/savetheinternet/Tinyboard 2013-07-31 03:18:11 -04:00
Michael Foster
a2d8e4cf3e Previous commit comment fix 2013-07-31 03:13:51 -04:00
Michael Foster
37d769646b Markup/quote fix for multibyte 2013-07-31 03:12:06 -04:00
czaks
96bcf5dd1e 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
b22bcdecf9 Fix last commit: purge() issue 2013-07-31 02:19:58 -04:00
Michael Foster
42cba53887 Allow Unicode in board URIs. 2013-07-31 02:08:55 -04:00
Michael Foster
bb2868896c Ability to hide IP addresses from mod log 2013-07-31 00:04:57 -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
8efab06616 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
461084d400 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
793042ee6c Merge branch 'master' of https://github.com/savetheinternet/Tinyboard 
Conflicts:
	js/inline-expanding.js
 2013-07-29 23:17:37 -04:00
Michael Foster
1759ac2ea3 Post search: Search other fields too 2013-07-29 20:20:07 -04:00
czaks
4257191acd Merge branch 'master' of https://github.com/savetheinternet/Tinyboard 2013-07-29 16:26:10 -04:00
Michael Foster
58306bdc63 Search posts 2013-07-29 16:18:06 -04:00
Michael Foster
5bab041814 Make font-awesome enabled by default 2013-07-29 12:27:10 -04:00
czaks
d11e9d752e Merge branch 'master' of https://github.com/savetheinternet/Tinyboard 2013-07-28 20:51:43 -04:00
Michael Foster
bd8bd3c02e Fix for last commit 2013-07-28 20:46:00 -04:00
Michael Foster
57c8e4ee7c Strip combining characters from Unicode strings (eg. Zalgo) 2013-07-28 20:33:26 -04:00
czaks
396492aad6 Update Polish locale 2013-07-27 02:01:42 -04:00
czaks
065a6f97c8 localise time values 2013-07-27 01:50:38 -04:00
czaks
3f2ea6b936 i18n some strings in inc/config.php 2013-07-27 01:33:21 -04:00
czaks
ae99c6dd0d i18n one more string in inc/functions.php 2013-07-27 01:21:30 -04:00
czaks
5108bd1bf7 Merge branch 'master' of https://github.com/savetheinternet/Tinyboard 
Conflicts:
	inc/functions.php
 2013-07-26 13:47:53 -04:00
Michael Foster
37d5846e4e Fix markup overlapping. Issue #124 2013-07-26 11:01:13 -04:00
czaks
114e34eea5 Merge branch 'master' of https://github.com/savetheinternet/Tinyboard 
Conflicts:
	install.php
 2013-07-24 16:24:20 -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
czaks
1aa522e138 Merge branch 'master' of https://github.com/savetheinternet/Tinyboard 
Conflicts:
	templates/index.html
	templates/post_thread.html
	templates/thread.html
 2013-07-23 10:25:33 -04:00
Michael Foster
1132a4ce79 Option to use font-awesome for sticky/lock icons, etc. 2013-07-23 09:38:42 -04:00
Michael Foster
ab0c5ee481 Option to make stylesheet selections board-specific 2013-07-23 01:35:56 -04:00
czaks
88c1205e42 Merge branch 'master' of https://github.com/savetheinternet/Tinyboard 
Conflicts:
	js/hide-threads.js
 2013-07-22 23:33:02 -04:00
Michael Foster
6ba8f3f7de Add custom links to dashboard 2013-07-22 18:30:45 -04:00
Michael Foster
ed8fe6c27a Option to check public ban message by default 2013-07-22 17:51:13 -04:00
czaks
805c729892 Merge branch 'master' of https://github.com/savetheinternet/Tinyboard 2013-07-22 10:14:17 -04:00
Michael Foster
308f557fd5 Option to automatically strip EXIF metadata from JPEGs 2013-07-21 15:50:45 -04:00
czaks
97a22e57c1 Remove imgcaptcha, this code is unused in any of our forks and needs work to get here back. 
Revert "Merge branch 'imgcaptcha' of https://github.com/asiekierka/Tinyboard"

This reverts commit 49afb685c8, reversing
changes made to 2451a0f29c.

Conflicts:

	js/imgcaptcha.js
 2013-07-20 22:47:26 -04:00
czaks
8772c31ce1 post search: missed default config 2013-07-20 22:45:21 -04:00
czaks
33c7abf11f Merge branch 'master' of github.com:vichan-devel/Tinyboard 2013-07-20 22:33:56 -04:00
czaks
17952d173c Update Polish translation 2013-07-20 20:23:55 -04:00
Czterooki
bc1bc9f6ef Merge branch 'master' of github.com:vichan-devel/Tinyboard 2013-07-20 18:28:57 -04:00