1480177458
Merge branch '1.6.x'
2016-09-08 22:26:51 +01:00
9974b6692b
Fix TSAN on Travis
2016-09-08 22:19:25 +01:00
a964b2bbef
Merge branch '1.6.x' of github.com:znc/znc into 1.6.x
2016-09-08 22:14:47 +01:00
14cef81bb5
Merge pull request #1312 from welwood08/gtest
...
Fix `make test` in 1.6.x
2016-09-04 22:02:43 +01:00
f7d0f0ccb0
Fix make test in 1.6.x since GoogleTest has moved to new hosting
2016-09-04 12:08:29 +01:00
c28a29076b
Merge commit 'refs/pull/1308/head' of github.com:znc/znc
2016-08-25 23:15:27 +01:00
4bdf5c6f69
Reorder lines in .gitignore
2016-08-25 23:14:08 +01:00
0653b7002a
Update .gitignore to cover more generated files
2016-08-25 18:05:39 +02:00
c705eb8a64
Improve accessibility of add/edit channel
2016-08-24 00:42:47 -07:00
400b3d9939
Improve accessibility of add/edit network
2016-08-24 00:42:47 -07:00
a1d71d6f19
Improve accessibility of list users
2016-08-24 00:42:39 -07:00
c392202cfe
Improve accessibility of traffic info
2016-08-24 00:42:24 -07:00
fb96b74f16
Improve accessibility of global settings
2016-08-24 00:42:12 -07:00
5a86f1b20b
Improve accessibility of add/edit user
...
Add labels and change tr to th in thead elements.
2016-08-23 23:11:55 -07:00
827203ab0e
Improve accessibility of login form
2016-08-23 23:11:33 -07:00
85984ee4be
Merge pull request #1277 from xnrand/master
...
Add network-specific settings for cert validation
2016-08-20 12:08:41 +01:00
d0e93c5171
Merge pull request #1304 from RealKindOne/master
...
Remove reference for attaching queries.
2016-08-15 20:46:09 +01:00
3f48d0a01a
Remove reference for attaching queries.
...
This was added in commit 85b84078f8
2016-08-14 21:12:14 -04:00
aff7e25043
Fix cygwin build
...
(cherry picked from commit f1ef8c79db
2016-08-13 09:55:00 +01:00
88a8675c80
Fix bad merge
2016-07-31 12:00:32 +01:00
05bf1c0f5e
Merge branch '1.6.x'
2016-07-31 10:37:38 +01:00
dd58e369f8
Fix OnInvite in modpython and modperl.
...
They were silently not called.
Close #1283
2016-07-31 10:35:19 +01:00
6708233479
Add more debug output to test which often hangs on cygwin
2016-07-30 09:19:52 +01:00
e4194de153
Remove another line which I added only for debug...
2016-07-29 23:28:10 +01:00
8f61d9e182
Remove line which I added for debug...
2016-07-29 23:25:31 +01:00
d95e0c7365
Combine test of buildmod to single file.
2016-07-29 23:21:08 +01:00
847f2baf24
Fix a null pointer dereference.
...
It sometimes happened when user attaches to a channel.
No released version is affected.
Thanks to Zoddo for the report!
2016-07-29 23:13:02 +01:00
f1ef8c79db
Fix cygwin build
2016-07-20 00:19:19 +01:00
b04e274963
Merge pull request #1294 from torarnv/priv-buffer-playback-signals
...
Add OnPrivBufferStarting/Ending signals, similar to Chan buffers
2016-07-17 23:12:16 +01:00
4d5724eb0a
Add OnPrivBufferStarting/Ending signals, similar to Chan buffers
...
Allows hooking into query buffer playback before and after all the
lines of the query buffer are replayed. The EModRet return value
has no effect at the moment, but may be used in the future to e.g.
prevent playback. The Chan version of these signals use EModRet to
skip emitting the status message, but not the whole playback.
2016-07-13 15:15:56 +02:00
56620af107
Merge pull request #1292 from dgw/issue-1291
...
[sasl] Do not try to convert entire "verbose" command to bool
2016-07-08 12:20:48 +02:00
b7fc670a39
Merge pull request #1290 from torarnv/fix-gettimeofday-ret
...
Fix inverted gettimeofday() return value handling
2016-07-08 10:28:23 +01:00
9864b2716a
[sasl] Do not try to convert entire "verbose" command to bool
...
Fixes #1291
2016-07-08 02:19:41 -05:00
02bfb9eaf5
Centralize logic to get current server time
...
A few different implementations of computing the current time were
spread out through the code base, most of them using gettimeofday().
This centralizes the logic in CUtil::GetTime() for easier maintenance,
and also allows all call sites to get the benefit of the clock_gettime()
code path on systems that support it.
2016-07-06 01:16:15 +02:00
5dd209369d
Merge pull request #1289 from torarnv/echo-message-time
...
Don't strip timestamp when sending echo-messages
2016-07-05 21:41:01 +01:00
852c9832a0
Fix inverted gettimeofday() return value handling
...
The gettimeofday function returns 0 for success, not for failure. As a
result of the inverted logic we were losing millisecond precision when
parsing incoming messages on non-HAVE_CLOCK_GETTIME systems (macOS).
2016-07-05 18:39:53 +02:00
60e88fc19d
Don't strip timestamp when sending echo-messages
...
We preserve the time of the original message by making a copy of it,
and just changing the nick, which we then pass on to the CMessage
overload of PutClient, which converts the timestamp into a @time tag.
2016-07-05 16:24:32 +02:00
ff2d1e47b2
Merge pull request #1282 from Zarthus/always-send-nick-in-notice
...
Always send the users name in NOTICE when logging in.
2016-06-26 20:55:02 +01:00
3ed914aa81
Always send the users name in NOTICE when logging in.
2016-06-20 08:06:00 +01:00
b7309cdaa4
Merge pull request #1280 from teward/patch-1
...
Update default SSL ciphers, using Mozilla Intermediate recommendations, 2016-06-03
2016-06-12 00:19:29 +01:00
f76ab76c4a
Update default SSL ciphers
...
Use an updated list of Default Ciphers, pulled from the same Mozilla recommendations.
This was pulled by me on June 3, 2016, thought we should update the cipherlist since it's been 5 months since it was last updated.
2016-06-03 11:40:37 -04:00
409ed4b6bc
Add network-specific config for cert validation
...
Added the following two network-specific configuration options that can
be changed via controlpanel or webadmin:
* TrustAllCerts: Will trust ALL certificates when enabled, effectively
disabling TLS certificate validation.
Default value: false
* TrustPKI: Whether or not to trust PKI-valid certificates. Setting this
to false will make znc trust only trusted certificates added by the
user.
Default value: true
With default values, behavior is exactly the same as before.
This is based on the work of Roelf Wichertjes. See YourBNC/znc@5c747598 .
See znc/znc#866 .
2016-05-20 01:17:26 +02:00
c5db7793d3
Merge pull request #1272 from Zarthus/patch/security-fail2ban-cmds-admin
...
fix #1271 : Disallow non-admin users to use fail2ban commands
2016-05-11 08:10:52 +01:00
5d372c2deb
fix #1271 : Disallow non-admin users to use fail2ban commands
2016-05-10 22:21:34 +02:00
4435baf1ee
The previous commit should work with ./configure too
2016-05-02 00:03:29 +01:00
2fd14d4fb9
Explain modperl that ZNC uses UTF-8 internally
...
Thanks to jiggawattz for showing the issue
2016-05-01 23:59:11 +01:00
eab62b46e7
modperl: fix reloading of module which couldn't be loaded before
...
Thanks to dudz for report
2016-05-01 14:23:37 +01:00
23b19e53f9
Merge pull request #1261 from kylef/kylef/strip-resetfg-bg
...
Strip background colours when we reset foreground
2016-04-17 18:44:22 +01:00
cc674b28e8
[CString.StripControls] Improve test coverage formatting
2016-04-11 22:09:46 +01:00
032f00732a
[CString.StripControls] Srip bg colours when we reset fg
2016-04-11 22:09:40 +01:00
Alexey Sokolov