Commit Graph

4969 Commits

Author SHA1 Message Date
Alexey Sokolov
29fab65723 Merge 1.7.x to master 2018-07-14 07:28:08 +01:00
Alexey Sokolov
a4a5aeeb17 Don't let web skin name ../../../../ access files outside of usual skins directories.
Thanks for Jeriko One <jeriko.one@gmx.us> for finding and reporting this.
2018-07-14 07:09:26 +01:00
Alexey Sokolov
d22fef8620 Better cleanup lines coming from network.
Thanks for Jeriko One <jeriko.one@gmx.us> for finding and reporting this.
2018-07-14 07:08:50 +01:00
Alexey Sokolov
a7bfbd9381 Don't let attackers inject rogue values into znc.conf
Because of this vulnerability, existing ZNC users could get Admin
permissions.

Thanks for Jeriko One <jeriko.one@gmx.us> for finding and reporting this.
2018-07-14 07:05:57 +01:00
ZNC-Jenkins
2058aa0fa6 Update translations from Crowdin for es_ES 2018-07-02 00:25:44 +00:00
Alexey Sokolov
c2731dfecd Merge branch '1.7.x' 2018-06-29 00:08:15 +01:00
Alexey Sokolov
efd301de4b Merge branch '1.7.x' of github.com:znc/znc into 1.7.x 2018-06-28 23:59:22 +01:00
Alexey Sokolov
abee9f9bfc Fix a warning in integration test / gmake / znc-buildmod interaction.
It was requested on https://github.com/gentoo/gentoo/pull/8901
2018-06-28 23:57:29 +01:00
ZNC-Jenkins
08fe2ae2f7 Update translations from Crowdin for de_DE 2018-06-24 00:26:41 +00:00
ZNC-Jenkins
eec5c5a036 Update translations from Crowdin for de_DE 2018-06-24 00:26:33 +00:00
Alexey Sokolov
ff8b629884 Don't throw from destructor in the integration test 2018-06-20 01:28:46 +01:00
ZNC-Jenkins
87fe01d3aa Update translations from Crowdin for ru_RU 2018-06-19 21:24:58 +00:00
ZNC-Jenkins
71ebbf4d14 Update translations from Crowdin for ru_RU 2018-06-19 21:24:46 +00:00
ZNC-Jenkins
3b6980cb85 Update translations from Crowdin for de_DE es_ES id_ID nl_NL pt_BR ru_RU 2018-06-19 21:04:33 +00:00
ZNC-Jenkins
b483ba8a8d Update translations from Crowdin for de_DE es_ES id_ID nl_NL pt_BR ru_RU 2018-06-19 21:04:31 +00:00
Alexey Sokolov
05f00630c7 crowdin: Use separate keys for pushing to znc and znc-jenkins 2018-06-19 21:49:31 +01:00
Alexey Sokolov
5e6b50bce4 crowdin: fix "git commit" command after #1570 2018-06-19 20:54:04 +01:00
Alexey Sokolov
e85157a56c crowdin: push directly to github
Leave ability to open PRs, as a way to test changes if needed.
2018-06-19 20:36:42 +01:00
Alexey Sokolov
ed5b16f049 Merge commit 'refs/pull/1570/head' of github.com:znc/znc 2018-06-19 20:29:48 +01:00
Alexey Sokolov
1b894982af Merge pull request #1572 from csprr/patch-2
Create nl_NL
2018-06-19 19:50:42 +01:00
Alexey Sokolov
271cc8babb Merge branch 'master' of github.com:znc/znc 2018-06-18 00:47:20 +01:00
Alexey Sokolov
66acad5791 Merge branch '1.7.x' 2018-06-18 00:46:54 +01:00
Alexey Sokolov
6d1e77bb52 Revert "transperancy: Make the user aware that DEBUG mode is enabled."
This reverts commit ab501767a1.

Superceded by admindebug module
2018-06-18 00:41:18 +01:00
Jos Ahrens
e64b331342 Add module that dynamically enables/disables debug mode
Close #1547
Close #1556
References #1370
References #1446
2018-06-18 00:38:42 +01:00
Jos Ahrens
664faa7d90 ci: Normalize variable names and string interpolation
Ref #1562
2018-06-16 22:03:40 +02:00
Alexey Sokolov
7b019bf9bf Merge pull request #1569 from Zarthus/jenkins/trans/pr-summary
ci: return output of shell commands to stdout
2018-06-16 20:53:20 +01:00
Jos Ahrens
1bc77e4cb6 ci: Add modifiedLocales to git-commit message 2018-06-16 13:49:36 +02:00
Jos Ahrens
488e8773e3 ci: return output of shell commands to stdout
Ref #1562
2018-06-16 13:49:36 +02:00
Jos Ahrens
6f109ec6d7 ci: fix Groovy lang.Binding exception (#1566)
Ref #1562
2018-06-16 12:20:18 +01:00
Jos Ahrens
d07674b089 ci: fix broken shell syntax (#1565)
Ref #1562
2018-06-16 11:51:41 +01:00
Alexey Sokolov
27f4dce638 Merge pull request #1564 from Zarthus/jenkins/trans/pr-summary
ci: Modify crowdin CI to make better PR descriptions
2018-06-16 11:45:20 +01:00
Jos Ahrens
04dc7ca3e6 ci: Modify crowdin CI to make better PR descriptions
Closes #1562
2018-06-16 12:43:20 +02:00
ZNC-Jenkins bot
27540a8d40 Update translations from Crowdin (#1552) 2018-06-16 10:15:05 +01:00
Alexey Sokolov
e6df9f7f4a Merge pull request #1561 from znc-jenkins/l10n_1.7.x
Update translations in 1.7.x
2018-06-16 10:14:09 +01:00
ZNC-Jenkins
cc3f8499a7 Update translations from Crowdin 2018-06-16 00:25:59 +00:00
Alexey Sokolov
bdbcaca055 Merge branch '1.7.x' 2018-06-15 19:34:49 +01:00
ZNC-Jenkins bot
38a007d5c5 Update translations from Crowdin (#1551) 2018-06-15 19:34:12 +01:00
Casper
d3d87dd018 Create nl_NL 2018-06-15 09:22:05 +02:00
Alexey Sokolov
ac037766f0 Merge branch '1.7.x' 2018-06-14 22:26:42 +01:00
Casper
c74f41d67d Change GetParamsColon(1) to (0) in adminlog, as (1) does not show the error message, it will show an empty [] in the adminlog
Close #1557
2018-06-14 22:25:41 +01:00
Alexey Sokolov
2ed6cb7c54 Merge branch '1.7.x' 2018-06-10 21:10:30 +01:00
Baruch Siach
e567f4cb73 Fix build without SSL support
The <memory> headers is needed for unique_ptr even when SSL is not
enabled. This fixes the following build failure:

src/Utils.cpp: In static member function 'static bool CUtils::CheckCIDR(const CString&, const CString&)':
src/Utils.cpp:674:5: error: 'unique_ptr' is not a member of 'std'
     std::unique_ptr<addrinfo, decltype(deleter)> aiHost(aiHostC, deleter);
     ^

Close #1554
2018-06-10 21:09:07 +01:00
ZNC-Jenkins bot
8edcdf3263 Update translations from Crowdin (#1539) 2018-06-04 22:38:56 +01:00
ZNC-Jenkins bot
633e695aba Update translations from Crowdin (#1544) 2018-06-04 22:38:33 +01:00
Alexey Sokolov
fda73d8c81 Merge branch '1.7.x' 2018-06-04 22:30:53 +01:00
Alexey Sokolov
d15e619483 Merge branch '1.7.x' of github.com:znc/znc into 1.7.x 2018-06-04 22:30:24 +01:00
Alexey Sokolov
664105eabd Fix #1548: fix description of flooddetach commands.
Ref #1549
2018-06-04 22:27:39 +01:00
Alexey Sokolov
4b92790562 Fix #1543 for modperl too
While at it, fix a memory leak in NV handling

Add some tests
2018-06-04 22:03:10 +01:00
Baguz Ach
065f19c5bd added Bahasa Indonesia (#1550) 2018-06-04 10:46:14 +01:00
Alexey Sokolov
8eebdf750d Slightly cleaner way to fix #1543 2018-06-02 10:45:03 +01:00