Commit Graph

3970 Commits

Author SHA1 Message Date
Alexey Sokolov e8d0dcc2bc Merge commit 'refs/pull/980/head' of github.com:znc/znc 2015-06-29 20:28:48 +01:00
Alexey Sokolov 5faaf67f48 Fix doxygen of CModule::GetNetwork() and CModule::GetClient()
Thanks to BtbN for reporting this.
2015-06-23 21:06:25 +01:00
Mikaela Suomalainen 3aec1c73f2 IRCNetwork.h: lower ping frequency & timeout
Ref: #979
2015-06-22 08:25:14 +03:00
Alexey Sokolov a314d3057e Merge branch '1.6.x' 2015-06-05 08:06:15 +01:00
Alexey Sokolov fce3d781bb Mention ExpandString in CTCP replies in webadmin 2015-06-05 08:04:33 +01:00
Alexey Sokolov 2f65dbbc64 Integrate disconkick module to core.
Fix #968
2015-06-04 22:02:39 +01:00
Alexey Sokolov f8f097a5db Make CTCP replies editor in webadmin more fancy when JS is enabled. 2015-06-04 21:39:37 +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 c2733f9f3e Merge pull request #970 from DarthGandalf/server-list
Make server editor in webadmin more fancy, when JS is enabled
2015-06-03 23:22:12 +01:00
Alexey Sokolov 477a9ddd5a Make server editor in webadmin more fancy, when JS is enabled
See #145
2015-06-03 00:18:17 +01:00
Alexey Sokolov a3ed8147d0 Merge pull request #860 from ammaraskar/table_sorting
Implement table sorting in webadmin, addresses #40
2015-05-10 17:02:32 +01:00
Alexey Sokolov a08d0497f9 User's PKG_CONFIG_PATH should be preferred over what was found using homebrew 2015-05-09 22:21:09 +01:00
Alexey Sokolov 0cdda5ad93 Merge pull request #962 from wolfy1339/pr-455-fix
Add third class to the port input [Fixes #446]
2015-05-09 08:48:44 +01:00
wolfy1339 9d61e5a400 Add third class to the port input [Fixes #446]
Addimg this class makes it so the input has a defined width.
Fixes znc/znc#446
2015-05-07 18:43:29 -04:00
Alexey Sokolov 1d5b08fa03 Merge pull request #961 from wolfy1339/exra-td
Add extra td [Fixes #446]
2015-05-07 20:09:31 +01:00
wolfy1339 7c94c2cb34 Add extra td
Fixes znc/znc#446
2015-05-06 20:24:33 -04:00
Alexey Sokolov 1cce7f698f configure: change output style of homebrew detection 2015-05-04 14:23:29 +01:00
Alexey Sokolov da279f9622 Setup continuous testing on cygwin using AppVeyor 2015-05-04 10:17:58 +01:00
Alexey Sokolov 0aa4322cea Update Csocket
- Fix build on cygwin 2.0.1
- Use C API of libicu instead of C++ API
2015-05-04 08:59:36 +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
Alexey Sokolov d335c3cdf6 configure.ac: specify required compiler versions
Close #956
2015-04-28 21:36:25 +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
Alexey Sokolov dc755ee3e6 Merge pull request #950 from jpnurmi/echo-message
Implement IRCv3.2 echo-message capability on the "client side"
2015-04-26 19:55:08 +01:00
Alexey Sokolov bb4060ce5e Add non-minified versions of jQuery-UI and Selectize.
Also upgrade selectize to 0.12.1.
Make Debian happy.
2015-04-26 19:36:34 +01:00
Alexey Sokolov b2b4806320 Merge branch '1.6.x' 2015-04-26 19:23:57 +01:00
Alexey Sokolov f8d2c32e9a Add non-minified jQuery's source.
jQuery's license (MIT) does *NOT* require this.
But Debian is not happy without it.
2015-04-26 19:21:40 +01: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 4f4872a899 Update comment about CTable 2015-04-19 22:51:24 +01: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 880713dcfc Main ZNC IRC channel is on freenode.
876 users vs. 220 on efnet.
Fix #895
2015-04-18 10:05:37 +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 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
Alexey Sokolov b4d8e5152d Update Csocket 2015-04-07 20:10:36 +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