admin/quick-n-dirty
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
3,229 Commits 1 Branch 0 Tags
f5820d2aae45f60b6e6998b9ec2997c68a66fbf6
Commit Graph
100 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
czaks f5820d2aae move a few options to a general tab in options panel 2014-09-20 22:10:44 +02:00
czaks ea3c571d6c Merge branch 'catalog-spoiler-fix' of https://github.com/marlencrabapple/vichan 2014-09-20 06:44:03 +02:00
czaks 3919ad911c fix previous commit 2014-09-20 06:43:02 +02:00
czaks ac888a769d add a very small image size for catalog 2014-09-20 06:40:43 +02:00
czaks 56e55d157a remove a special containerchan stylesheet; it added some extra space for webms 2014-09-20 06:36:39 +02:00
czaks f7a015e7fe add user-options dialog functionality; port webm-settings to it; make a basic general settings applet; make it work on mobiles 2014-09-20 06:19:34 +02:00
czaks ceaaae824a fix an issue with watch.js on android chrome 2014-09-20 06:08:14 +02:00
Marcin Łabanowski 7d91fffdd8 Merge pull request #81 from marlencrabapple/recent-spoiler-fix 
Fixed spoiler thumbnails not showing up in the recent theme.
 2014-09-18 06:20:36 +02:00
Marcin Łabanowski 4da5f4ec90 Merge pull request #79 from marlencrabapple/master 
FFmpeg support for WebM uploads
 2014-09-17 20:50:21 +02:00
Marcin Łabanowski c369377c84 Merge pull request #80 from marlencrabapple/catalog-fixes 
A few catalog theme fixes
 2014-09-17 20:50:04 +02:00
Marcin Łabanowskiandroot d78dcd6ed6 fix a bug reported by Dudeman on #v-d 2014-08-21 04:27:47 +02:00
czaks 4d7933deb8 fix hide-threads.js & no-animated-gif.js interaction 2014-08-10 22:54:47 +02:00
czaks 1a1d44aadf live-index: fix for boards with more than one letter in name 2014-08-10 22:49:23 +02:00
czaks 48c1de637c live-index.js: load new thread functionality; bugfixes 2014-08-10 22:47:05 +02:00
czaks e1d99e66b5 hide-threads.js: hide field from live-index as well 2014-08-10 22:45:12 +02:00
czaks 169d088c50 increase waiting times for watch.js and live-index.js 2014-08-10 21:00:31 +02:00
czaks 4d25ca85ce live-index.js: initial commit 2014-08-10 20:55:37 +02:00
czaks 5cd435f176 Merge branch 'master' of github.com:vichan-devel/Tinyboard 2014-08-10 18:44:59 +02:00
Marcin Łabanowski 91519d9052 hopefully optimize watch.js a lot. fixes #24 2014-08-10 18:44:23 +02:00
Marcin Łabanowski eeeec608b9 Merge pull request #74 from kpcyrd/vichan-player 
Suppress warnings that might leak information in player.php
 2014-08-09 15:49:38 +02:00
czaks c3662d4a59 handle tinyboard flags with length=0 2014-08-09 05:12:36 +02:00
czaks 1b2f512339 final solution to expand-too-long problems 2014-08-09 04:56:50 +02:00
czaks 7da6f3b212 styling: webm-settings: remove extraneous <span> 2014-08-08 23:24:04 +02:00
czaks ff1ea29755 fix imgops size in a futaba+vichan style 2014-08-08 23:14:12 +02:00
czaks 2c99ede62f fix html validity 2014-08-08 23:09:33 +02:00
czaks bc5858fe83 image id buttons should be smaller 2014-08-08 23:08:02 +02:00
czaks 05e7ad0b56 ongoing catalog cleanup 2014-08-08 22:50:31 +02:00
czaks f5191151ef fix catalog a little more; remove tooltipster (it didn`t work) and order by last reply date (mostly redundant); now the generation times are a little bit better 2014-08-08 22:44:02 +02:00
czaks 4df5d7697d fix & optimize catalog a little bit, don't expect anything big yet 2014-08-08 22:36:36 +02:00
czaks b8381b31db Revert "Use a different way to show the original filename" 
This reverts commit d81a6c49e2.

Conflicts:
	js/download-original.js
	templates/post/fileinfo.html
 2014-08-08 22:18:06 +02:00
czaks 84c8e74ffa Revert "I thought I deleted that" 
This reverts commit c6e1afcf65.
 2014-08-08 22:09:28 +02:00
czaks 96f5770e2e leave the download-original js for compatibility 2014-08-08 21:56:15 +02:00
czaks fa198e207f enhance filters; make them work on multiimage 2014-08-08 21:35:00 +02:00
czaks 57e80951d9 sorta document the changes in config.php 2014-07-28 04:15:09 +02:00
czaks a01f8e9e11 actually allow for a log-only filter 2014-07-28 04:12:19 +02:00
czaks 50091e28a9 allow the previous not only for ban action, but also for reject action, or a nul one 2014-07-28 04:09:01 +02:00
czaks a940ee9abb Merge branch 'master' of github.com:vichan-devel/Tinyboard 2014-07-28 04:06:39 +02:00
Marcin Łabanowski 29e71fa3ee filters: add option to log a message body in ip notes 2014-07-28 04:05:47 +02:00
czaks 8d0f1bf4ad fix a bug in filename truncation 2014-07-08 09:56:31 +02:00
czaks f97d2dff85 fix previous commit 2014-07-08 09:44:30 +02:00
czaks 9526f5ed1c fix #72 2014-07-08 09:43:04 +02:00
czaks b26cd8b9b4 Merge 4.5 and branch for 4.9.91 2014-07-08 01:57:02 +02:00
czaks 3ef5e9c0c8 tag for vichan-4.5.2 2014-07-08 01:40:58 +02:00
czaks 8d3c3f7ef7 Merge 4.5 2014-07-06 03:58:00 +02:00
czaks 4a0c87c7e1 Revert "Update jQuery UI to 1.11.0, GeoIPv6 and IP library" 
This reverts commit dca7570b32.
 2014-07-06 03:50:16 +02:00
czaks 4881575b39 Revert "Oekaki's going to work now. Trust me" 
This reverts commit 7b339f7f56.
 2014-07-06 03:49:49 +02:00
czaks d38433a9c2 fix gzip static 2014-07-06 03:22:40 +02:00
czaks 9b943da60a Revert "Rework the GeoIP code, add country-based poster names" 
This reverts commit db3c7f4ee9.
 2014-07-06 02:13:08 +02:00
czaks a9b035d822 Revert "Second rework of the GeoIP code, now supporting cities!" 
This reverts commit 2488e77e86.
 2014-07-06 02:12:54 +02:00
czaks 6a3dbe5c98 Merge 4.5 
Conflicts:
	inc/display.php
	templates/post_reply.html
	templates/post_thread.html
 2014-07-06 01:24:16 +02:00
czaks 1853efa883 SECURITY: backport fix for #70 for 4.5. reported by Barrucadu 2014-07-06 01:20:42 +02:00
Marcin Łabanowski 95bb7b84b7 actually fix #70 2014-07-06 01:07:41 +02:00
Marcin Łabanowski fcf3863d47 Merge pull request #70 from Barrucadu/title-injection 
Fix unsanitised text vulnerability in post/fileinfo.html
 2014-07-05 23:01:37 +02:00
czaks 4eec65782e Merge 4.5 
Conflicts:
	install.php
 2014-06-21 21:27:01 +02:00
czaks f4fd816202 tag for 4.5.1 2014-06-21 21:14:51 +02:00
czaks a04dee562c update locales for 5.0 2014-06-21 21:04:29 +02:00
czaks 3895223922 Merge 4.5 
Conflicts:
	templates/post_thread.html
 2014-06-21 20:50:41 +02:00
czaks 99e51421c2 remove license exception for Tinyboard vanilla, since they moved to a different one 2014-06-21 20:49:13 +02:00
czaks 32c42e3596 update pl_PL translation 2014-06-21 20:38:16 +02:00
czaks 26884e8e11 Merge 4.5 
Conflicts:
	post.php
 2014-06-20 23:35:45 +02:00
czaks 73177fcffc Merge branch '4.5' of github.com:vichan-devel/Tinyboard into HEAD 
Conflicts:
	templates/themes/basic/index.html
 2014-06-20 23:27:34 +02:00
czaks 2c883fda0a fix ban appeals; thanks to sraczynski for reporting 2014-06-16 11:39:56 +02:00
czaks 8a189e2380 fix upgrade path a little bit with a new catalog 2014-06-16 11:29:18 +02:00
czaks a4dc0d03b7 Merge branch 'master' of github.com:vichan-devel/Tinyboard 2014-06-14 18:34:09 +02:00
czaks b12612ac57 fix sql error as reported by a Romanian anon 2014-06-14 18:33:55 +02:00
czaks 427a9938a7 Merge 4.5 2014-06-12 03:12:56 +02:00
czaks 030895d074 remove two extraneous fields from 4.5 to 5.0 migration 2014-06-11 03:40:00 +02:00
czaks 52e463a30a Merge branch 'master' of github.com:vichan-devel/Tinyboard 
Conflicts:
	inc/mod/pages.php
 2014-06-11 02:06:25 +02:00
czaks 503903ac0f Merge 4.5 2014-06-11 02:05:14 +02:00
czaks 23d6e82038 $_SERVER[HTTPS] isn`t being always set; fixes #65 2014-06-11 02:04:59 +02:00
czaks e27c923b79 Merge branch 'master' of github.com:vichan-devel/Tinyboard 2014-06-10 17:51:25 +02:00
czaks c2cbbe7e22 Merge 4.5 
Conflicts:
	js/expand-too-long.js
 2014-06-10 17:51:03 +02:00
czaks 2f55cd9897 fix expand-too-long on some occasions 2014-06-10 17:49:12 +02:00
czaks c04b419639 Merge branch 'master' of github.com:vichan-devel/Tinyboard 2014-05-28 15:37:36 +02:00
czaks 3ba152e0a1 revert mixitup update 2014-05-28 15:36:30 +02:00
czaks 02f1514c70 fix single file metadata display in multifile; fixes #611 2014-05-21 09:05:35 +02:00
czaks ea47e000f4 Merge branch 'master' of github.com:vichan-devel/Tinyboard 2014-05-16 10:47:16 +02:00
Marcin Łabanowski 0da65c3d7b Merge pull request #55 from itsCrafted/patch-1 
Make post.php compatable with PHP 5.3x
 2014-05-13 22:30:42 +02:00
czaks fe126cb4bf rewrite filename truncation code; ref #53 2014-05-11 14:10:53 +02:00
czaks 7d29cf9e37 Merge 4.5 2014-05-10 22:44:37 +02:00
czaks 18a2017b7a Merge ../pl 
Conflicts:
	install.php
 2014-05-10 22:06:22 +02:00
czaks 61ec084ee6 tag for vichan-4.5.0 2014-05-10 22:04:09 +02:00
czaks 4288898dfa Merge branch 'master' of github.com:vichan-devel/Tinyboard 2014-05-10 21:58:34 +02:00
czaks 19ce50c545 Merge ../pl 
Conflicts:
	post.php
 2014-05-10 21:58:23 +02:00
Marcin Łabanowski 7b57a4b911 Merge pull request #53 from 3edgy6u/master 
Truncate filenames properly
 2014-05-10 21:55:04 +02:00
Marcin Łabanowski a6b8a73be4 Merge pull request #52 from 3edgy6u/master 
fixed poster_ids
 2014-05-08 00:55:54 +02:00
czaks cd15458a32 Merge remote-tracking branch 'origin/4.5' 2014-05-06 21:53:38 +02:00
czaks f7278e5a61 user moderation support 2014-05-06 21:53:05 +02:00
Marcin Łabanowski 7f725713a1 Merge pull request #50 from Barrucadu/autoreload-cooldown 
Autoreload cooldown
 2014-05-05 23:39:28 +02:00
czaks 8f021a35a6 i knew that i broke it... 2014-05-05 18:07:13 +02:00
czaks 81c3f02d28 warn about moving to 5.0 branch 2014-05-05 17:53:31 +02:00
czaks 72c7e28a0e Merge branch 'master' into staging 2014-05-05 17:29:59 +02:00
czaks e3ac13289d Merge branch 'staging' of github.com:vichan-devel/Tinyboard into staging 2014-05-05 17:29:52 +02:00
czaks 855618b2a0 Merge branch 'master' of github.com:vichan-devel/Tinyboard 
Conflicts:
	templates/themes/catalog/catalog.html
	templates/themes/catalog/theme.php
 2014-05-05 17:29:34 +02:00
czaks ab52741a5f catalog.js: should be used only in catalog view 2014-05-05 17:23:49 +02:00
czaks 81b0612d56 fug, i replaced finnish locale with pt_BR? 2014-05-04 02:13:37 +02:00
czaks 73eb8c6b58 quick & dirty youtube thumbnails in catalog support 2014-05-04 01:20:12 +02:00
czaks bac23d22f8 forgot to compile lv_LV locale ;_; 2014-05-04 00:24:12 +02:00
czaks dafe0d5896 Merge branch 'master' of github.com:vichan-devel/Tinyboard into staging 2014-05-04 00:19:45 +02:00
czaks 45fdd71b63 fix it more 2014-05-04 00:05:55 +02:00