kashire/lainchan
4
0
Fork 0
Code Issues 18 Pull Requests Releases Wiki Activity
2,646 Commits 3 Branches 26 Tags 120 MiB
183ee244be
Commit Graph

1306 Commits

Author SHA1 Message Date
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