1
0
mirror of https://github.com/vichan-devel/vichan.git synced 2024-11-30 18:24:29 +01:00
Commit Graph

556 Commits

Author SHA1 Message Date
Fredrick Brennan
19f2505ae6 Merge https://github.com/vichan-devel/vichan 2014-09-20 15:29:05 +00:00
Fredrick Brennan
696b551a31 Allow the user to decide whether or not he wants to display his country 2014-09-20 15:21:50 +00:00
Ian Bradley
c1ecef3772 Added support for BSD md5 incase md5sum isn't available. 2014-09-15 16:33:37 -07:00
Juan Tamad
53ada6a5ff added option for showing the mod in ban page.
also fixes issue where the Staff is not shown in ban appeals.
2014-09-01 06:30:33 +08:00
Tomasz Konojacki
1b62fbea6f added support for statcounter.com tracking code 2014-08-24 23:33:53 +02:00
8chan
1ea3da1db6 Merge Barrucadu/diceroll into master 2014-08-10 15:35:11 +00: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
Jano Slota
46c07d3566 Change styling of fileinfo, add iqdb search 2014-08-08 21:58:15 +02:00
Jano Slota
a87dc24169 Minor fixes for embed htmls 2014-08-08 21:57:58 +02:00
Jano Slota
3144e11cf9 Minor fixes for embed htmls 2014-08-08 21:57:11 +02:00
Jano Slota
d81a6c49e2 Use a different way to show the original filename
Conflicts:
	templates/post/fileinfo.html
2014-08-08 21:52:19 +02:00
czaks
57e80951d9 sorta document the changes in config.php 2014-07-28 04:15:09 +02:00
czaks
8d3c3f7ef7 Merge 4.5 2014-07-06 03:58:00 +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
Jano Slota
2488e77e86 Second rework of the GeoIP code, now supporting cities! 2014-07-06 01:30:38 +02:00
Jano Slota
db3c7f4ee9 Rework the GeoIP code, add country-based poster names 2014-07-06 01:29:12 +02:00
Jano Slota
4adf893c39 Random names for anonymous users - thanks to svnth 2014-07-06 01:27:38 +02:00
czaks
19ce50c545 Merge ../pl
Conflicts:
	post.php
2014-05-10 21:58:23 +02:00
Jano Slota
844d724b62 Optimized images 2014-05-10 21:51:00 +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
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
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
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
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
copypaste
c483e1258c multiimage posting 2014-04-27 15:48:47 +02:00
czaks
4a3dd0cfd6 config.php: i18n one more message 2014-04-21 02:41:01 +02:00
czaks
7e30f1d3cf add user_flag to valid inputs 2014-04-19 19:17:03 +02:00
kaf
b102fd5f4e Typo
Conflicts:
	inc/config.php
2014-04-19 18:49:12 +02:00
kaf
f83c87b623 Added: /pol/-like flags based on a953229de7
Conflicts:
	inc/config.php
	templates/post_form.html
2014-04-19 18:48:17 +02:00
czaks
bfc4df8276 Merge branch 'master' of github.com:vichan-devel/Tinyboard into br-integration 2014-04-19 00:24:52 +02:00
czaks
fb94bcca0e add a webm icon 2014-04-06 21:51:41 +02:00
czaks
6c0b745cf4 SECURITY: local path discovery fix 2014-03-31 10:23:34 +02:00
czaks
f0b2240b5f Merge branch 'master' of github.com:vichan-devel/Tinyboard into br-integration 2014-03-25 13:03:37 +01:00
sinuca
fb2b66e2dd Recent posts functionality
Conflicts:
	inc/config.php
	inc/mod/pages.php
	mod.php
2014-03-25 11:35:04 +01:00
czaks
b585fe912e enable 4chan api by default. it bears some extra CPU time with it, but giving API to the users by default is the way to go. 2014-03-09 01:51:39 +01:00
czaks
75cca1ffb2 fix previous commit 2014-02-24 15:29:26 +01:00
czaks
14c499f9d1 Condense flags into one file. Heads-up for people having custom flags, disable $config['country_flags_condensed'] !!! 2014-02-24 00:06:01 +01:00
czaks
ff9b684f7e remove old oekaki; see vichan-devel#20 2014-01-29 22:59:29 +01:00
czaks
858ebbe68f delegate youtube.js embed html code to config.php 2014-01-09 18:25:00 +01:00
czaks
8a2df689df config.php: clarify comment to mean quick-reply-old, as now it's named 2013-12-25 16:28:50 +01:00
czaks
f5657caf24 Merge branch 'master' of https://github.com/savetheinternet/Tinyboard into vichan-devel-4.5
Conflicts:
	inc/config.php
	install.php
	post.php
	stylesheets/style.css
2013-11-11 21:54:35 +01:00