21458de7d0
Merge branch '1.6.x'
...
Conflicts:
src/Utils.cpp
2015-04-18 17:57:51 +01:00
00404b8cbb
Revert "Make tables... not so tabular."
...
This reverts commit 2c3064fb56
2015-04-18 17:38:56 +01:00
880713dcfc
Main ZNC IRC channel is on freenode.
...
876 users vs. 220 on efnet.
Fix #895
2015-04-18 10:05:37 +01:00
cd1f334f31
Update error message about --datadir
...
Noone remembers these days that at some point ZNC supported using the
same config directory, but different znc.conf. So now the old message is
just confusing.
However, nowadays many people confuse "/znc foo" in IRC client with
"znc foo" in shell.
2015-04-17 22:56:35 +01:00
144f7984e4
Don't require CSRF token for POSTs if the request uses HTTP Basic auth.
...
See #946
2015-04-16 20:57:29 +01:00
7719213ea6
Merge branch '1.6.x'
2015-04-16 20:32:58 +01:00
7c64eba693
Last commit broke async auth, e.g. via imapauth. Fix it.
...
See #946
2015-04-16 20:31:31 +01:00
0b205db494
Merge branch '1.6.x'
2015-04-16 01:24:43 +01:00
0167a827a7
Fix compilation warning
2015-04-16 01:23:57 +01:00
eedcd4c4de
Fix rare conflict of HTTP-Basic auth and cookies.
...
Fix #946
2015-04-16 01:21:57 +01:00
c7b2aea7da
Make help non-table more compact.
2015-04-09 21:25:42 +01:00
926989342c
Cleanup CTable after making it not a table earlier
2015-04-09 21:12:21 +01:00
1df5d91a53
Merge branch '1.6.x'
2015-04-09 21:06:09 +01:00
2c3064fb56
Make tables... not so tabular.
...
Fix #743
Fix #914
Close #922
2015-04-09 07:34:00 +01:00
9a57cc52de
Add some changes to ChangeLog which are hard to get from git log
...
Because they are changes in Csocket
2015-04-07 20:15:52 +01:00
b4d8e5152d
Update Csocket
2015-04-07 20:10:36 +01:00
d884ff76c0
Merge branch '1.6.x'
2015-04-06 22:42:25 +01:00
21834d3aba
Improve breadcrumbs in webadmin.
...
Fix #227
2015-04-06 22:40:55 +01:00
70cc4285f9
Merge branch '1.6.x'
2015-04-06 20:43:41 +01:00
4596d97502
Remove "-" between "ZNC" and version number.
...
ZNC 1.6.0 looks better than ZNC - 1.6.0, IMHO
2015-04-06 20:41:57 +01:00
1b743a2360
Merge pull request #939 from SaberUK/master+notice-grammar
...
Fix some iffy grammar in the NOTICE file.
2015-04-06 07:26:37 +01:00
268205598d
Fix some iffy grammar in the NOTICE file.
2015-04-06 03:24:43 +01:00
a08d737cbb
Don't tell users to run "/gmake" after configure
2015-04-05 18:29:54 +01:00
3acbeb855b
Add URLs to the used JS libraries in NOTICE
2015-04-05 11:52:34 +01:00
2fe416987f
Merge pull request #912 from jpnurmi/sasl
...
SASL: add webadmin interface (closes #910 )
2015-04-05 11:49:49 +01:00
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
cd832aaf69
Fix CUser::GetUserClients() and CUser::GetAllClients() in modpython.
...
Thanks to Lymia for reporting it.
2015-04-04 17:47:59 +01:00
cc0574b084
Add drag-and-drop to SASL webpage
2015-04-04 10:28:38 +02:00
72223febcf
SASL: add webadmin interface ( closes #910 )
2015-04-04 10:28:38 +02:00
ce156b590f
Merge branch 'master' of github.com:znc/znc
2015-04-03 21:41:06 +01:00
0303f49fdd
Merge commit 'refs/pull/929/head' of github.com:znc/znc
2015-04-03 21:38:48 +01:00
41beb4fb89
Merge remote-tracking branch 'origin/1.6.x'
2015-04-01 07:56:03 +02:00
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
53254173b1
Write config file when channel is removed ( #932 )
2015-03-31 17:57:30 -07:00
8d2ca76838
fail if no config version is not found
2015-03-31 14:29:08 +01:00
6fcf4d9ca9
update rehash command description
2015-03-31 14:29:08 +01:00
d542599475
add compatibility for pre-1.0 configs
2015-03-31 14:29:08 +01:00
479f3c3774
add changelog entries
2015-03-31 14:29:08 +01:00
a56d4cae6a
do not call OnAddUser hook during ZNC startup
2015-03-31 12:15:40 +01:00
28bb50fa1a
refactor config parsing
2015-03-31 12:15:40 +01:00
398e9dec06
Support discovery of tcl 8.6 during ./configure
2015-03-30 22:45:45 +01:00
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
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
720bde6543
Merge pull request #933 from teward/patch-1
...
Update 'User Deleted' message to match format
2015-03-30 18:02:43 +01:00
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
39f593fedf
ignore temporary object files
2015-03-21 14:17:53 +00:00
9814f2a258
Add missing help text for ClearAllBuffers ( close #924 )
2015-03-12 19:07:00 +01:00
3f73231665
Merge pull request #918 from jpnurmi/weffc++
...
Fix warnings of -Weffc++ [-Weffc++] (#270 )
2015-03-07 22:03:10 +00:00
e62ed5f300
modperl & modpython: fix GetType() at module construction time
2015-03-07 21:54:33 +01:00
5aa8b0dcef
Fix copy ctor/assignment oper warnings of -Weffc++ ( #270 )
2015-03-07 21:54:33 +01:00
Alexey Sokolov