admin/quick-n-dirty
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
3,155 Commits 1 Branch 0 Tags
18f158e2d57cb91f0675654975536b446afee64b
Commit Graph
100 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
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
czaks 8d4104feb0 restore php5.3 compatibility. thx for Kihokki for reporting that 2014-05-03 23:58:24 +02:00
czaks 211c1acec9 actually fix this bug 2014-05-02 19:32:18 +02:00
czaks 9416587d40 fix a bug with multiple images; thanks to saiko of tahta.ch for reporting it 2014-05-02 18:58:21 +02:00
czaks 0a53fdb3a2 remove quick-reply harder 2014-04-30 22:46:20 +02:00
czaks 4e21e3dbb7 Merge master branch into staging 
Conflicts:
	templates/themes/ukko/theme.php
 2014-04-30 18:28:46 +02:00
czaks 3545ba1b47 ukko: this return thingy wasn`t needed 2014-04-30 18:28:14 +02:00
czaks 318d75ac27 ukko: mod support for ukko; fixes #23 2014-04-30 18:20:30 +02:00
czaks 776bbeb73e ukko: mod support for ukko; fixes #23 2014-04-30 18:18:55 +02:00
czaks 2adf7d99db integrate favelog into catalog theme; needs more work, code cleanup etc. 2014-04-30 00:14:25 +02:00
czaks bb5446a93d Merge remote-tracking branch 'origin/br-integration' into staging 2014-04-29 21:35:50 +02:00
czaks c1aaf78cbb forgot one place to remove quick-reply-old 2014-04-29 21:35:45 +02:00
czaks a2d62ce96d fix webm for multiimage 2014-04-29 21:18:37 +02:00
czaks 46802d3f1b fix post event 2014-04-29 21:18:17 +02:00
czaks d57dcc5e6e fix remote upload 2014-04-29 20:50:28 +02:00
czaks a53f52696e remove post-hider symlink 2014-04-29 20:15:57 +02:00
czaks 18092de0c4 Merge ../pl into staging 2014-04-29 19:53:29 +02:00
czaks 15a65caf9d update wpaint; fix wpaint.js 2014-04-29 19:45:30 +02:00
czaks b7112050a1 Merge branch 'master' of github.com:vichan-devel/Tinyboard into staging 2014-04-29 18:59:14 +02:00
czaks 4287822229 limit the cli debug uptput 2014-04-29 18:48:57 +02:00
czaks 18e9c32a0e limit the cli debug uptput 2014-04-29 18:48:21 +02:00
czaks b94e39148b remove quick-reply-old. it probably doesn't work now, it certainly isn't 
maintained. this is an old cruft and if needed, it needs rewriting.
 2014-04-29 18:37:29 +02:00
czaks d208789fa7 remove attentionbar. its code is shit and it doesn't belong here tbh. 2014-04-29 18:33:03 +02:00
czaks 684e886f14 Merge remote-tracking branch 'origin/master' into staging 2014-04-27 16:26:52 +02:00
czaks 932c451f9e display backtrace when error on rebuilding from CLI 2014-04-27 16:26:08 +02:00
czaks 276a742bce Revert "change thumb to file to overcome a nasty bug in upgrading" 
This reverts commit b0faa1a7e4.
 2014-04-27 16:19:41 +02:00
czaks a236a17308 multi_image.js -> multi-image.js 2014-04-27 16:13:13 +02:00
czaks b0faa1a7e4 change thumb to file to overcome a nasty bug in upgrading 2014-04-27 16:05:38 +02:00
czaks 28b9584a7b display backtrace when error on rebuilding from CLI 2014-04-27 16:01:41 +02:00
czaks 6685333bd3 don‘t abort upgrade if REBUILD isn‘t supported 2014-04-27 15:57:51 +02:00
czaks 2b2fa390c5 Merge branch 'master' of https://github.com/savetheinternet/Tinyboard 
Conflicts:
	js/expand.js
 2014-04-22 08:57:39 +02:00
czaks 31185ab4c9 update locales from transifex 2014-04-22 08:49:40 +02:00
czaks 30eac1703a add donation info to readme.md 2014-04-21 17:15:06 +02:00
czaks a9c35844c7 fix themes resetting the board 2014-04-21 15:38:18 +02:00
czaks 4a3dd0cfd6 config.php: i18n one more message 2014-04-21 02:41:01 +02:00
czaks 6379e024a6 compact-boardlist.js: allow direct board links 2014-04-21 01:19:34 +02:00
czaks 366a72a813 update hu_HU locale 2014-04-21 00:52:37 +02:00
czaks 0ec6355358 fix recentposts theme building null query, throw error instead 2014-04-20 23:33:52 +02:00
czaks d25db31860 Merge branch 'master' of github.com:vichan-devel/Tinyboard 2014-04-20 23:16:24 +02:00