Commit Graph

4039 Commits

Author SHA1 Message Date
Alexey Sokolov
483074cbf8 Merge pull request #1021 from gustavoz/master
Add <time.h> includes where appropiate
2015-08-07 09:25:54 +01:00
Gustavo Zacarias
9a51195e91 Add <time.h> includes where appropiate
Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
2015-08-06 11:20:54 -03:00
Alexey Sokolov
4b62962d2f Merge branch '1.6.x' 2015-08-05 00:18:34 +01:00
Alexey Sokolov
65e36c8daf s/NULL/nullptr/ in modpython's codegen.pl 2015-08-05 00:17:22 +01:00
Alexey Sokolov
eda13bd1f0 Update codegen.pl too. See #1017 2015-08-05 00:10:58 +01:00
Alexey Sokolov
603288999b Merge branch 'master' of github.com:znc/znc 2015-08-04 23:48:52 +01:00
Alexey Sokolov
f7ccbed99a Merge branch '1.6.x' 2015-08-04 23:47:42 +01:00
J-P Nurmi
23fb93d1c6 webadmin: use CIRCNetwork::ClearTrustedFingerprints() 2015-08-05 00:44:52 +02:00
J-P Nurmi
f266b54e6e Fix ClearTrustedFingerprints() casing 2015-08-05 00:44:51 +02:00
Alexey Sokolov
b8330296a2 Fix memory leak in modpython.
Update typemaps for CString from latest SWIG.

The relevant change is "free p;" -> "delete p;"
CString object itself was deleted, but its destructor wasn't called,
so it couldn't free the underlying character data.

Fix #1017
2015-08-04 23:44:48 +01:00
J-P Nurmi
66413ae516 Add CIRCNetwork::ClearTrustedFingerPrints() 2015-08-05 00:35:16 +02:00
J-P Nurmi
dce289a5d4 CUser: add API for removing and clearing allowed hosts 2015-08-04 16:09:27 +02:00
J-P Nurmi
42501a3c61 Merge branch '1.6.x'
Conflicts:
	ChangeLog.md
2015-08-04 01:23:05 +02:00
J-P Nurmi
de6ad06bd2 Merge branch '1.6.1' into 1.6.x 2015-08-04 01:14:31 +02:00
Alexey Sokolov
aa6e7e7428 Increase the version number to 1.6.1 znc-1.6.1 2015-08-03 23:59:17 +01:00
J-P Nurmi
9fe1027d8a Add missing CChan::GetNetwork() 2015-08-02 23:40:12 +02:00
J-P Nurmi
d6d57cb708 Merge branch '1.6.x' 2015-08-01 12:44:06 +02:00
J-P Nurmi
ad99d5f46e Merge pull request #1013 from DarthGandalf/cap-end
Support "CAP :END"
2015-08-01 12:33:26 +02:00
J-P Nurmi
b16faf5058 Merge pull request #990 from jpnurmi/reset
Allow reseting channel specific AutoClearChanBuffer & Buffer settings
2015-08-01 12:30:36 +02:00
J-P Nurmi
824cb3cc56 Merge pull request #1011 from jpnurmi/disconkick
src/IRCSock.cpp: use *status as kicker
2015-08-01 01:02:14 +02:00
J-P Nurmi
015a8f6502 Merge branch '1.6.x'
Conflicts:
	src/Client.cpp
	znc-buildmod.in
2015-07-31 23:56:04 +02:00
J-P Nurmi
5c2e040cb8 Merge pull request #1009 from jpnurmi/keys
Fix #1008: Channel keys get saved in a very wrong way
2015-07-31 23:49:05 +02:00
J-P Nurmi
2098dc1f2c Merge pull request #992 from jpnurmi/fail2ban
fail2ban: configurability & commands
2015-07-31 23:32:15 +02:00
J-P Nurmi
53d9161b20 Merge pull request #998 from jpnurmi/buffer
Resolve #967: separate chan & query buffer size settings
2015-07-31 22:51:03 +02:00
J-P Nurmi
da0862ddb3 Merge pull request #997 from jpnurmi/flooddetach
flooddetach: add nick changes - close #941
2015-07-31 22:26:03 +02:00
J-P Nurmi
87ae630046 Merge pull request #991 from jpnurmi/initializer_list
Add initializer_list ctors for CString & MCString
2015-07-31 22:08:43 +02:00
J-P Nurmi
b217653710 Merge pull request #1010 from jpnurmi/modules_online
Fix #1007: modules_online uses wrong ident
2015-07-31 21:52:41 +02:00
J-P Nurmi
ef06901966 Merge pull request #996 from jpnurmi/account-notify
Add support for account-notify and extended-join
2015-07-31 21:50:36 +02:00
Alexey Sokolov
89e99bfe35 Support "CAP :END"
Thanks to jaybe for complaining about this.
2015-07-30 22:01:11 +01:00
J-P Nurmi
405546e94c src/IRCSock.cpp: use *status as kicker
Closes #649
2015-07-28 17:45:18 +02:00
J-P Nurmi
0058b47d42 Fix #1007: modules_online uses wrong ident 2015-07-28 12:27:01 +02:00
J-P Nurmi
b2c83321ef Fix #1008: Channel keys get saved in a very wrong way 2015-07-27 02:06:21 +02:00
J-P Nurmi
757ba2bee7 ZNC 1.6.1-rc1 znc-1.6.1-rc1 2015-07-25 23:12:51 +02:00
Alexey Sokolov
8a831adf1b '-L"/path"' -> '-L/path' 2015-07-23 01:11:16 +01:00
Alexey Sokolov
baa798ce9f Fix -DVERSION_EXTRA="foo"
It was broken since 58a34fa5ad (since ZNC 1.2)
2015-07-21 22:47:09 +01:00
Alexey Sokolov
2dbd837851 Fix znc-buildmod on cygwin after rename of library 2015-07-21 00:03:26 +01:00
Alexey Sokolov
c336ef5ec2 Cygwin: Rename libznc.dll to cygznc-1.7.dll
https://cygwin.com/ml/cygwin-apps/2015-07/msg00108.html
2015-07-19 13:49:18 +01:00
Alexey Sokolov
28a0f1d4d9 Appveyor: with cygwin installation log, no need for ls -l /bin [skip ci] 2015-07-19 00:13:29 +01:00
J-P Nurmi
496a132e32 Resolve #967: separate chan & query buffer size settings 2015-07-19 00:31:10 +02:00
Alexey Sokolov
0d8083e3df Appveyor: Fix name of dependency 2015-07-18 19:00:32 +01:00
Alexey Sokolov
55a25ec654 Appveyor: enable more ZNC features. 2015-07-18 18:58:59 +01:00
J-P Nurmi
ed9d3deec8 savebuff: remove LEGACY_SAVEBUFF -wrapped code
This piece of code hasn't compiled since 2011 (cb4131e), and has
been functionally broken since 2010 (a0c0b73). 12ce7f1 instructs
to use buffextras alongside savebuff.
2015-07-17 12:27:34 +02:00
J-P Nurmi
9242307ff7 Merge branch '1.6.x'
Conflicts:
	README.md
	modules/data/webadmin/tmpl/settings.tmpl
	src/Query.cpp
2015-07-14 23:11:17 +02:00
J-P Nurmi
bae872f2b1 flooddetach: add nick changes - close #941 2015-07-14 19:12:29 +02:00
J-P Nurmi
d39b20b505 Fix sources to include their respective header 2015-07-14 19:05:23 +02:00
J-P Nurmi
6246899c56 Add support for extended-join (#316) 2015-07-14 18:29:33 +02:00
J-P Nurmi
d070a6e644 Add support for account-notify (#316) 2015-07-14 17:02:16 +02:00
J-P Nurmi
d18601180b Align server-side cap handling code with the client-side
Based on d7a6a136db - to make it more
straight-forward to add support for more server-side capabilities.
2015-07-14 16:57:53 +02:00
J-P Nurmi
ea2df008f8 Merge pull request #993 from jpnurmi/fortify
Fix #887: define _FORTIFY_SOURCE only for optimized release builds
2015-07-14 13:33:02 +02:00
J-P Nurmi
c5d7b5778a fail2ban: add BAN, UNBAN and LIST commands (#534) 2015-07-13 23:51:28 +02:00