Commit Graph

4553 Commits

Author SHA1 Message Date
Alexey Sokolov 51c532839a Show jenkins badge through shields.io
It supports custom label, e.g. "freebsd" as here.

[skip ci]
2016-09-18 01:41:35 +01:00
Alexey Sokolov 2532aca967 Simplify jenkins file and enable integration test 2016-09-17 18:45:23 +01:00
Alexey Sokolov b56ab9106d Fix OpenSSL CMake build on OS X
See #1311
2016-09-17 16:54:13 +01:00
Alexey Sokolov dd21f8202e Jenkins: cleanup the workspace differently
git clean doesn't work
2016-09-17 11:09:56 +01:00
Alexey Sokolov 8a9ee77239 Jenkins should clean workspace before new build
if build agent is reused
2016-09-17 10:51:36 +01:00
Alexey Sokolov 682d2f1e01 Remove additional github commit status update from jenkins.
There is a status update already, which I didn't see during earlier
tests.
2016-09-17 09:09:30 +01:00
Alexey Sokolov be40b76a23 Add jenkins badge to readme 2016-09-17 02:41:01 +01:00
Alexey Sokolov 9cfc7e8a82 Add a Jenkins pipeline config to test ZNC on FreeBSD 2016-09-17 00:49:47 +01:00
Alexey Sokolov 3846813512 Merge branch '1.6.x'
Conflicts:
	modules/schat.cpp
	src/SSLVerifyHost.cpp
	src/Utils.cpp
2016-09-13 22:45:10 +01:00
Alexey Sokolov b7dcac5e5f Merge pull request #1311 from welwood08/openssl-1.1
OpenSSL 1.1 compatibility
2016-09-13 20:41:48 +01:00
William Elwood 853dcc211d Fix use of a feature deprecated in OpenSSL 1.1
If OpenSSL 1.1 is configured in such a way that features deprecated in 1.1.0 are not built, then compile errors would result here.
2016-09-13 11:51:13 +01:00
William Elwood 6a5c2c649d Fix use of a feature deprecated in OpenSSL 0.9.8
If OpenSSL 1.1 is configured in such a way that features deprecated in 0.9.8 are not built, then compile errors would result here.
I also noticed a potential memory leak where pRSA was not always freed before early return from this function - fixed by using C++11 unique_ptr.
2016-09-13 11:50:40 +01:00
William Elwood 03775fcdc5 Fix compile errors caused by OpenSSL 1.1 2016-09-12 23:39:19 +01:00
Alexey Sokolov 74e95ffdd9 Merge pull request #1314 from RealKindOne/master
route_replies: fix module to check if we are not connected to a network.

Close #1299
2016-09-12 23:18:57 +01:00
KindOne 34db7be4ae route_replies: fix module to check if we are not connected to a network.
psychon gets credit for this code change.
2016-09-12 04:45:15 -04:00
Alexey Sokolov 6a8fbbc933 Script modules should also use the new name of translation methods 2016-09-12 00:10:57 +01:00
Alexey Sokolov 3f1c27250c Fix warning in Utils.cpp 2016-09-12 00:07:29 +01:00
Alexey Sokolov cc653efb6b Rename translation methods to be not one letter.
It fixes several warnings, when the name was shadowed by a local "p".
2016-09-12 00:01:45 +01:00
Alexey Sokolov 187f617bbc Merge branch '1.6.x'
Close #1313
2016-09-09 21:14:00 +01:00
Alexey Sokolov debfdf6c02 Fix build on OS X after fixing build on Cygwin 2016-09-09 00:17:20 +01:00
Alexey Sokolov 1480177458 Merge branch '1.6.x' 2016-09-08 22:26:51 +01:00
Alexey Sokolov 9974b6692b Fix TSAN on Travis 2016-09-08 22:19:25 +01:00
Alexey Sokolov a964b2bbef Merge branch '1.6.x' of github.com:znc/znc into 1.6.x 2016-09-08 22:14:47 +01:00
Alexey Sokolov 14cef81bb5 Merge pull request #1312 from welwood08/gtest
Fix `make test` in 1.6.x
2016-09-04 22:02:43 +01:00
William Elwood f7d0f0ccb0 Fix make test in 1.6.x since GoogleTest has moved to new hosting 2016-09-04 12:08:29 +01:00
Alexey Sokolov c28a29076b Merge commit 'refs/pull/1308/head' of github.com:znc/znc 2016-08-25 23:15:27 +01:00
Alexey Sokolov 4bdf5c6f69 Reorder lines in .gitignore 2016-08-25 23:14:08 +01:00
xnrand 0653b7002a Update .gitignore to cover more generated files 2016-08-25 18:05:39 +02:00
Tyler Spivey c705eb8a64 Improve accessibility of add/edit channel 2016-08-24 00:42:47 -07:00
Tyler Spivey 400b3d9939 Improve accessibility of add/edit network 2016-08-24 00:42:47 -07:00
Tyler Spivey a1d71d6f19 Improve accessibility of list users 2016-08-24 00:42:39 -07:00
Tyler Spivey c392202cfe Improve accessibility of traffic info 2016-08-24 00:42:24 -07:00
Tyler Spivey fb96b74f16 Improve accessibility of global settings 2016-08-24 00:42:12 -07:00
Tyler Spivey 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
Tyler Spivey 827203ab0e Improve accessibility of login form 2016-08-23 23:11:33 -07:00
Alexey Sokolov 85984ee4be Merge pull request #1277 from xnrand/master
Add network-specific settings for cert validation
2016-08-20 12:08:41 +01:00
Alexey Sokolov d0e93c5171 Merge pull request #1304 from RealKindOne/master
Remove reference for attaching queries.
2016-08-15 20:46:09 +01:00
KindOne 3f48d0a01a Remove reference for attaching queries.
This was added in commit 85b84078f8 from pull request 1072.

Pull request 1014 would of made this command possible, but it was never pulled.
2016-08-14 21:12:14 -04:00
Alexey Sokolov aff7e25043 Fix cygwin build
(cherry picked from commit f1ef8c79db)
2016-08-13 09:55:00 +01:00
Alexey Sokolov 88a8675c80 Fix bad merge 2016-07-31 12:00:32 +01:00
Alexey Sokolov 05bf1c0f5e Merge branch '1.6.x' 2016-07-31 10:37:38 +01:00
Alexey Sokolov dd58e369f8 Fix OnInvite in modpython and modperl.
They were silently not called.

Close #1283
2016-07-31 10:35:19 +01:00
Alexey Sokolov 6708233479 Add more debug output to test which often hangs on cygwin 2016-07-30 09:19:52 +01:00
Alexey Sokolov e4194de153 Remove another line which I added only for debug... 2016-07-29 23:28:10 +01:00
Alexey Sokolov 8f61d9e182 Remove line which I added for debug... 2016-07-29 23:25:31 +01:00
Alexey Sokolov d95e0c7365 Combine test of buildmod to single file. 2016-07-29 23:21:08 +01:00
Alexey Sokolov 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
Alexey Sokolov f1ef8c79db Fix cygwin build 2016-07-20 00:19:19 +01:00
Alexey Sokolov 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
Tor Arne Vestbø 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