Commit Graph

4514 Commits

Author SHA1 Message Date
Alexey Sokolov
2fe416987f Merge pull request #912 from jpnurmi/sasl
SASL: add webadmin interface (closes #910)
2015-04-05 11:49:49 +01:00
Alexey Sokolov
094f74640a Fix CUser::GetUserClients() and CUser::GetAllClients() in modpython.
Thanks to Lymia for reporting it.

(cherry picked from commit cd832aaf69)
2015-04-04 18:34:03 +01:00
Alexey Sokolov
cd832aaf69 Fix CUser::GetUserClients() and CUser::GetAllClients() in modpython.
Thanks to Lymia for reporting it.
2015-04-04 17:47:59 +01:00
Alexey Sokolov
cc0574b084 Add drag-and-drop to SASL webpage 2015-04-04 10:28:38 +02:00
J-P Nurmi
72223febcf SASL: add webadmin interface (closes #910) 2015-04-04 10:28:38 +02:00
Alexey Sokolov
ce156b590f Merge branch 'master' of github.com:znc/znc 2015-04-03 21:41:06 +01:00
Alexey Sokolov
0303f49fdd Merge commit 'refs/pull/929/head' of github.com:znc/znc 2015-04-03 21:38:48 +01:00
J-P Nurmi
41beb4fb89 Merge remote-tracking branch 'origin/1.6.x' 2015-04-01 07:56:03 +02:00
J-P Nurmi
c3467f1647 Merge pull request #937 from elyscape/fix/1.6.x/write_chan_config_removal
Write config file when channel is removed (#932)
2015-04-01 07:52:38 +02:00
Eli Young
53254173b1 Write config file when channel is removed (#932) 2015-03-31 17:57:30 -07:00
Thomas Kriechbaumer
8d2ca76838 fail if no config version is not found 2015-03-31 14:29:08 +01:00
Thomas Kriechbaumer
6fcf4d9ca9 update rehash command description 2015-03-31 14:29:08 +01:00
Thomas Kriechbaumer
d542599475 add compatibility for pre-1.0 configs 2015-03-31 14:29:08 +01:00
Thomas Kriechbaumer
479f3c3774 add changelog entries 2015-03-31 14:29:08 +01:00
Thomas Kriechbaumer
a56d4cae6a do not call OnAddUser hook during ZNC startup 2015-03-31 12:15:40 +01:00
Thomas Kriechbaumer
28bb50fa1a refactor config parsing 2015-03-31 12:15:40 +01:00
Alexey Sokolov
398e9dec06 Support discovery of tcl 8.6 during ./configure 2015-03-30 22:45:45 +01:00
Alexey Sokolov
faa77eceec Merge pull request #934 from teward/patch-1
Add Thomas Ward to contributors/helpers list
Thanks for contributions!
2015-03-30 22:07:13 +01:00
Thomas Ward
ee6f5a05db Add Thomas Ward to contributors/helpers list
While I may not have made large contributions, I have provided changes in the past to provide standardization in message output format (such as for AddNetwork, DelNetwork, AddUser, DelUser, etc.) to both increase verbosity but to also provide information to the end user in a readable form (https://github.com/znc/znc/pull/353, https://github.com/znc/znc/pull/295).  Most recently, my last revision was extremely minor but enforces standardization of commands to those forms (https://github.com/znc/znc/pull/933).  I also (band-aid) fixed a display issue on webadmin for the SSLTrustedFingerprints caption (https://github.com/znc/znc/pull/859).

To that end, and the fact that the standardization and verbosity I set up is still in use today in a good portion of modules, I'd like my name added to the contributors/helpers list, please.  (I understand if I am not added, however I would like to be included on the list)
2015-03-30 14:28:31 -04:00
Kyle Fuller
720bde6543 Merge pull request #933 from teward/patch-1
Update 'User Deleted' message to match format
2015-03-30 18:02:43 +01:00
Thomas Ward
7f6380ae8b Update 'User Deleted' message to match format
The User Deleted output for a success does not match the rest of the output formats for other commands and needs to match the same 'standard' for outputs.
2015-03-30 11:36:12 -04:00
Thomas Kriechbaumer
39f593fedf ignore temporary object files 2015-03-21 14:17:53 +00:00
J-P Nurmi
9814f2a258 Add missing help text for ClearAllBuffers (close #924) 2015-03-12 19:07:00 +01:00
Alexey Sokolov
3f73231665 Merge pull request #918 from jpnurmi/weffc++
Fix warnings of -Weffc++ [-Weffc++] (#270)
2015-03-07 22:03:10 +00:00
Ammar Askar
01da1d7f7d Use small triangles for sorting indicators 2015-03-08 02:13:44 +05:00
J-P Nurmi
e62ed5f300 modperl & modpython: fix GetType() at module construction time 2015-03-07 21:54:33 +01:00
J-P Nurmi
5aa8b0dcef Fix copy ctor/assignment oper warnings of -Weffc++ (#270) 2015-03-07 21:54:33 +01:00
J-P Nurmi
e1ada6c643 TDNSTask & CDNSJob: use member intialization lists [-Weffc++] (#270) 2015-03-07 21:54:33 +01:00
J-P Nurmi
d16f35facc CModule: use member initialization lists [-Weffc++] (#270)
This fixes the problem that CModule::GetType() returned a random
uninitialized value in CModule constructor, which was als the reason
for #905. CModule constructor signature has been changed so that it
optionally takes the type so it can be initialized appropriately.

The new type argument has a default value in order to retain source
compatibility in case some 3rdparty module would call CModule ctor
by hand instead of using the MODCONSTRUCTOR macro.
2015-03-07 21:54:33 +01:00
Alexey Sokolov
e2a99eeb21 Merge pull request #920 from Kriechi/readme-dependencies
Readme dependencies
2015-03-07 20:29:52 +00:00
Thomas Kriechbaumer
a405aaddf5 improve dependency and build instructions
[ci skip]
closes #747
closes #834
2015-03-07 20:05:54 +00:00
Alexey Sokolov
d6c2efa540 Merge pull request #916 from jpnurmi/tables
Add ShowChan & minimize ListChans columns
2015-03-07 19:52:33 +00:00
Thomas Kriechbaumer
934a0a9bab add travis build status to readme
[ci skip]
2015-03-07 19:45:51 +00:00
Alexey Sokolov
12a15ef4df Merge pull request #908 from jpnurmi/reserved
Fix reserved identifier violation in header guards (#433)
2015-03-07 15:26:14 +00:00
Alexey Sokolov
4549197301 Merge pull request #881 from Kriechi/improve-stickychan
improve stickychan
2015-03-07 15:24:57 +00:00
J-P Nurmi
940cae8f09 Fix reserved identifier violation in header guards (#433) 2015-03-06 22:25:47 +01:00
J-P Nurmi
3382543917 Reduce ListChans columns to name & status (#914) 2015-03-06 22:17:01 +01:00
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