adam/znc
1
0
Fork 0
mirror of https://github.com/znc/znc.git synced 2026-07-05 09:21:31 +02:00
Code Issues Packages Projects Releases Wiki Activity
3,875 Commits 8 Branches 91 Tags
00ddcd302fb9eb38fad5969554189163e1ce7b8a
Commit Graph

3875 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
J-P Nurmi 00ddcd302f Add "ShowChan <#chan>" command for showing channel details (#914) 2015-03-06 22:17:00 +01:00
Alexey Sokolov 0179e857da Merge branch 'master' of github.com:znc/znc 2015-03-06 20:57:50 +00:00
Alexey Sokolov e1ac6c49cb Merge branch '1.6.x' 2015-03-06 20:57:18 +00: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 59d5b05057 Merge pull request #917 from jpnurmi/stripcontrols 
Replace StripControls setting with a separate module
 2015-03-06 20:17:31 +00:00
Alexey Sokolov 343035e172 Explain in webadmin why encoding settings are disabled. 2015-03-05 23:13:58 +00:00
J-P Nurmi a5b4a29c00 Revert StripControls implementation (#850) 
This reverts commits 27d78795a7 and
f27109f1b4. It was decided that the
functionality is provided by a separate module instead, to avoid
unnecessarily bloating the core.
 2015-03-04 09:50:00 +01:00
J-P Nurmi a67f929b7d Add stripcontrols module (#387) 
This replaces #850. It was decided that the functionality is provided
by a separate module instead, to avoid unnecessarily bloating the core.
 2015-03-04 09:47:49 +01:00
J-P Nurmi caf6347a84 Merge remote-tracking branch 'origin/1.6.x' 
Conflicts:
	configure.ac
	include/znc/version.h
 2015-03-01 23:07:50 +01:00
J-P Nurmi 197411e602 Display development version as "1.7.x" - ref #748 2015-03-01 23:04:37 +01: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 e61ee6096f Merge pull request #907 from jpnurmi/weffc++ 
Use member initialization lists [-Weffc++] (#270)
 2015-03-01 12:58:50 -08:00
Alexey Sokolov 69bd740136 Merge pull request #899 from jpnurmi/for-loops 
Last batch of C++11 range-based for loops (#816)
 2015-03-01 12:48:43 -08:00
J-P Nurmi 1d09b41540 Last batch of C++11 range-based for loops (#816) 2015-03-01 21:36:28 +01:00
J-P Nurmi bb36d40580 CIRCNetwork: use member initialization list [-Weffc++] (#270) 2015-03-01 16:03:59 +01:00
J-P Nurmi 21dc83e58f CUser: use member initialization list [-Weffc++] (#270) 2015-03-01 16:03:59 +01:00
J-P Nurmi 3a951b2b6d CZNC: use member initialization list [-Weffc++] (#270) 2015-03-01 16:03:59 +01:00
J-P Nurmi 1d2650d450 Use member initialization lists [-Weffc++] (#270) 2015-03-01 15:00:10 +01:00
J-P Nurmi 05c96a16d1 Merge remote-tracking branch 'origin/1.6.x' 2015-03-01 09:19:01 +01:00
Alexey Sokolov 11c815d5ba Merge pull request #833 from Mkaysi/nickserv 
nickserv: use NICKSERV instead of PRIVMSG
 2015-02-28 20:59:21 -08:00
Alexey Sokolov 56f8d8eb76 Merge pull request #906 from jpnurmi/weffc++ 
Use member initialization lists [-Weffc++] (#270)
 2015-02-28 20:29:08 -08:00
Alexey Sokolov d9e7e3a224 Merge pull request #904 from jpnurmi/clearqueries 
Restore CIRCNetwork::ClearQueryBuffer() for convenience
 2015-02-28 20:15:59 -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 6a6bb648d1 Use member initialization lists [-Weffc++] (#270) 2015-02-28 21:59:01 +01: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 2b0c6e595b Restore CIRCNetwork::ClearQueryBuffer() for convenience 
Originally removed when query buffers were introduced in 14a534c.
The ideal name would be plural ClearQueryBuffers() now that there
are multiple query buffers, but use the old name for compatibility
reasons (see https://github.com/kylef/znc-contrib/pull/18).
 2015-02-28 20:56:02 +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 284158c92f Merge pull request #900 from jpnurmi/controlpanel 
controlpanel: $user and $network (#847)
 2015-02-27 18:25:00 -08:00
J-P Nurmi 21c93c1658 controlpanel: $user and $network (#847) 
IMHO these placeholder names are the most obvious choice and easiest
to remember. For old-timers and to retain compatibility, $me is still
supported. For the advanced users there's also $net for convenience.
 2015-02-28 01:10:58 +01:00
Alexey Sokolov a1165cfcca Merge pull request #894 from Kriechi/improve-osx-build 
add homebrew locations for openssl, icu4c, python3
 2015-02-27 08:54:10 -08:00
Thomas Kriechbaumer 53e5e99d42 add homebrew locations for openssl, icu4c, python3 2015-02-27 16:17:08 +00:00
Alexey Sokolov 2b8e3f997f Merge pull request #883 from jpnurmi/clearallbuffers 
Add CLEARALLBUFFERS command (closes #852)
 2015-02-26 21:42:55 -08:00
Alexey Sokolov 18897e47d9 Merge pull request #897 from jpnurmi/override 
Add missing override keywords (#816)
 2015-02-26 21:19:41 -08:00
Alexey Sokolov e9294e4c81 Merge pull request #898 from jpnurmi/nullptr 
Search'n'replace remaining NULL occurrences (#816)
 2015-02-26 21:18:37 -08:00
Alexey Sokolov f139171933 Merge pull request #892 from jpnurmi/for-loops 
More C++11 range-based for loops
 2015-02-26 21:15:38 -08:00
J-P Nurmi dd0bc69413 Add missing override keywords (#816) 2015-02-27 00:24:02 +01:00
J-P Nurmi 75b210e841 Search'n'replace remaining NULL occurrences (#816) 2015-02-26 20:58:01 +01:00
Alexey Sokolov 832cec45f8 Merge pull request #891 from jpnurmi/dead 
Fix dead assign/init found by clang static analyzer
 2015-02-26 07:22:09 -08:00
J-P Nurmi b6f04d4b83 CIRCNetwork: C++11 range-based for loops 2015-02-26 11:54:21 +01:00
J-P Nurmi fd97557ec8 CIRCSock: C++11 range-based for loops 2015-02-26 11:54:21 +01:00
J-P Nurmi b0ddd5082e CZNC: C++11 range-based for loops 2015-02-26 11:53:42 +01:00
J-P Nurmi 284aa1b5b6 CUtils: C++11 range-based for loops 2015-02-26 09:31:55 +01:00
J-P Nurmi 5a338d91cb CHTTPSock: C++11 range-based for loops 2015-02-26 09:31:35 +01:00
J-P Nurmi 36823da403 CTemplate: C++11 range-based for loops 2015-02-26 09:31:18 +01:00
J-P Nurmi 36a03ce29f Fix dead assign/init found by clang static analyzer 
Value stored to 'pUser' (during its initialization) is never read
 2015-02-26 08:32:49 +01:00
Alexey Sokolov eb5aa75c16 Merge pull request #859 from teward/master 
Band-aid Fix CSS for _default_ for Fingerprints section (Fix #828)
 2015-02-25 22:08:19 -08:00
Alexey Sokolov f353c7aeef Merge pull request #844 from jpnurmi/delserver 
controlpanel: add delserver command (closes #810)
 2015-02-25 22:01:27 -08:00
Alexey Sokolov 0794e602a7 Merge pull request #889 from jpnurmi/c++11 
Replace some C++98isms with C++11isms (#816)
 2015-02-25 22:00:06 -08:00
Alexey Sokolov bc1eeaa3d8 Merge pull request #886 from jpnurmi/for-loops 
C++11 range-based for loops
 2015-02-25 21:44:54 -08: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