1
0
mirror of https://github.com/vichan-devel/vichan.git synced 2024-11-25 07:50:23 +01:00
Commit Graph

3175 Commits

Author SHA1 Message Date
Jano Slota
ecbf1ff24c Fixed image identification 2014-05-16 10:47:10 +02:00
Jano Slota
c67f4ba897 Updated Font Awesome to 4.1.0 2014-05-16 10:46:53 +02:00
8chan
bc9309ba2a Merge ../test 2014-05-14 17:54:11 +00:00
8chan
c9ec4a0ada Fix catalog if no files 2014-05-14 17:53:59 +00:00
8chan
a19b0ac160 Merge https://github.com/vichan-devel/vichan 2014-05-14 17:53:36 +00:00
Fredrick Brennan
9b3f8421fc Fix displaying bans 2014-05-14 13:51:49 -04:00
8chan
c26e339a77 SWITCH TO 5.0; MERGE VICHAN 2014-05-14 16:09:04 +00: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
Reid 'Crafted'
78ffd76fcf Make post.php compatable with PHP 5.3x
Compatible with earlier versions of PHP. This should work on 5.4 too, but I haven't tested it.
2014-05-13 21:23:06 +01:00
8chan
2a812dd8fc Fix failed merge 2014-05-12 19:45:42 +00: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
kaf
c878b308bf update fr l10n 2014-05-10 22:44:22 +02:00
Aš Esu
6fbe26c9e1 update lt locale 2014-05-10 22:43:14 +02:00
diggydoc
8233cdbad2 update lv l10n 2014-05-10 22:42:20 +02:00
Alrahambra
1102e6d47c update fi l10n 2014-05-10 22:40:47 +02:00
neniu
d7a20417bd update eo l10n 2014-05-10 22:39:56 +02:00
Assada
8103a0ba8d update ru l10n 2014-05-10 22:39:21 +02:00
cicus
65a87ed9af update hu l10n 2014-05-10 22:38:43 +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
Jano Slota
844d724b62 Optimized images 2014-05-10 21:51:00 +02:00
Jano Slota
c2c7859a9e Fixed a little exiftool bug
Conflicts:
	post.php
2014-05-10 21:50:01 +02:00
Jason Lam
ff51706bfd add new truncate_filename filter 2014-05-09 20:42:57 -04:00
Jason Lam
eca5c383e1 added truncate_filename function 2014-05-09 20:42:05 -04:00
Jason Lam
9bd0572b63 use new truncate_filename function 2014-05-09 20:37:31 -04:00
Jason Lam
bf7304622a Update poster_id.html
previous code did not work
2014-05-08 00:58:42 +02:00
Marcin Łabanowski
a6b8a73be4 Merge pull request #52 from 3edgy6u/master
fixed poster_ids
2014-05-08 00:55:54 +02:00
Jason Lam
9dab9179f9 Update poster_id.html
previous code did not work
2014-05-07 18:37:48 -04:00
Jano Slota
c25b8f01c5 Updated minify, jQuery, MixItUp and Tooltipster 2014-05-07 11:17:32 +02:00
Jano Slota
593560956c Added configurabe image identification 2014-05-07 11:14:30 +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
Fredrick Brennan
d31a353962 Allow post deletion switch 2014-05-05 18:03:51 -04:00
Marcin Łabanowski
7f725713a1 Merge pull request #50 from Barrucadu/autoreload-cooldown
Autoreload cooldown
2014-05-05 23:39:28 +02:00
Michael Walker
abaf80fd8a Reset the delay to the minimum upon focussing the window (configurable) 2014-05-05 20:54:40 +01:00
Michael Walker
54fdd54e89 Make the delays configurable in settings.js 2014-05-05 20:51:51 +01:00
Michael Walker
97cfec836b Add a maximum reload delay 2014-05-05 19:33:57 +01:00
Michael Walker
91a3016d27 Increase the poll_interval_delay when there are no posts 2014-05-05 19:33:57 +01:00
Michael Walker
0e18636fe6 Move the magic numbers out to variables 2014-05-05 19:33:57 +01: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
8chan
0ffbe4a034 Merge ../http 2014-05-05 15:05:41 +00:00