1
0
mirror of https://github.com/vichan-devel/vichan.git synced 2024-12-01 18:47:20 +01:00
Commit Graph

3081 Commits

Author SHA1 Message Date
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
Marcin Łabanowski
d01d892896 Merge pull request #100 from cable6-dev/feature-hide-sage
Added an option to hide sages
2014-10-05 17:53:32 +02:00
Marcin Łabanowski
42868c672a Merge pull request #103 from cable6-dev/bug-fix-check_spoiler_size
Check spoiler_image size before ussuming it is 128×128px
2014-10-05 17:53:08 +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
kaf
fe60590d19 Check spoiler_image size before ussuming it is 128×128px 2014-10-05 15:26:28 +00:00
kaf
9cee5f6c61 [bugfix]ban appeals (was also present in tinyboard) 2014-10-05 12:53:02 +00:00
riking
edf98dbee3 Add example secrets.php file 2014-10-04 13:48:52 -07:00
riking
5d89342b4f Make dnsbls.php optional, secrets.php mandatory 2014-10-04 13:48:11 -07:00
Bui
ba7cc64bbb fix languages 2014-09-29 07:30:45 +09:00
8chan
befe393778 Rewrite color IDs script so it actually works 2014-09-27 21:23:51 +00:00
8chan
b6bfe97c67 @anonfagola seriously needs to remember his fucking semicolons 2014-09-27 20:08:18 +00:00
8chan
4c3f48c021 Merge /root/8chan 2014-09-27 20:06:27 +00:00
8chan
3747a3396b revert 2014-09-27 20:05:48 +00:00
8chan
993df563db undo no cache test 2014-09-27 20:05:33 +00:00
anonfagola
4c720120e4 Added id_highlighter.js to additional_javscript 2014-09-27 09:49:17 -07:00
czaks
e748a286b3 Merge branch 'master' of https://github.com/ctrlcctrlv/8chan
Conflicts:
	inc/api.php
	js/multi-image.js
2014-09-27 11:34:05 +02:00
czaks
529951f75b Merge https://github.com/vichan-devel/vichan 2014-09-27 11:31:52 +02:00
czaks
ef53af04ec fix a recently added md5 api field 2014-09-27 11:31:30 +02:00
Fredrick Brennan
6afc91d472 Merge pull request #94 from peerau/patch-1
A quick update to config.php
2014-09-27 01:31:33 -04:00
8chan
47a92791ed Merge branch 'master' of https://github.com/bui/8chan into bui-master
Conflicts:
	boards.php
2014-09-27 04:58:41 +00:00
8chan
24caf95f20 Fix mod.php catalog 404 bug 2014-09-27 00:52:21 +00:00
8chan
695a8a3aaf Update instance config 2014-09-26 23:55:19 +00:00
Jayden Callahan
b4fd7c8e2c A quick update to config.php 2014-09-27 03:03:54 +09:30
hatstand0
d27cddaacc Add file hash to API
The API currently lacks the Base64 encoded file hash 4chan's API provides, which assists in file de-duplication by archive software.
2014-09-26 13:28:04 +02:00
hatstand0
7ea5b129e6 Fix thumbnail width/height in API
The API currently has the thumbnail widths and heights switched around
2014-09-26 13:27:49 +02:00
8chan
9dc91c1bf4 fuck you php 2014-09-26 03:44:34 +00:00
Bui
f4a9c5f551 only use 8chan locales 2014-09-26 10:38:23 +09:00
Bui
da370c53c0 wrong function name 2014-09-26 10:17:47 +09:00
Bui
ae183c1c42 use country names in boards.html 2014-09-26 10:15:17 +09:00
anonfagola
466f2b12ee Fix syntax error 2014-09-25 17:03:50 -07:00
8chan
19e864c15c I don't know what I did. 2014-09-25 22:53:56 +00:00
8chan
179df591af mobile style in config 2014-09-25 21:35:17 +00:00
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
cb5fed2bdf Config: deletion of boards covers img_root now 2014-09-26 07:01:11 +09:30
Jayden Callahan
1f2cd47562 Config: actually add config.php 2014-09-26 06:48:24 +09:30
Jayden Callahan
fbdb72994a Config: add a thing for clustered installations 2014-09-26 06:46:06 +09:30
8chan
4bb8eb49e8 Merge /home/service/www/http
Conflicts:
	inc/instance-config.php
	js/auto-reload.js
2014-09-25 20:55:05 +00:00
8chan
48ca125eaf include instead of require 2014-09-25 20:49:46 +00:00
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
8chan
c8fc323ea6 AYAH by default. 2014-09-25 20:14:00 +00:00
8chan
15f49b7017 Merge branch 'master' of https://github.com/undido/8chan into undido-master
Conflicts:
	install.sql
	random.php
2014-09-25 20:10:12 +00:00
Fredrick Brennan
0073b7c855 Merge pull request #69 from anonfagola/patch-8
Update instance-config.php
2014-09-25 14:34:51 -04:00
Ki11Deer
014f0eb12a Update instance-config.php to fix Twitter alt text
I am new here don't rape my face.
2014-09-25 14:32:03 -04:00
anonfagola
77b2caa284 Update instance-config.php
Fix https://github.com/ctrlcctrlv/8chan/issues/62
2014-09-25 10:46:33 -07:00
Fredrick Brennan
f11da66e3d Merge pull request #65 from hatstand0/patch-2
Add file md5 to API
2014-09-25 12:37:17 -04:00
Fredrick Brennan
ad17f3e95b Merge pull request #51 from anonfagola/patch-6
Made threadscroll.js a default additional JS
2014-09-25 12:36:18 -04:00
hatstand0
e26ce2c610 Add file hash to API
The API currently lacks the Base64 encoded file hash 4chan's API provides, which assists in file de-duplication by archive software.
2014-09-26 00:09:14 +10:00