f874fbebe8
Merge pull request #880 from md-5/patch-3
...
Fix logo URL
2015-02-22 13:43:52 +00:00
6cb2d14ea3
Fix logo URL
2015-02-22 19:27:03 +11:00
c0abef2c00
Merge remote-tracking branch 'origin/1.6'
2015-02-19 09:37:47 +01:00
d7598a76dc
Merge pull request #878 from Mkaysi/sasl16
...
modules/sasl.cpp: update help for "set"
2015-02-19 09:29:36 +01:00
2082362b0b
modules/sasl.cpp: update help for "set"
...
This is the same as #793 , but for correct branch.
Closes #793
2015-02-19 10:08:45 +02:00
7345a6ee3a
Fix CIRCNetwork::FindChans() and FindQueries() to be case-insensitive
...
The playback module failed to clear a buffer, because it tried to
clear "NickServ" whereas ZNC had internally stored it has "nickserv".
2015-02-19 08:45:58 +01:00
5f9ad5cc87
SSLVerifyHost: Make some functions static
...
These functions shouldn't be visible outside of this file. This was caught by
-Werror=missing-declarations.
Signed-off-by: Uli Schlachter <psychon@znc.in >
2015-02-19 08:39:22 +01:00
fd34f84bfd
~CThreadPool(): Handle spurious wakeups
...
From pthread_cond_wait()'s man page:
When using condition variables there is always a boolean predicate involving
shared variables associated with each condition wait that is true if the
thread should proceed. Spurious wakeups from the pthread_cond_wait() or
pthread_cond_timedwait() functions may occur. Since the return from
pthread_cond_wait() or pthread_cond_timedwait() does not imply anything about
the value of this predicate, the predicate should be re-evaluated upon such
return.
Fix ~CThreadPool() to account for this possibility.
Signed-off-by: Uli Schlachter <psychon@znc.in >
2015-02-19 08:38:28 +01:00
ac3570f18a
fix savebuff timer initialization
...
closes #868
2015-02-19 08:34:01 +01:00
9366320693
Merge pull request #876 from Mkaysi/sasl-requireauth
...
sasl: fix help text for requireauth
2015-02-19 08:20:14 +01:00
848085db68
sasl: fix help text for requireauth
...
Closes #875
2015-02-19 08:30:41 +02:00
4d44bfe10f
Merge pull request #870 from jpnurmi/startswith
...
Use CString::StartsWith()
2015-02-18 11:23:45 +00:00
00b1a7eedf
Use CString::StartsWith()
...
Replace the use of deprecated CString::Equals(str,bool,int) by
CString::StartsWith(str,cs) which is more pleasant to read.
2015-02-18 00:42:25 +01:00
a8b9542925
Merge remote-tracking branch 'origin/1.6'
...
Conflicts:
configure.ac
include/znc/version.h
2015-02-17 00:23:42 +01:00
f54c3b9e2d
Remove --with-openssl from ./configure
...
1. The same functionality is achievable via
./configure LDFLAGS=-L/foo/lib CXXFLAGS=-I/foo/include PKG_CONFIG_PATH=/foo/lib/pkgconfig
2. Only openssl had this special flag, but not python, not zlib, etc.
3. It's confusing, lots of people try --with-openssl=/usr/bin/openssl
2015-02-17 00:23:29 +01:00
1f7fe5f576
Increase the version number to 1.6.1
2015-02-17 00:11:49 +01:00
2f058fcc80
Remove zncconfig.h in distclean
...
See https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=712254
Signed-off-by: Uli Schlachter <psychon@znc.in >
2015-02-16 23:52:27 +01:00
c5ab7337d2
fix sublists in changelog
2015-02-16 23:52:19 +01:00
2397f8842a
Bump the version to 1.7
2015-02-16 23:49:26 +01:00
f47e8465ef
Increase the version number to 1.6.0
2015-02-12 21:05:44 +00:00
4d17d6213d
Fix non-compilation with clang 3.1
2015-02-04 22:50:10 +00:00
ce3882e92f
Merge pull request #841 from jpnurmi/cycle
...
Fix #840 - channel hopping/cycling
2015-02-02 20:27:03 +00:00
7680421053
Fix #840 - channel hopping/cycling
...
A regression caused by aed1d61
2015-02-02 10:41:13 +01:00
d4a36aaa93
Fix crash in znc --version, caused by latest commits.
...
Fix #838
2015-02-01 15:36:31 +00:00
ff88f24494
Merge branch 'version'
2015-02-01 09:23:41 +00:00
cf6ec5646b
Add ZNC to CTCP VERSION reply even if client is connected.
...
Previously, it replied to CTCP VERSION, but only if no client is connected.
See https://github.com/znc/znc/issues/820#issuecomment-70506203
2015-01-31 10:01:27 +00:00
f9a4507669
Add a global setting whether to show ZNC version or not
...
Close #820
Close #821
2015-01-30 23:01:06 +00:00
cbbd18cc6b
Merge pull request #823 from Zarthus/pass-patch
...
Tell user to use PASS <username>/<network> instead of just the username.
2015-01-26 23:13:16 +00:00
046f5e273c
Clarify in webadmin that timestamp format is useless with server-time
2015-01-25 19:17:43 +00:00
f66acf9d7f
Don't hardcode some paths in make-tarball.sh
2015-01-25 19:17:43 +00:00
027dfde8e0
Merge pull request #824 from OGAWAHirofumi/threadpool-cleanup
...
Don't polling to wait the exit of threads in CThreadPool destructor
2015-01-25 13:07:11 +00:00
b8dcb5f706
Don't polling to wait the exit of threads in CThreadPool destructor
...
All values are protected by m_mutex. So we don't need the polling to
wait m_num_threads==0 with wakeups, instead simply use CConditionVariable.
2015-01-25 21:55:42 +09:00
26e466c677
More detailed instructions on how to connect to ZNC when not yet logged in.
...
The message now mentions you should configure your client to automatically log you in, and also lets you know how to connect to a specific network.
2015-01-25 10:25:13 +01:00
35b5525cc1
Tell user to use PASS <username>/<network> instead of just the username.
...
In versions prior to 1.0, ZNC did not allow multiple networks per user. The string telling users to connect has never been changed after ZNC 1.0, and this fixes just that.
2015-01-24 11:40:51 +01:00
7b1133de77
sample should be network module, not user module.
...
Network modules are easier to write
2015-01-18 21:26:42 +00:00
94f2b4dc97
Don't expose ZNC version in CTCP VERSION.
...
Thanks to Mikaela for finding this.
See #818
2015-01-18 08:15:34 +00:00
38353a67d7
Remove message which should be removed before release
2015-01-18 00:00:15 +00:00
01b76d76a8
Merge pull request #803 from jpnurmi/savebuff
...
savebuff: save & load query buffers - fixes #802
2015-01-16 21:29:20 +00:00
045f7752cb
savebuff: save & load query buffers - fixes #802
...
The old internal storage format was:
::__:SAVEBUFF:__::<buffer lines>
The new storage format for channels:
::__:CHANBUFF:__::<buffer name>
<buffer lines>
The new storage format for queries:
::__:QUERYBUFF:__::<buffer name>
<buffer lines>
See #802 for details why the storage format had to be changed. Reading
the old storage format is still supported so old saved buffers load as
appropriate.
2015-01-16 21:13:44 +01:00
230a39f079
Merge pull request #812 from ahf/fix-602
...
Q: Ignore JoinAfterCloaked unless UseCloakedHost is set
2015-01-11 17:16:04 +00:00
600f91f128
Fix implicit context of OnSendTo* hooks
...
Thanks for markus-j for reporting it
2015-01-11 17:08:00 +00:00
5ae5ff46db
Q: Ignore JoinAfterCloaked unless UseCloakedHost is set
...
This patch ignores the value of JoinAfterCloaked unless UseCloakedHost
is set. Without this patch, it's possible to enable JoinAfterCloaked,
but not have UseCloakedHost enabled, which means that no channel will
ever be joined automatically by ZNC.
Fixes : #602
2015-01-11 17:42:26 +01:00
5608e4f201
Oops, I'm not familiar with our CSS
2015-01-11 09:06:15 +00:00
00b38dc164
Enable editing trusted fingerprints in webadmin
2015-01-11 09:04:31 +00:00
7504cb205b
modpython: Enable default arguments feature of SWIG 3.0.4
...
Some corner cases are disabled for now, until SWIG fixes them.
See #809 for details.
2015-01-09 08:26:38 +00:00
8fe8c69a88
Merge pull request #791 from James-TR/namespace-refactor
...
Change namespace for <fcntl.h>
2015-01-08 08:40:45 +00:00
13f7574579
Change namespace for fcntl.h
...
* Fixes warnings under musl-libc.
* <fcntl.h> should be universal in the Unix world, it's more likely a system doesn't have <sys/fcntl.h> than if it doesn't have <fcntl.h> (and has <sys/fcntl.h>.)
2015-01-08 05:19:19 +00:00
05e3a85542
Travis: Enable OS X in addition to existing Ubuntu
2015-01-06 21:58:06 +00:00
cf0accbfc5
Update Csocket to dd3d780c251e07dc40731d4ca603dc0e121e4db2
...
Fix #652 (build on OS X)
2015-01-06 18:06:27 +00:00
6181858b02
Travis: --enable-charset
2015-01-05 22:42:02 +00:00
Kyle Fuller