Commit Graph

3800 Commits

Author SHA1 Message Date
Alexey Sokolov 4596d97502 Remove "-" between "ZNC" and version number.
ZNC 1.6.0 looks better than ZNC - 1.6.0, IMHO
2015-04-06 20:41:57 +01:00
Alexey Sokolov 094f74640a Fix CUser::GetUserClients() and CUser::GetAllClients() in modpython.
Thanks to Lymia for reporting it.

(cherry picked from commit cd832aaf69)
2015-04-04 18:34:03 +01:00
J-P Nurmi c3467f1647 Merge pull request #937 from elyscape/fix/1.6.x/write_chan_config_removal
Write config file when channel is removed (#932)
2015-04-01 07:52:38 +02:00
Eli Young 53254173b1 Write config file when channel is removed (#932) 2015-03-31 17:57:30 -07:00
Alexey Sokolov 682e364832 Travis: disable parallelism.
ASan crashes so often, probably because of lack of RAM :(
Slow build is more useful than what we have now.
2015-03-06 20:56:10 +00:00
Alexey Sokolov 343035e172 Explain in webadmin why encoding settings are disabled. 2015-03-05 23:13:58 +00:00
Alexey Sokolov 2d041e475f Merge pull request #901 from jpnurmi/version
Display development version as "1.6.x" - ref #748
2015-03-01 13:00:11 -08:00
Alexey Sokolov 1832cdbd78 Merge pull request #905 from jpnurmi/chansaver
Fix chansaver loading
2015-02-28 20:10:31 -08:00
J-P Nurmi 1180467a87 Fix chansaver loading
CModules::LoadModule() sets the module type _after_ construction.
The constructor cannot therefore do actions based on the module
type. Move loading to OnLoad().
2015-02-28 21:15:46 +01:00
J-P Nurmi bd044cf6fc Display development version as "1.6.x" - ref #748 2015-02-28 09:36:32 +01:00
Alexey Sokolov de50d75c01 Merge pull request #890 from jpnurmi/unused
Fix compilation warning when HAVE_LIBSSL is not defined
2015-02-25 21:39:01 -08:00
J-P Nurmi 4935ef4d26 Fix compilation warning when HAVE_LIBSSL is not defined
Building core object Socket...
    src/Socket.cpp:30:16: warning: unused function 'ZNC_DefaultCipher' [-Wunused-function]
    static CString ZNC_DefaultCipher() {
                   ^
    1 warning generated.
2015-02-25 09:36:56 +01:00
J-P Nurmi 696b07947a CString: fix 'comparision' typos in the docs 2015-02-23 09:36:26 +01:00
Alexey Sokolov d9cf3f436f Merge branch '1.6' into 1.6.x 2015-02-23 06:02:55 +00:00
Alexey Sokolov 72678cc60c Merge pull request #874 from jpnurmi/webadmin
Fix #872: webadmin checkboxes
2015-02-22 21:36:06 -08:00
Uli Schlachter 11f1efaaac configure: Fix C++11 test with -Werror=missing-declarations
This fixes the following error (copied from config.log):

  conftest.cpp:49:14: error: no previous declaration for 'void
  test_template_alias_sfinae::test()' [-Werror=missing-declarations]

Signed-off-by: Uli Schlachter <psychon@znc.in>
(cherry picked from commit 2d1336dcf3)
2015-02-23 05:33:25 +00:00
J-P Nurmi d7598a76dc Merge pull request #878 from Mkaysi/sasl16
modules/sasl.cpp: update help for "set"
2015-02-19 09:29:36 +01:00
Mikaela Suomalainen 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
J-P Nurmi 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
Uli Schlachter 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
Uli Schlachter 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
Thomas Kriechbaumer ac3570f18a fix savebuff timer initialization
closes #868
2015-02-19 08:34:01 +01:00
J-P Nurmi 9366320693 Merge pull request #876 from Mkaysi/sasl-requireauth
sasl: fix help text for requireauth
2015-02-19 08:20:14 +01:00
Mikaela Suomalainen 848085db68 sasl: fix help text for requireauth
Closes #875
2015-02-19 08:30:41 +02:00
J-P Nurmi 44705b7f47 Fix #872: webadmin checkboxes
Don't claim all networks/users have loaded a module when there are none
2015-02-18 11:29:28 +01:00
J-P Nurmi 1f7fe5f576 Increase the version number to 1.6.1 2015-02-17 00:11:49 +01:00
Uli Schlachter 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
Thomas Kriechbaumer c5ab7337d2 fix sublists in changelog 2015-02-16 23:52:19 +01:00
Alexey Sokolov f47e8465ef Increase the version number to 1.6.0 znc-1.6.0 2015-02-12 21:05:44 +00:00
Alexey Sokolov 4d17d6213d Fix non-compilation with clang 3.1 2015-02-04 22:50:10 +00:00
Alexey Sokolov ce3882e92f Merge pull request #841 from jpnurmi/cycle
Fix #840 - channel hopping/cycling
2015-02-02 20:27:03 +00:00
J-P Nurmi 7680421053 Fix #840 - channel hopping/cycling
A regression caused by aed1d61.
2015-02-02 10:41:13 +01:00
Alexey Sokolov d4a36aaa93 Fix crash in znc --version, caused by latest commits.
Fix #838
2015-02-01 15:36:31 +00:00
Alexey Sokolov ff88f24494 Merge branch 'version' 2015-02-01 09:23:41 +00:00
Alexey Sokolov 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
Alexey Sokolov f9a4507669 Add a global setting whether to show ZNC version or not
Close #820
Close #821
2015-01-30 23:01:06 +00:00
Alexey Sokolov 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
Alexey Sokolov 046f5e273c Clarify in webadmin that timestamp format is useless with server-time 2015-01-25 19:17:43 +00:00
Alexey Sokolov f66acf9d7f Don't hardcode some paths in make-tarball.sh 2015-01-25 19:17:43 +00:00
Alexey Sokolov 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
OGAWA Hirofumi 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
Jos 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
Jos 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
Alexey Sokolov 7b1133de77 sample should be network module, not user module.
Network modules are easier to write
2015-01-18 21:26:42 +00:00
Alexey Sokolov 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
Alexey Sokolov 38353a67d7 Remove message which should be removed before release 2015-01-18 00:00:15 +00:00
Alexey Sokolov 01b76d76a8 Merge pull request #803 from jpnurmi/savebuff
savebuff: save & load query buffers - fixes #802
2015-01-16 21:29:20 +00:00
J-P Nurmi 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
Alexey Sokolov 230a39f079 Merge pull request #812 from ahf/fix-602
Q: Ignore JoinAfterCloaked unless UseCloakedHost is set
2015-01-11 17:16:04 +00:00
Alexey Sokolov 600f91f128 Fix implicit context of OnSendTo* hooks
Thanks for markus-j for reporting it
2015-01-11 17:08:00 +00:00