Cool_Tools/vichan
1
0
Fork 0
mirror of https://github.com/vichan-devel/vichan.git synced 2024-11-27 08:50:59 +01:00
Code Releases Wiki Activity
2,642 Commits 50 Branches 28 Tags 70 MiB
7469715ca2
Commit Graph

1306 Commits

Author SHA1 Message Date
ctrlcctrlv
84adc64c18 Optionally access mod cookie in JavaScript 2013-08-19 03:01:15 +10:00
czaks
80f117b0f7 fix Polish translation 2013-08-19 03:00:44 +10:00
czaks
1e25e97f04 Update Polish translation 2013-08-19 03:00:38 +10:00
Michael Foster
139741c07e Missing theme conf type "checkbox" 2013-08-19 02:03:54 +10: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
52a6bec437 Merge branch 'master' of https://github.com/ctrlcctrlv/Tinyboard 2013-08-17 22:42:28 -04:00
czaks
22361ba790 boardlist work part 1: boardname in subtitle; work to make js restyling feasible 2013-08-17 22:41:40 -04:00
ctrlcctrlv
c6331e54a1 Better setting name 2013-08-18 01:53:39 +00:00
ctrlcctrlv
8c318b8b60 Optionally access mod cookie in JavaScript 2013-08-18 01:44:36 +00:00
czaks
b7edd4d14f fix Polish translation 2013-08-17 19:00:00 -04:00
czaks
87cca6351b Update Polish translation 2013-08-17 18:44:37 -04:00
czaks
af5400d441 Merge branch 'master' of https://github.com/ctrlcctrlv/Tinyboard 2013-08-17 16:22:04 -04: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
ctrlcctrlv
7213396207 Bundle jscolor 2013-08-17 19:42:00 +00:00
ctrlcctrlv
2875279472 Better error handling 2013-08-17 19:08:54 +00:00
Michael Foster
4b5e1909f5 Bugfix: raw html posting 2013-08-18 04:49:56 +10:00
ctrlcctrlv
f5360ad6c1 Configurable canvas size 2013-08-17 18:00:26 +00: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
b7948c8e3d Merge branch 'master' of https://github.com/savetheinternet/Tinyboard 
Conflicts:
	inc/display.php
 2013-08-16 16:06:54 -04:00
Michael Foster
2c7c1249bf fix aspect ratio displaying 2013-08-17 04:11:24 +10:00
Michael Foster
1373276589 Add \n before post modifiers. Add flag alt for country flags. 2013-08-17 03:39:58 +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
cca020be80 Optional "flag style" and "flag alt" modifiers 2013-08-16 23:12:40 +10:00
Michael Foster
07cd956a8f Fix editing raw HTML posts 2013-08-16 22:18:57 +10:00
Michael Foster
3860524165 forgot this here 2013-08-16 21:51:10 +10:00
Michael Foster
0d41af4065 This wasn't usd anywhere. 2013-08-16 21:46:51 +10: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
Michael Foster
73c51358f8 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
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
Michael Foster
44590b5756 Optional: Allow uploading by URL 2013-08-12 22:51:46 +10:00
Michael Foster
0bbecf89bf $config['error']['invalidzip'] isn't used anywhere anymore 2013-08-12 22:14:26 +10:00
Michael Foster
29d64f59a0 ?/config: Link URLs in comments 2013-08-12 21:14:32 +10:00
Michael Foster
35e2c19fc0 use single quotes 2013-08-12 21:08:40 +10:00
Michael Foster
5968a58f9f ... 2013-08-12 13:01:34 +10:00
czaks
f8d1427362 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
80264cdb77 what 2013-08-12 13:00:06 +10:00
czaks
d72a3dfa20 fix notice for mod spoiler image 2013-08-12 12:59:52 +10:00
Vasiliy Shikhachevskiy
8e502dea55 Added Czech translation 2013-08-12 12:58:29 +10:00
ctrlcctrlv
c8eab07cfb forgot to rename config option 2013-08-12 12:58:04 +10:00
ctrlcctrlv
58afcbbe81 Improve spoiler action 
Conflicts:
	inc/mod/pages.php
 2013-08-12 12:57:54 +10:00
ctrlcctrlv
64bd203bc6 accidentally spaces 2013-08-12 12:55:52 +10:00
ctrlcctrlv
1c78a04edd Spoil files moderator action 2013-08-12 12:55:44 +10:00
czaks
c738134ff5 noko50: clarify in config how to disable it 2013-08-11 17:53:42 -04: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
czaks
ca6373a077 spoilerimage config variable: this got fixed doubly, once wrong, merge both fixes 2013-08-11 17:34:43 -04:00
czaks
7474bd82d7 Merge branch 'master' of http://github.com/ctrlcctrlv/Tinyboard 2013-08-11 17:32:57 -04:00
czaks
b558ba60a2 fix notice for mod spoiler image 2013-08-11 17:22:39 -04:00
Vasiliy Shikhachevskiy
3a5be687d3 Added Czech translation 2013-08-11 13:59:07 -04:00
ctrlcctrlv
06d2f7ffb4 Merge conflict 2013-08-11 15:36:17 +00:00
ctrlcctrlv
c31a610914 forgot to rename config option 2013-08-11 13:55:15 +00:00
ctrlcctrlv
5786c7dbc0 Improve spoiler action 2013-08-11 13:54:11 +00:00
czaks
24b1adc501 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
4fbbec0e5d $config['boardlist_wrap_bracket'] default to true 2013-08-11 21:30:46 +10:00
ctrlcctrlv
edd197586f Option to have a message on the ban page 
Conflicts:
	inc/config.php
 2013-08-11 21:29:02 +10:00
ctrlcctrlv
5ed4582885 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
48ac445038 Allow for HTML in the board subtitle 
Conflicts:
	inc/config.php
 2013-08-11 21:08:19 +10:00
Michael Foster
172effc889 Clean: Make boardlist bracket wrapping optional 2013-08-11 21:06:13 +10:00
ctrlcctrlv
51d1d4eb5c Make boardlist bracket wrapping optional 2013-08-11 21:04:45 +10:00
czaks
65453f2889 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
7564b9e1d7 Update Polish translation 2013-08-11 21:02:50 +10: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
348f702255 fix support for board prefixes after merge 2013-08-09 17:42:19 -04:00
czaks
34e96a3b44 i18n work on ctrlcctrlv's additions 2013-08-09 17:21:40 -04:00
czaks
62e4b854c3 Fix boardlist bracketing issue 2013-08-09 17:16:25 -04:00
ctrlcctrlv
68bd3150f1 Option to have a message on the ban page 2013-08-09 19:52:19 +00:00
ctrlcctrlv
ceb257a9bd Critical bug: could not move threads/posts with spoiler images, resulted in I/O error 2013-08-09 19:40:49 +00:00
ctrlcctrlv
013ca134be Oekaki 2013-08-08 22:15:59 +00:00
ctrlcctrlv
3204b57b5b Advertisements 2013-08-08 21:57:52 +00:00
ctrlcctrlv
24dd741f9f mistake in last commit 2013-08-08 21:09:38 +00:00
ctrlcctrlv
dc40137b97 Optionally allow the moving of single replies 2013-08-08 21:08:01 +00:00
ctrlcctrlv
4a190c7688 accidentally spaces 2013-08-08 19:43:40 +00:00
ctrlcctrlv
24a015eed4 Spoil files moderator action 2013-08-08 19:41:21 +00:00
ctrlcctrlv
52b7254d4b Optionally use email selectbox 2013-08-08 19:30:05 +00:00
ctrlcctrlv
074217ec3c Allow for HTML in the board subtitle 2013-08-08 18:58:44 +00:00
ctrlcctrlv
1e2b4645df Make boardlist bracket wrapping optional 2013-08-08 18:43:24 +00:00
czaks
dbb0d7b7d3 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
585f75fcaf 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
3ca29fbe17 fix api issue 2013-08-05 06:09:15 -04:00
czaks
c3def0e453 Merge branch 'master' of github.com:vichan-devel/Tinyboard 
Conflicts:
	js/post-hider.js
 2013-08-05 06:03:40 -04:00
czaks
066b733878 Update Polish translation 2013-08-05 05:32:18 -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
f56f5356ca Merge branch 'master' of https://github.com/savetheinternet/Tinyboard 2013-08-04 23:31:53 -04:00
czaks
715111e4c5 bring back ==tags== by default 2013-08-04 23:06:54 -04:00
Michael Foster
7044ec8ace Bugfix: exif_read_data() Incorrect APP1 Exif Identifier Code 2013-08-04 23:02:15 -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
c17ab961be bugfix 2013-08-04 18:48:32 -04:00
Michael Foster
d3e9bd18f7 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
39a8771706 ?/config: Advanced permissions 2013-08-04 17:53:09 -04:00
Michael Foster
7ab7e0a862 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
9935fb3024 gifsicle: redirect stdout to /dev/null but keep stderr going to stdout 2013-08-04 16:32:36 -04:00
czaks
a696e35d52 gifsicle: make it finally work 2013-08-04 16:27:58 -04:00
czaks
4046e46755 gifsicle: make it finally work 2013-08-04 15:29:18 -04:00
Michael Foster
45f8b5120f Fix issue with installing and creating boards with MySQL < 5.5.3. Issue #129 2013-08-04 15:23:26 -04:00
Michael Foster
50eec97b66 bug fix, wrong index 2013-08-04 05:11:46 -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
czaks
4a437b650b fix gifsicle issue connected with frame limit 2013-08-04 04:49:47 -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
czaks
8d8700dfcf fix gifsicle issue connected with frame limit 2013-08-04 04:46:30 -04:00
czaks
64147c93fa Merge branch 'master' of https://github.com/savetheinternet/Tinyboard 2013-08-04 01:00:23 -04:00
Michael Foster
da73fd3283 Use exiftool to patch bug for now. 2013-08-04 00:48:28 -04:00
czaks
3cad34effc Merge branch 'master' of https://github.com/savetheinternet/Tinyboard 2013-08-03 22:21:02 -04:00
Michael Foster
f99a7305f4 Can't auto-orient a non-JPEG 2013-08-03 22:20:39 -04:00
czaks
381a0d5823 Merge branch 'master' of https://github.com/savetheinternet/Tinyboard 2013-08-03 22:18:46 -04:00
Michael Foster
c169b7ebe2 fix last commit 2013-08-03 22:16:17 -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
root
82f4a3d58f Merge branch 'master' of https://github.com/savetheinternet/Tinyboard 2013-08-03 21:49:38 -04:00
Michael Foster
593f8757f2 Bugfix: gm and auto-orient thumbnailing 2013-08-03 21:47:24 -04:00
Michael Foster
afa37411c0 Fix some indent-formatting. Tab = 8 chars 2013-08-03 21:04:45 -04:00
czaks
9d6f58d226 Merge branch 'master' of https://github.com/savetheinternet/Tinyboard 2013-08-03 21:01:26 -04:00
Michael Foster
7211d9c069 Only use identify if we have to 2013-08-03 20:50:37 -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
c2866dd401 Fix redirect with board config editor (raw php) 2013-08-03 06:27:13 -04:00
Michael Foster
a3a490c7f2 Web config editor: board configs 2013-08-03 06:26:17 -04:00
Michael Foster
0afd69d975 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
bb24c0b0f8 no 2013-08-03 05:25:41 -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
cbb41a5780 Fix ordering of notes and bans 2013-08-03 02:06:58 -04:00
Michael Foster
4f4e0b73a8 Erorr handling update 2013-08-03 02:01:52 -04:00
Michael Foster
ab7c9cf69c Accidentally commit'd debug stuff/errors 2013-08-03 00:28:54 -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
c6499dacce Better command-line ImageMagick image processing 2013-08-02 23:18:25 -04:00
Michael Foster
bcea4904d5 syntax error in last commit 2013-08-02 21:37:44 -04:00
Michael Foster
37dd4c09f4 Fix bug 2013-08-02 21:23:18 -04:00
Michael Foster
9ef34efc0d $config['dir']['static'] doesn't exist. 2013-08-02 21:01:04 -04:00
Michael Foster
7a28b09d8b Fix last commit 2013-08-02 20:56:30 -04:00
Michael Foster
d59e74f394 Major config.php cleanup and a few minor misc fixes. 2013-08-02 20:52:58 -04:00
czaks
6ed8e8752e Merge branch 'master' of https://github.com/savetheinternet/Tinyboard 2013-08-02 00:09:07 -04:00
Michael Foster
01494dccce Installer: Nicer pre-installation test 2013-08-02 00:08:37 -04:00
czaks
d1a5e9d2cf 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
d71f49c801 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
695d50be8c Simple file editor replacement for ?/config (optional). Issue #127 2013-08-01 17:18:10 -04:00
Michael Foster
48c5fb4615 Continue upgrading Twig 2013-08-01 15:55:28 -04:00
Michael Foster
538e88b7bd Web config editor: Use a <select> for JANITOR/MOD/ADMIN permissions 2013-08-01 15:20:25 -04:00
Michael Foster
47823b5071 Upgrade Twig library 2013-08-01 15:20:12 -04:00
Michael Foster
ce1e206797 convert+gifscale didn't respect $config['thumb_keep_animation_frames'] 2013-08-01 04:24:34 -04:00
Michael Foster
cf373037bd Forgot "global $config" here 2013-08-01 03:51:50 -04:00
czaks
3421e2aa46 Compile Polish locale 2013-08-01 03:22:58 -04:00
Jakub Skrzypnik
ace5866b9c Correcting polish locale a bit 2013-08-01 03:22:48 -04:00
Jakub Skrzypnik
a58a2bf989 Correcting polish locale a bit 2013-08-01 03:22:39 -04:00
czaks
6257406a7b Compile Polish locale 2013-08-01 02:52:35 -04:00
Jakub Skrzypnik
fe0c7d2161 Correcting polish locale a bit 2013-08-01 08:49:14 +02:00
Jakub Skrzypnik
afa3b15c8a Correcting polish locale a bit 2013-08-01 08:46:24 +02:00
czaks
483de4fa25 Update Polish locale 2013-08-01 02:39:54 -04:00
czaks
cbb845c592 i18n even more strings in inc/display.php 2013-08-01 02:39:41 -04:00
czaks
ff4f37b213 Update Polish locale 2013-08-01 02:06:34 -04:00
czaks
35686e023a i18n even more strings in inc/display.php 2013-08-01 01:56:04 -04:00
czaks
39f490bc5f i18n strings in inc/display.php 2013-08-01 01:53:13 -04:00
czaks
803417adb6 the prefix work: fix it to be dependent on a board_regex config value 2013-08-01 01:53:07 -04:00
czaks
db2e447024 i18n strings in inc/display.php 2013-08-01 01:47:15 -04:00
czaks
04a85da980 the prefix work: fix it to be dependent on a board_regex config value 2013-08-01 01:43:33 -04:00
czaks
79394cac2c fix previous commit; markup is called via reference 2013-08-01 01:09:54 -04:00
czaks
e2fd06ed10 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
985778ec5b removed a relict from older post hider 2013-08-01 01:04:19 -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
czaks
70dbed72b1 fix post editing for tinyboard markup 2013-07-31 21:26:55 -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
286524ca46 Newline before <tinyboard ban message> 2013-07-31 20:54:20 -04:00
Michael Foster
da5048a0e4 SQL cleanup 2013-07-31 20:51:43 -04:00
czaks
644f1d90cb fix previous commit; markup is called via reference 2013-07-31 20:41:56 -04:00
czaks
08e7192377 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
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
2c7fa51012 fix post editing for tinyboard markup 2013-07-31 19:50:25 -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
Michael Foster
89285fd7c3 Fix issue #72 2013-07-31 18:29:09 -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
625a7961bd Merge branch 'master' of https://github.com/savetheinternet/Tinyboard 2013-07-31 17:02:30 -04:00
Michael Foster
44910c34c3 Fix last commit; Make Tinyboard Twig extension more mb-safe 2013-07-31 16:38:09 -04:00
Michael Foster
d447c0bd72 Issue #125 2013-07-31 16:22:27 -04:00
czaks
ed2f3358db fix merge 2013-07-31 15:01:44 -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