1
0
mirror of https://github.com/vichan-devel/vichan.git synced 2024-11-29 09:44:28 +01:00
Commit Graph

3180 Commits

Author SHA1 Message Date
czaks
3a552e5b76 hopefully fix locales 2014-10-09 04:09:30 +02:00
8chan
4bd6ebd7aa Merge https://github.com/ctrlcctrlv/8chan 2014-10-08 19:00:13 -07:00
czaks
d3a52f6aed Merge vichan 2014-10-09 03:57:38 +02:00
czaks
dfd05e88f9 possible fix of themes` interactions 2014-10-09 03:57:18 +02:00
8chan
162d9e8210 Merge ../http
Conflicts:
	templates/mod/settings.html
2014-10-08 18:21:38 -07:00
8chan
f4b93f8b1c Enable infinite scroll by default 2014-10-08 18:20:47 -07:00
czaks
3a48cbc790 8chan: allow users to opt out of public ban system 2014-10-09 03:10:47 +02:00
czaks
217f25c51d fix incorrectly applied permissions 2014-10-09 02:08:15 +02:00
czaks
99374eac32 8chan new banlist customization 2014-10-09 02:04:31 +02:00
czaks
ef3bb46876 bans.php: surpress error 2014-10-09 02:00:31 +02:00
czaks
b1c76ba120 fix a bad merge 2014-10-09 01:14:14 +02:00
czaks
e678c178ac display capcode, if you can`t show username 2014-10-08 23:42:24 +02:00
czaks
643de18d64 Merge with a private vichan branch
Conflicts:
	inc/bans.php
	inc/mod/pages.php
2014-10-08 23:32:01 +02:00
czaks
9b3fa77719 new banlist implementation; also includes a public banlist 2014-10-08 23:23:59 +02:00
8chan
3928a3212a Merge branch 'master' of https://github.com/ctrlcctrlv/8chan 2014-10-08 20:11:36 +00:00
8chan
bf644d1a22 This threadscroll script is glitchy as fuck 2014-10-08 11:35:56 -07:00
8chan
d58adad48d SECURITY: Move indexed option to table...fixes unindexed boards appearing in search/random 2014-10-07 20:54:00 -07:00
Marcin Łabanowski
6a6250eb77 Merge pull request #155 from hugofragata/master
Added download-all feature
2014-10-08 05:53:33 +02:00
8chan
ba88035109 Edited at feature...add edited_at DATETIME NULL to all tables to use it. 2014-10-07 17:35:50 -07:00
8chan
69ad4f26db config update 2014-10-07 17:33:32 -07:00
Fredrick Brennan
52a662a395 Merge pull request #160 from wopot/patch-2
lineup 4 if´s with || (OR)
2014-10-07 11:24:56 -04:00
8chan
3da946268a SECURITY: Poster IDs could reveal IPs across boards
Imagine the following scenario:

Alice has permission to view IPs on board A, and Bob has permissions to view IPs on board B.

If the post number was to match, and the same IP made both posts, A and B could trade user IPs which they wouldn't normally have permission to do so. This weird bug has already creeped up on 8chan.co and is now patched.
2014-10-07 08:16:21 -07:00
wopot
9c47ebed03 lineup 4 if´s with || (OR) 2014-10-07 16:33:27 +02:00
hugofragata
acf4c3bb8b Modified inc/instance-config.php
Modified inc/instance-config.php to include js/download-all.js and
js/jszip.min.js
2014-10-07 15:00:40 +01:00
hugofragata
7239350e69 Revert "Added download-all feature"
This reverts commit 12a8f1a672.
2014-10-07 14:46:50 +01:00
8chan
c4dc3f4d47 Fix spoiler image not working 2014-10-07 04:33:57 +02:00
8chan
db55a3040f Make inline.js work in mod panel 2014-10-06 18:36:19 -07:00
8chan
ed94a1671d Merge https://github.com/ctrlcctrlv/8chan
Conflicts:
	post.php
2014-10-06 18:12:50 -07:00
8chan
47e81b7e9b Fix spoiler image not working 2014-10-06 18:02:50 -07:00
8chan
345e5aa3a4 Featured boards now based on uniques 2014-10-06 18:01:01 -07:00
wopot
c7351dff09 4 times "elseif" is not the way
and precalc. value sometimes help if well commentent
2014-10-07 00:16:02 +02:00
Marcin Łabanowski
9f3dba7372 Merge pull request #105 from anonfagola/patch-17
Update instance-config.php
2014-10-07 00:11:52 +02:00
hugofragata
12a8f1a672 Added download-all feature
The button to download all the files in a thread only appears when the
page is a thread, such as treeview. I added the download-all button next
to the treeview one. I modified stylesheets/v8ch.css to include the id
#download-all. I modified inc/instance-config.php to include the
download-all.js and jszip.min.js. I added the files js/jszip.min.js
which is a library to work with zip files in JS and I added
js/download-all.js which goes through all files, adds them to a zip and
then gives it to the user.
2014-10-06 16:50:20 +01:00
wopot
ba3f0f25fe 4 times "elseif" is not the way
and precalc. value sometimes help if well commentent
2014-10-06 17:50:05 +02:00
Bui
aba8d27ace wasn't aware of DNS function 2014-10-05 23:20:06 +02:00
Bui
1e95e58811 don't break if dns_system is true 2014-10-05 23:20:06 +02:00
Bui
8b9932218f add forward-confirmed reverse DNS 2014-10-05 23:20:06 +02:00
Bui
3f4381cf40 wasn't aware of DNS function 2014-10-06 04:30:32 +09:00
Bui
ca7955ecfc don't break if dns_system is true 2014-10-06 04:08:10 +09:00
Bui
98b172980f add forward-confirmed reverse DNS 2014-10-06 03:37:13 +09:00
8chan
6d19be38e3 Merge https://github.com/ctrlcctrlv/8chan
Conflicts:
	inc/instance-config.php
2014-10-05 17:09:50 +00:00
8chan
4414ef80b4 DNSBLs bypass stuff, fix Opera bug. 2014-10-05 17:07:59 +00:00
8chan
7bfbd10d69 Re-enable this filter 2014-10-05 17:06:57 +00:00
czaks
e0e3de2773 Merge https://github.com/vichan-devel/vichan 2014-10-05 18:38:45 +02:00
czaks
8518164352 sync locales with transifex 2014-10-05 18:38:25 +02:00
czaks
4a4c985235 missed one line 2014-10-05 18:16:18 +02: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
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
8chan
99e95bb807 Merge ../http
Conflicts:
	templates/themes/catalog/catalog.html
2014-09-30 23:10:27 +00:00
8chan
7ca9b7edaf Max links = 40 2014-09-30 23:06:48 +00: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
anonfagola
b621699a22 Update instance-config.php
@ctrlcctrlv said to me over IRC he removed the threadscroll script because on some browsers, it would refresh the page when scrolling. This has been fixed in #98, so it should be back in as a default addditional JS.

and i remembered the semicolon this time
2014-09-27 13:19:39 -07: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
hatstand0
ebd85c1fd6 Fix thumbnail width/height in API
The API currently has the thumbnail widths and heights switched around
2014-09-25 23:42:41 +10:00