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
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
03b142b847
removed var_dump
2014-09-25 08:06:16 -03:00
undido
b24ec23cbb
inc/mod/pages.php only show your board in boardlist if you are ranked below admin
2014-09-25 07:57:51 -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
anonfagola
14148b1292
Made threadscroll.js a default additional JS
2014-09-24 16:54:49 -07:00
8chan
416a48838c
Add timer to auto reload js
2014-09-24 21:30:57 +00:00
TheHowl
eee2cf82d4
Make ayah optional
2014-09-24 22:35:59 +02:00
8chan
2afb2b4e7b
Require secrets.php
2014-09-24 20:19:58 +00:00
8chan
102559751a
Require secrets.php
2014-09-24 20:19:58 +00:00
8chan
e94ae94f6c
Add extra non-synced file for 8chan.co secrets (passwords etc)
2014-09-24 20:17:59 +00:00
8chan
4eb31555fc
Add update button to auto-reload.js
2014-09-24 20:14:02 +00:00
8chan
f0e58a02d2
Merge https://github.com/vichan-devel/vichan
...
Conflicts:
README.md
2014-09-24 19:42:45 +00: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
czaks
3b2f448102
restore compatibility with php < 5.5; fixes vichan-devel#86
2014-09-24 12:26:15 +02:00
8chan
c090ad7fff
We open source nao
2014-09-24 04:27:14 +00:00
8chan
fb405c9cf0
Reject repost option in ?/settings
2014-09-24 04:25:55 +00:00
czaks
ba49bc6c37
update locales
2014-09-24 03:48:46 +02:00
8chan
b682c5861a
Merge https://github.com/ctrlcctrlv/8chan
...
Conflicts:
README.md
banners.php
create.php
inc/instance-config.php
2014-09-24 00:07:56 +00:00
8chan
da9ee32c2b
add htmlpurifier library
2014-09-23 23:25:04 +00:00
8chan
1e479f5a2e
Fix #13
2014-09-23 23:22:41 +00:00
8chan
9acbfe4d98
Add AYAH library to repo
2014-09-23 19:46:51 +00:00
8chan
d5bce0bf04
Merge ../http
2014-09-23 15:32:19 +00:00
8chan
fa28b5b370
Merge ../http
2014-09-23 15:32:19 +00:00
8chan
a2a15c761c
Allow SWF, fix \rule breaking /b/ (temporarily)
2014-09-23 15:31:52 +00:00
8chan
9adee6016c
Allow SWF, fix \rule breaking /b/ (temporarily)
2014-09-23 15:31:52 +00:00
8chan
f8e55b3143
Merge ../http
...
Conflicts:
create.php
inc/instance-config.php
2014-09-23 15:30:03 +00:00
8chan
ff6831e51c
Merge ../http
...
Conflicts:
create.php
inc/instance-config.php
2014-09-23 15:30:03 +00: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
8chan
3675caadfc
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
a8be948f7d
Merge https://github.com/vichan-devel/vichan
...
Conflicts:
inc/bans.php
js/favorites.js
2014-09-21 18:04:10 +00:00
Fredrick Brennan
300ec2a295
Merge https://github.com/vichan-devel/vichan
...
Conflicts:
inc/bans.php
js/favorites.js
2014-09-21 18:04:10 +00:00
Fredrick Brennan
19d6db9a44
Config changes
2014-09-21 17:51:42 +00:00
Fredrick Brennan
6ea0f26ce4
Config changes
2014-09-21 17:51:42 +00:00
czaks
92183e8e39
add portuguese (portugal) translation by Chorizo
2014-09-21 08:37:16 +02:00
czaks
6b968ce50a
add portuguese (portugal) translation by Chorizo
2014-09-21 08:37:16 +02:00
czaks
a1f26e8fd1
update locales
2014-09-21 04:52:18 +02:00
czaks
476d24d401
update locales
2014-09-21 04:52:18 +02:00
Fredrick Brennan
7288f1dec7
Fix last commit
2014-09-20 16:49:32 +00:00
Fredrick Brennan
686338e576
Fix last commit
2014-09-20 16:49:32 +00: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
Fredrick Brennan
1c2a2a3cf6
Allow the user to decide whether or not he wants to display his country
2014-09-20 16:35:28 +00:00
Fredrick Brennan
9070b061ee
Bug fix: users were banned from /0/ if they had a ban anywhere else
...
Conflicts:
inc/bans.php
2014-09-20 15:39:47 +00:00
Fredrick Brennan
a3a7586b35
Bug fix: users were banned from /0/ if they had a ban anywhere else
...
Conflicts:
inc/bans.php
2014-09-20 15:39:47 +00:00
Fredrick Brennan
19f2505ae6
Merge https://github.com/vichan-devel/vichan
2014-09-20 15:29:05 +00:00
Fredrick Brennan
6f195a033c
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
Fredrick Brennan
9d67593af0
Allow the user to decide whether or not he wants to display his country
2014-09-20 15:21:50 +00:00
Fredrick Brennan
f67f839e0f
fuck splitting this one up, misc changes
2014-09-20 15:21:09 +00:00
Fredrick Brennan
b5ce7c683d
fuck splitting this one up, misc changes
2014-09-20 15:21:09 +00:00
Fredrick Brennan
e972548ae2
More dice limits
2014-09-20 15:20:22 +00:00
Fredrick Brennan
b8a3ef5b56
More dice limits
2014-09-20 15:20:22 +00:00
Fredrick Brennan
4e6bb9ad97
Bug fix: users were banned from /0/ if they had a ban anywhere else
2014-09-20 15:20:00 +00:00
Fredrick Brennan
d486fc4e44
Bug fix: users were banned from /0/ if they had a ban anywhere else
2014-09-20 15:20:00 +00:00
Marcin Łabanowski
4da5f4ec90
Merge pull request #79 from marlencrabapple/master
...
FFmpeg support for WebM uploads
2014-09-17 20:50:21 +02:00
Marcin Łabanowski
6e105bfa19
Merge pull request #79 from marlencrabapple/master
...
FFmpeg support for WebM uploads
2014-09-17 20:50:21 +02:00
Ian Bradley
306f4ef46b
Added escapeshellarg() for WebM thumbnail generation.
2014-09-15 16:57:06 -07:00
Ian Bradley
41c8628e19
Added escapeshellarg() for WebM thumbnail generation.
2014-09-15 16:57:06 -07:00
Ian Bradley
0a9de3deb5
FFmpeg support for WebMs. Fixes threads with large amounts of WebM's causing crashes for some users.
2014-09-15 16:34:36 -07:00
Ian Bradley
c91915f121
FFmpeg support for WebMs. Fixes threads with large amounts of WebM's causing crashes for some users.
2014-09-15 16:34:36 -07:00
Ian Bradley
c1ecef3772
Added support for BSD md5 incase md5sum isn't available.
2014-09-15 16:33:37 -07:00
Ian Bradley
8641a739a6
Added support for BSD md5 incase md5sum isn't available.
2014-09-15 16:33:37 -07:00
8chan
66e026b361
?/bans: fix pagination - can now see all bans on all boards if > $config[mod][banlist_page]
...
Conflicts:
inc/bans.php
2014-09-13 16:43:46 +00:00
8chan
d6e5a0f720
?/bans: fix pagination - can now see all bans on all boards if > $config[mod][banlist_page]
...
Conflicts:
inc/bans.php
2014-09-13 16:43:46 +00:00
8chan
adb1294016
Merge https://github.com/vichan-devel/vichan
2014-09-13 16:38:06 +00:00
8chan
7005163af3
Merge https://github.com/vichan-devel/vichan
2014-09-13 16:38:06 +00:00
8chan
c0e22f972f
?/bans: fix pagination - can now see all bans on all boards if > $config[mod][banlist_page]
2014-09-13 16:37:33 +00:00
8chan
4e94338ab2
?/bans: fix pagination - can now see all bans on all boards if > $config[mod][banlist_page]
2014-09-13 16:37:33 +00:00
8chan
84e4fa054f
New scripts
2014-09-13 16:36:40 +00:00
8chan
c8f512a270
New scripts
2014-09-13 16:36:40 +00: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
Juan Tamad
7c71c46af9
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
8chan
18ac30b7cc
Merge ../http
2014-08-30 20:07:36 +00:00
8chan
da5f35244f
Merge ../http
2014-08-30 20:07:36 +00:00
8chan
3c8367240a
Arbitrary maximum dice
2014-08-30 20:07:08 +00:00
8chan
41f2255e51
Arbitrary maximum dice
2014-08-30 20:07:08 +00:00
8chan
41be663ee9
Merge vichan-devel
2014-08-30 20:06:02 +00:00
8chan
69dc5500e8
Merge vichan-devel
2014-08-30 20:06:02 +00:00
Tomasz Konojacki
1b62fbea6f
added support for statcounter.com tracking code
2014-08-24 23:33:53 +02:00
Tomasz Konojacki
0c3a07adfd
added support for statcounter.com tracking code
2014-08-24 23:33:53 +02:00
Marcin Łabanowski
d78dcd6ed6
fix a bug reported by Dudeman on #v-d
2014-08-21 04:27:47 +02:00
Marcin Łabanowski
f83ca84298
fix a bug reported by Dudeman on #v-d
2014-08-21 04:27:47 +02:00
8chan
e28f233e3d
Close #51 : Prevent players from cheating the dice roller by using markup
2014-08-10 15:38:02 +00:00
8chan
954099bb64
Close #51 : Prevent players from cheating the dice roller by using markup
2014-08-10 15:38:02 +00:00
8chan
db6c0e634c
Close #51 : Prevent players from cheating the dice roller by using markup
2014-08-10 15:37:28 +00:00
8chan
26b1191558
Close #51 : Prevent players from cheating the dice roller by using markup
2014-08-10 15:37:28 +00:00
8chan
1ea3da1db6
Merge Barrucadu/diceroll into master
2014-08-10 15:35:11 +00:00
8chan
73228b950e
Merge Barrucadu/diceroll into master
2014-08-10 15:35:11 +00:00
8chan
06faa65fdd
Merge Barrucadu/diceroll into master
2014-08-10 14:51:45 +00:00
8chan
78aebd6833
Merge Barrucadu/diceroll into master
2014-08-10 14:51:45 +00:00
8chan
0ac2bea736
Pull 8chan
2014-08-10 14:43:16 +00:00
8chan
e59ee1c80e
Pull 8chan
2014-08-10 14:43:16 +00:00
8chan
0ac9aaaf25
Merge vichan-devel
2014-08-10 14:41:40 +00:00
8chan
edc8df469e
Merge vichan-devel
2014-08-10 14:41:40 +00:00
czaks
c3662d4a59
handle tinyboard flags with length=0
2014-08-09 05:12:36 +02:00
czaks
1fb9fffefb
handle tinyboard flags with length=0
2014-08-09 05:12:36 +02: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
czaks
e554ef7d47
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
80281a46cb
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
2e89786e62
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