Commit Graph

550 Commits

Author SHA1 Message Date
J-P Nurmi d6d57cb708 Merge branch '1.6.x' 2015-08-01 12:44:06 +02:00
J-P Nurmi ad99d5f46e Merge pull request #1013 from DarthGandalf/cap-end
Support "CAP :END"
2015-08-01 12:33:26 +02:00
J-P Nurmi b16faf5058 Merge pull request #990 from jpnurmi/reset
Allow reseting channel specific AutoClearChanBuffer & Buffer settings
2015-08-01 12:30:36 +02:00
J-P Nurmi 824cb3cc56 Merge pull request #1011 from jpnurmi/disconkick
src/IRCSock.cpp: use *status as kicker
2015-08-01 01:02:14 +02:00
J-P Nurmi 015a8f6502 Merge branch '1.6.x'
Conflicts:
	src/Client.cpp
	znc-buildmod.in
2015-07-31 23:56:04 +02:00
J-P Nurmi 53d9161b20 Merge pull request #998 from jpnurmi/buffer
Resolve #967: separate chan & query buffer size settings
2015-07-31 22:51:03 +02:00
J-P Nurmi ef06901966 Merge pull request #996 from jpnurmi/account-notify
Add support for account-notify and extended-join
2015-07-31 21:50:36 +02:00
Alexey Sokolov 89e99bfe35 Support "CAP :END"
Thanks to jaybe for complaining about this.
2015-07-30 22:01:11 +01:00
J-P Nurmi 405546e94c src/IRCSock.cpp: use *status as kicker
Closes #649
2015-07-28 17:45:18 +02:00
J-P Nurmi b2c83321ef Fix #1008: Channel keys get saved in a very wrong way 2015-07-27 02:06:21 +02:00
J-P Nurmi 496a132e32 Resolve #967: separate chan & query buffer size settings 2015-07-19 00:31:10 +02:00
J-P Nurmi 9242307ff7 Merge branch '1.6.x'
Conflicts:
	README.md
	modules/data/webadmin/tmpl/settings.tmpl
	src/Query.cpp
2015-07-14 23:11:17 +02:00
J-P Nurmi d39b20b505 Fix sources to include their respective header 2015-07-14 19:05:23 +02:00
J-P Nurmi 6246899c56 Add support for extended-join (#316) 2015-07-14 18:29:33 +02:00
J-P Nurmi d070a6e644 Add support for account-notify (#316) 2015-07-14 17:02:16 +02:00
J-P Nurmi d18601180b Align server-side cap handling code with the client-side
Based on d7a6a136db - to make it more
straight-forward to add support for more server-side capabilities.
2015-07-14 16:57:53 +02:00
J-P Nurmi f28640fe3f Merge pull request #957 from jpnurmi/cap-notify
Add cap-notify & away-notify support
2015-07-12 19:34:31 +02:00
J-P Nurmi 0d75018157 Allow reseting channel specific AutoClearChanBuffer & Buffer settings
The trick is to set the value to "-" in controlpanel. Notice that
controlpanel supports wildcards, so this can be used to easily
reset all channels back to defaults if desired.
2015-07-08 22:56:18 +02:00
Alexey Sokolov bae8724a16 Fix build after previous commit... 2015-07-07 22:26:56 +01:00
Alexey Sokolov 326040cf08 Fix query buffer size for users who has 0 in default channel buffer size.
Users who upgrade from <=1.4 to 1.6.0 and have configured 0 for channel buffer, were silently not getting any queries while disconnected anymore.
Thanks to jpnurmi for the idea how to bandaid this in 1.6.x branch.
Proper fix will go to 1.7 and will take form of separate settings for channel and query buffers.

See #967
2015-07-07 20:58:56 +01:00
Alexey Sokolov f909dc568a Merge branch '1.6.x' 2015-07-07 20:08:01 +01:00
Pavel Djundik 3bc7b820ac Don't print local ip address on 404 page, fixes #944
(cherry picked from commit 01279a4efa)
2015-07-07 20:07:02 +01:00
J-P Nurmi 1fb321703d Add away-notify support - close #315 2015-07-05 13:33:27 +02:00
J-P Nurmi 089a0fd925 Add cap-notify support
This change alone doesn’t notify any capabilities to clients, but makes
ZNC itself offer cap-notify and builds the foundations for various
notifiable capabilities, such as away-notify, can be easily added.
2015-07-05 13:33:27 +02:00
Alexey Sokolov 2f65dbbc64 Integrate disconkick module to core.
Fix #968
2015-06-04 22:02:39 +01:00
Alexey Sokolov 8552ca0ff9 Bump accepted line length to 2048
To allow message tags and still have some buffer for cases
when server sends too long lines

Related to #971
2015-06-04 08:05:15 +01:00
Alexey Sokolov 8f9aad4580 Merge branch '1.6.x'
Conflicts:
	src/User.cpp
2015-04-28 21:44:07 +01:00
Alexey Sokolov 63a938478a Merge branch 'cap' 2015-04-28 21:41:04 +01:00
J-P Nurmi 28393c309b Fix #954: Startup failure when simple_away is loaded after awaynick 2015-04-28 21:36:25 +01:00
Alexey Sokolov d7a6a136db Update capability names as they are named in IRCv3.2.
Old names will be available for a while, then removed.
self-message is superseded by echo-message and will be removed in future
too.
2015-04-26 22:37:27 +01:00
Alexey Sokolov 06e365215b Remove CAP CLEAR, because it's useless, and got deprecated in IRCv3.1 2015-04-26 22:36:36 +01:00
J-P Nurmi 7839a596a3 modules: make help more compact
Same as c7b2aea7da but for modules
2015-04-26 21:53:59 +02:00
J-P Nurmi e3954f4824 Implement IRCv3.2 echo-message capability on the "client side"
http://ircv3.net/specs/extensions/echo-message-3.2.html

TODO: Add echo-message support to CIRCSock when IRCds start supporting it.
Manual echoing won't be necessary for networks that support echo-message.
2015-04-26 19:49:39 +02:00
Alexey Sokolov 21458de7d0 Merge branch '1.6.x'
Conflicts:
	src/Utils.cpp
2015-04-18 17:57:51 +01:00
Alexey Sokolov 00404b8cbb Revert "Make tables... not so tabular."
This reverts commit 2c3064fb56.
2015-04-18 17:38:56 +01:00
Alexey Sokolov 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
Alexey Sokolov 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
Alexey Sokolov 7719213ea6 Merge branch '1.6.x' 2015-04-16 20:32:58 +01:00
Alexey Sokolov 7c64eba693 Last commit broke async auth, e.g. via imapauth. Fix it.
See #946
2015-04-16 20:31:31 +01:00
Alexey Sokolov 0b205db494 Merge branch '1.6.x' 2015-04-16 01:24:43 +01:00
Alexey Sokolov 0167a827a7 Fix compilation warning 2015-04-16 01:23:57 +01:00
Alexey Sokolov eedcd4c4de Fix rare conflict of HTTP-Basic auth and cookies.
Fix #946
2015-04-16 01:21:57 +01:00
Alexey Sokolov c7b2aea7da Make help non-table more compact. 2015-04-09 21:25:42 +01:00
Alexey Sokolov 926989342c Cleanup CTable after making it not a table earlier 2015-04-09 21:12:21 +01:00
Alexey Sokolov 1df5d91a53 Merge branch '1.6.x' 2015-04-09 21:06:09 +01:00
Alexey Sokolov 2c3064fb56 Make tables... not so tabular.
Fix #743
Fix #914
Close #922
2015-04-09 07:34:00 +01:00
Alexey Sokolov d884ff76c0 Merge branch '1.6.x' 2015-04-06 22:42:25 +01:00
Alexey Sokolov 21834d3aba Improve breadcrumbs in webadmin.
Fix #227
2015-04-06 22:40:55 +01:00
Alexey Sokolov 70cc4285f9 Merge branch '1.6.x' 2015-04-06 20:43:41 +01:00
Alexey Sokolov 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