Cool_Tools/vichan
1
0
Fork 0
mirror of https://github.com/vichan-devel/vichan.git synced 2024-11-29 17:54:29 +01:00
Code Releases Wiki Activity
6,579 Commits 50 Branches 28 Tags 70 MiB
345e5aa3a4
Commit Graph

573 Commits

Author SHA1 Message Date
8chan
6d19be38e3 Merge https://github.com/ctrlcctrlv/8chan 
Conflicts:
	inc/instance-config.php
 2014-10-05 17:09:50 +00:00
8chan
7bfbd10d69 Re-enable this filter 2014-10-05 17:06:57 +00:00
czaks
8b698e36e7 Merge https://github.com/vichan-devel/vichan 
Conflicts:
	inc/mod/pages.php
	js/auto-reload.js
	js/id_colors.js
	js/id_highlighter.js
	stylesheets/style.css
	templates/index.html
 2014-10-05 18:12:19 +02:00
Marcin Łabanowski
97a25dad03 Merge pull request #102 from cable6-dev/bugfix-genwebmerror 
[bugfix]$config['error']['genwebmerror'] wasn't set in config.php
 2014-10-05 17:56:46 +02:00
kaf
3c2529e157 [bugfix]$config['error']['genwebmerror'] wasn't set in config.php 2014-10-05 15:35:52 +00:00
kaf
296e4fd5fa Added an option to hide sages 2014-10-05 15:29:37 +00:00
Jayden Callahan
b4fd7c8e2c A quick update to config.php 2014-09-27 03:03:54 +09:30
Fredrick Brennan
5cbdbd312a Merge pull request #72 from peerau/master 
Changes to allow media-file clustering and CDN possibilities.
 2014-09-25 17:34:02 -04:00
Jayden Callahan
1f2cd47562 Config: actually add config.php 2014-09-26 06:48:24 +09:30
8chan
a6e9c13e51 We dont need two of these. 2014-09-25 20:31:52 +00:00
8chan
e1ce037c8c Merge branch 'master' of https://github.com/TheHowl/8chan into TheHowl-master 
Conflicts:
	create.php
 2014-09-25 20:28:46 +00:00
Morgan Bazalgette (Howl)
c72e1fcb1d Merge pull request #1 from ctrlcctrlv/master 
fucking git how do i merge to my current repo without making it notice to all the people that committed that
 2014-09-25 15:10:20 +02:00
undido
37ac3fbe9e Added recaptcha support to create.php 2014-09-25 08:18:27 -03:00
undido
ff68278111 renamed playgame config field to ayah_enabled 2014-09-25 07:08:55 -03:00
undido
9c0436269f disable ayah 'game' on create.php by default added option to turn it on in /inc/config.php with explaination on where to put private keys at 2014-09-25 06:58:44 -03:00
TheHowl
eee2cf82d4 Make ayah optional 2014-09-24 22:35:59 +02:00
fourfivesix
795b2646ea Uncommenting catalog_link, it is now required 
`$config['catalog_link']` is now required because `templates/main.js` uses it.
 2014-09-24 14:36:03 -03:00
8chan
0764a8ead8 Apologies for this huge shitty commit. Git got corrupted. Contains a merge, change to katex, stylesheets, lots of shit really. ;_; 2014-09-22 18:29:06 -07:00
Fredrick Brennan
23c73ca839 Allow the user to decide whether or not he wants to display his country 2014-09-20 16:35:28 +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