Merge branch 'master' of github.com:vichan-devel/Tinyboard
This commit is contained in:
commit
a93f168c79
@ -1,5 +1,5 @@
|
|||||||
# License of vichan
|
# License of vichan
|
||||||
Copyright (c) 2012-2014 vichan-devel
|
Copyright (c) 2012-2015 vichan-devel
|
||||||
|
|
||||||
Permission is hereby granted, free of charge, to any person obtaining a copy
|
Permission is hereby granted, free of charge, to any person obtaining a copy
|
||||||
of this software and associated documentation files (the "Software"), to deal
|
of this software and associated documentation files (the "Software"), to deal
|
||||||
|
@ -287,6 +287,9 @@
|
|||||||
$config['recaptcha_public'] = '6LcXTcUSAAAAAKBxyFWIt2SO8jwx4W7wcSMRoN3f';
|
$config['recaptcha_public'] = '6LcXTcUSAAAAAKBxyFWIt2SO8jwx4W7wcSMRoN3f';
|
||||||
$config['recaptcha_private'] = '6LcXTcUSAAAAAOGVbVdhmEM1_SyRF4xTKe8jbzf_';
|
$config['recaptcha_private'] = '6LcXTcUSAAAAAOGVbVdhmEM1_SyRF4xTKe8jbzf_';
|
||||||
|
|
||||||
|
// Ability to lock a board for normal users and still allow mods to post. Could also be useful for making an archive board
|
||||||
|
$config['board_locked'] = false;
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* Custom filters detect certain posts and reject/ban accordingly. They are made up of a condition and an
|
* Custom filters detect certain posts and reject/ban accordingly. They are made up of a condition and an
|
||||||
* action (for when ALL conditions are met). As every single post has to be put through each filter,
|
* action (for when ALL conditions are met). As every single post has to be put through each filter,
|
||||||
|
Loading…
Reference in New Issue
Block a user