Commit Graph
100 Commits
Author SHA1 Message Date
czaks 8ca495e5b8 Merge branch 'master' of https://github.com/savetheinternet/Tinyboard into vichan-devel-4.5
Conflicts:
	inc/config.php
2013-09-17 19:12:19 -04:00
czaks 9516aa1997 ajax.js: fix upload progress display in firefox 2013-09-17 18:54:06 -04:00
czaks 6d3ac4c512 remove js/quick-reply-vd-old.js (didn't differ too much from the original -old) 2013-09-17 18:19:44 -04:00
czaks 8164d03704 fix quickreply when recorded position is <0 2013-09-17 18:15:59 -04:00
czaks 3af05ed55b quick-reply.js and oekaki.js interoperation fix 2013-09-17 18:12:54 -04:00
czaks 65a0e133d4 readd mistakenly deleted files by a bad merge 2013-09-17 15:13:03 -04:00
czaks 9092788fe1 Merge https://github.com/savetheinternet/Tinyboard-Tools into vichan-devel-4.5
Conflicts:
	README.md
	js/auto-reload.js
	js/fix-report-delete-submit.js
	js/forced-anon.js
	js/local-time.js
	js/post-hover.js
	js/quick-post-controls.js
	js/quick-reply.js
	js/show-backlinks.js
	js/smartphone-spoiler.js
	migration/kusabax.php
	stylesheets/dark.css
	stylesheets/futaba+vichan.css
	stylesheets/miku.css
	stylesheets/testorange.css
	stylesheets/wasabi.css
	tools/benchmark.php
	tools/i18n_extract.php
	tools/inc/cli.php
	tools/rebuild.php
2013-09-17 15:08:41 -04:00
czaks 6cb7eb939e Merge branch 'master' of https://github.com/savetheinternet/Tinyboard into vichan-devel-4.5
Conflicts:
	inc/config.php
	inc/display.php
	inc/mod/pages.php
	install.php
	js/quick-reply.js
	post.php
	templates/index.html
2013-09-17 10:43:44 -04:00
czaksandMichael Foster 8a244ab61e Fixed working on some broken shared hostings. Thanks for Belarussian anon for reporting. 2013-09-02 13:41:28 +10:00
czaks 069f1def9b Merge branch 'master' of https://github.com/savetheinternet/Tinyboard
Conflicts:
	install.php
2013-09-01 11:25:19 -04:00
czaks c240056865 Fixed working on some broken shared hostings. Thanks for Belarussian anon for reporting. 2013-09-01 11:20:57 -04:00
czaks 8de81d176c Merge branch 'master' of https://github.com/savetheinternet/Tinyboard
Conflicts:
	inc/config.php
2013-08-29 07:33:19 -04:00
czaks b61772361c Merge https://github.com/ctrlcctrlv/Tinyboard 2013-08-29 07:32:06 -04:00
czaks b95840adcb Merge branch 'master' of https://github.com/savetheinternet/Tinyboard
Conflicts:
	inc/functions.php
2013-08-28 20:34:06 -04:00
czaks a1d9de205b fix update after a bad merge 2013-08-28 20:24:30 -04:00
czaks 8503e65858 Merge branch 'master' of https://github.com/savetheinternet/Tinyboard
Conflicts:
	inc/config.php
	inc/functions.php
	install.php
	stylesheets/dark_roach.css
2013-08-28 12:41:36 -04:00
czaks 3dfe13be3c Update readme 2013-08-20 21:58:44 -04:00
czaks de035f4a7e Merge branch 'master' of https://github.com/savetheinternet/Tinyboard
Conflicts:
	stylesheets/dark_roach.css
	stylesheets/style.css
2013-08-20 18:22:37 -04:00
czaks f909fd190a Merge branch 'master' of https://github.com/ctrlcctrlv/Tinyboard 2013-08-20 18:19:06 -04:00
czaks ccfc1501af tag for vichan-devel-4.0.11-gold 2013-08-18 22:11:41 -04:00
czaks 6634b43572 Merge branch 'master' of https://github.com/ctrlcctrlv/Tinyboard 2013-08-18 19:26:51 -04:00
czaks 5389b0f358 Merge branch 'master' of https://github.com/savetheinternet/Tinyboard 2013-08-18 19:26:31 -04:00
czaks a0d0d22a64 Merge http://github.com/ctrlcctrlv/Tinyboard 2013-08-18 13:26:52 -04:00
czaks c8bb96f0cf toggle-locked-threads.js: fix for awesome font 2013-08-18 13:23:04 -04:00
czaks da1b7d087e Merge branch 'master' of https://github.com/savetheinternet/Tinyboard
Conflicts:
	install.php
2013-08-18 13:16:31 -04:00
czaksandMichael Foster 45bfd2a095 fix Polish translation 2013-08-19 03:00:44 +10:00
czaksandMichael Foster a297ce4af5 Update Polish translation 2013-08-19 03:00:38 +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
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 381cac2cb8 fix oekaki for ukko 2013-08-17 17:50:31 -04:00
czaks 9773cef5fa upload-selection + oekaki: hide confirmation 2013-08-17 17:31:50 -04:00
czaks e37efb422e upload-selection.js: oekaki interaction 2013-08-17 17:26:46 -04:00
czaks 29a36e899e oekaki.js: next iteration of fixes 2013-08-17 17:21:05 -04:00
czaks 4b14049c94 oekaki.js: fix a little bit; i18n more 2013-08-17 17:07:15 -04:00
czaks 5d8608b839 Add upload selection javascript for decluttering the post form 2013-08-17 16:56:22 -04:00
czaks ed16e40e20 upload: add ids for a script for selection 2013-08-17 16:37:15 -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
czaks ca565d07c2 Merge branch 'master' of https://github.com/savetheinternet/Tinyboard
Conflicts:
	inc/display.php
2013-08-16 16:06:54 -04:00
czaks d0c72927a6 Merge (partially) branch 'master' of https://github.com/savetheinternet/Tinyboard
Let's not merge part of it for now; it break things here

Conflicts:
	js/post-hover.js
2013-08-16 11:29:13 -04:00
czaks b31f6489c7 js/catalog-link.js: i18n fix 2013-08-16 10:47:25 -04:00
czaks 83cd4cf841 js/catalog-link.js: disable for ukko 2013-08-16 10:45:43 -04:00
czaks 08652df7ac js/catalog-link.js: i18n 2013-08-16 10:45:01 -04:00
czaks e0b729f803 fix search.php for new new Post and new Thread syntax 2013-08-16 10:17:13 -04:00
czaks b0312d4d36 ukko: fix for new new Post and new Thread syntax 2013-08-16 10:13:06 -04: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
czaks c2ffd32436 fix thread expanding and post hover interop a bit 2013-08-13 15:30:17 -04: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
czaksandMichael Foster 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
czaksandMichael Foster 96122c3fc2 fix notice for mod spoiler image 2013-08-12 12:59:52 +10:00
czaks b5bba48edf noko50 + expand.js: make it interoperate 2013-08-11 17:59:17 -04:00
czaks 92edc1d0a5 noko50: clarify in config how to disable it 2013-08-11 17:53:42 -04:00
czaks d3b0a55dd9 noko50: small fixes in template 2013-08-11 17:52:35 -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 9a03b6902d Merge branch 'master' of http://github.com/JosephGoldbergStein/Tinyboard 2013-08-11 17:32:21 -04:00
czaks c3cb0f171b fix notice for mod spoiler image 2013-08-11 17:22:39 -04:00
czaks aeb33169ea Merge branch 'master' of github.com:vichan-devel/Tinyboard 2013-08-11 09:50:58 -04: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
czaksandMichael Foster 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
czaksandMichael Foster 8b26201a05 Update Polish translation 2013-08-11 21:02:50 +10:00
czaks bc77d51d54 tag vichan-devel-4.0.9-gold 2013-08-10 13:03:00 -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 ef4cf16a73 fix submit button not showing when topic disabled (after merge) 2013-08-09 17:36:07 -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
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 16ae5177f7 Merge branch 'master' of https://github.com/savetheinternet/Tinyboard 2013-08-05 06:23:20 -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 a8327c3a37 fix in installation script; tag vichan-devel-4.0.8-gold 2013-08-05 05:36:12 -04:00
czaks b2e958a61b tag vichan-devel-4.0.7-gold 2013-08-05 05:32:58 -04:00
czaks 926fedd576 Update Polish translation 2013-08-05 05:32:18 -04:00
czaks ad90ea7238 update translation tools 2013-08-05 05:30:11 -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
czaksandMichael Foster 5bebceb96b fix for boards containing + character; they were previously unaccessible in mod panel 2013-08-05 04:51:56 -04:00
czaksandMichael Foster 67daf109f2 fix Varnish compatibility when characters such as * are in use for a boardname 2013-08-05 04:51:48 -04:00
czaks b438fb294b post-hover.js: support linking to OPs (requires ukko patchset!) 2013-08-05 01:00:25 -04:00
czaks 185e68de47 post-hover.js: allow working between threads and boards (ukko patchset required!) 2013-08-05 00:18:25 -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
czaks 53e318dc05 fix for boards containing + character; they were previously unaccessible in mod panel 2013-08-04 22:49:38 -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
czaksandMichael Foster 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
czaks 71db417206 post-hover.js: ukko fix 2013-08-04 06:08:10 -04:00
czaksandMichael Foster 76101cad51 fix gifsicle issue connected with frame limit 2013-08-04 04:49:47 -04:00
czaks 3e4545d1b8 fix gifsicle issue connected with frame limit 2013-08-04 04:46:30 -04:00
czaksandMichael Foster fb3b9ea868 quick-post-controls.js: fix javascript interactions 2013-08-04 04:35:41 -04:00
czaks 8a89893b02 quick-post-controls.js: fix javascript interactions 2013-08-04 01:53:37 -04:00
czaks e2b5ec9354 ukko: further fixes; should now provide a smooth overboard experience 2013-08-04 01:36:56 -04:00