Commit Graph

3502 Commits

Author SHA1 Message Date
J-P Nurmi 25609ec0bb makeconf: improve alternate location handling 2014-09-07 22:57:12 +02:00
J-P Nurmi 6ec56778e5 makeconf: just warn if the config exists
Don’t require typing yes to continue, it’s inconvenient.
2014-09-07 22:57:12 +02:00
J-P Nurmi a489304a0e makeconf: offer SSL by default if the port is 6697 2014-09-07 22:57:12 +02:00
J-P Nurmi 69e38cafe2 makeconf: use username instead of nick as ident
Username and ident are more likely to match.
2014-09-07 22:57:12 +02:00
J-P Nurmi 139282fe38 makeconf: kill buffer and chan mode questions
Use webadmin/controlpanel to configure buffers and default chan modes
2014-09-07 21:25:07 +02:00
J-P Nurmi 396bdb1eba Utils: improve password prompt
Check if the password is empty before asking to confirm it.
2014-09-07 21:23:28 +02:00
J-P Nurmi b4c0522e78 Utils: fix indentation of bold messages 2014-09-07 21:23:28 +02:00
J-P Nurmi d260d6888f Utils: don't capitalize password 2014-09-07 21:23:28 +02:00
Alexey Sokolov 8ec2a0940c Merge pull request #629 from jpnurmi/help
Revise *status and *controlpanel help output
2014-09-07 16:24:49 +01:00
J-P Nurmi df08352148 Revise *controlpanel help output
Make the output easier to read by wrapping mandatory argument names
with angle brackets (just like in *status help), and make it possible
to output help for given command(s). Furthermore, output only relevant
variable lists and align casing & arguments in general help & command
specific usage output.
2014-09-07 10:54:00 +02:00
Alexey Sokolov 25ba72cb43 Merge pull request #634 from jpnurmi/webadmin
Fix #624: Can´t rename network via webinterface
2014-09-06 23:24:43 +01:00
J-P Nurmi 2e42f3103c Fix #624: Can´t rename network via webinterface 2014-09-06 23:15:50 +02:00
J-P Nurmi aec99ea213 Revise *status help output
Make it possible to output help for given command(s) and align
casing & arguments in general help & command specific usage output.
2014-09-06 21:14:35 +02:00
Alexey Sokolov 0065506ff6 Merge pull request #653 from BtbN/opensslthreads
Initialize OpenSSL locking functions
2014-09-05 23:08:42 +01:00
BtbN 7b7d10fd84 Remove _GLIBCXX_CONCEPT_CHECKS debug define
This debug feature does not support any C++11 features.
It breaks for example the compilation of vector<unique_ptr>.

The upstream issue is:
https://gcc.gnu.org/bugzilla/show_bug.cgi?id=57011
2014-09-05 23:56:41 +02:00
Alexey Sokolov edf5e187a7 Merge pull request #633 from jpnurmi/flooddetach
flooddetach: add command "silent [yes|no]"
2014-09-05 21:52:11 +01:00
BtbN 40d1dc1883 Initialize OpenSSL locking functions 2014-09-05 16:34:36 +02:00
J-P Nurmi 5279bb62a0 flooddetach: add command "silent [yes|no]"
Inspired by the route_replis module. Resolves #591.
2014-09-04 10:01:11 +02:00
Alexey Sokolov 5f480afad2 Merge pull request #632 from jpnurmi/altnick
Fix #631: ZNC fails at finding an available nick name
2014-09-04 07:41:30 +01:00
Alexey Sokolov 72bef65fa9 Merge pull request #645 from NuclearW/awaystore-ctcpaction
Reset timer & return from away when a client does a CTCP ACTION
2014-09-04 06:33:12 +01:00
Alexey Sokolov a36cc030c0 Merge pull request #651 from znc/revert-612-opensslthreads
Revert "Initialize OpenSSL locking functions"
2014-09-04 06:24:17 +01:00
Alexey Sokolov 487ff9acc4 Revert "Initialize OpenSSL locking functions" 2014-09-04 06:13:15 +01:00
Alexey Sokolov 7274340b26 Merge pull request #612 from BtbN/opensslthreads
Initialize OpenSSL locking functions
2014-09-04 00:23:50 +01:00
Alexey Sokolov 6621b81d4c Merge pull request #650 from jpnurmi/indentation
makeconf: fix indentation of LoadModule lines
2014-09-04 00:12:57 +01:00
J-P Nurmi c087355c48 makeconf: fix indentation of LoadModule lines
7387f00 missed the tabs
2014-09-03 23:47:06 +02:00
NuclearW a1579b7ea4 Reset timer & return from away when a client does a CTCP ACTION 2014-08-28 13:59:54 -04:00
Uli Schlachter 0908023a63 Merge pull request #635 from maksqwe/fix_state
bouncedcc: Fix test for "Connected" state
2014-08-20 10:28:36 +02:00
Maks Naumov 42b0a794d9 bouncedcc: Fix test for "Connected" state 2014-08-20 11:16:34 +03:00
J-P Nurmi 44b10b5b97 flooddetach: make secs & lines commands rw
Improves the usability of the module.
2014-08-19 20:08:12 +02:00
J-P Nurmi e5e0bb356e Refactor flooddetach to use command callbacks
This gives a proper help command "for free", and makes
it more pleasant to add new commands (silent) later.
2014-08-19 20:06:04 +02:00
J-P Nurmi e6a7bbab75 Fix #631: ZNC fails at finding an available nick name 2014-08-19 18:15:26 +02:00
Alexey Sokolov acaf44f7d5 Merge pull request #630 from jpnurmi/delchan
controlpanel: make delchan support wildcards (resolves #609)
2014-08-18 21:41:05 +01:00
J-P Nurmi e48fe0a4fc controlpanel: make delchan support wildcards (resolves #609) 2014-08-18 22:27:06 +02:00
Alexey Sokolov c5e69fa199 Merge pull request #626 from jpnurmi/makeconf
Get rid of the module questions during --makeconf (#541)
2014-08-18 20:40:42 +01:00
J-P Nurmi 7387f00408 Get rid of the module questions during --makeconf
The following modules are enabled by default:
- global: webadmin
- user: controlpanel, chansaver
- network: simple_away

This reduces a lot makeconf noise and fixes #541.
2014-08-17 15:37:50 +02:00
Alexey Sokolov 700c899698 Fix build on cygwin after switch to -std=c++11 2014-08-14 00:17:13 +01:00
Alexey Sokolov 2f9b8f9f52 Fix build on MacOSX.
std::bind conflicted with ::bind
Patch to csocket is already upstream.
2014-08-12 00:20:18 +01:00
Alexey Sokolov 3f87b2fdae Merge pull request #618 from DarthGandalf/cxx11
Enable C++11.
2014-08-11 21:36:56 +01:00
Alexey Sokolov 3db0c0bc40 Merge pull request #627 from jpnurmi/overwrite
Make --makeconf warn early about an existing config (#572)
2014-08-11 21:18:10 +01:00
Alexey Sokolov 1f89b67a88 Enable C++11.
It bumps requirements for SWIG to 3.0.0, and for compiler.
2014-08-11 21:13:53 +01:00
Alexey Sokolov f464066088 Merge pull request #616 from psychon/module-jobs2
Add support for CJob cancellation and necessary module support
2014-08-11 21:09:57 +01:00
Alexey Sokolov bfbdac2de3 Fix travis mail in commits to docs. 2014-08-11 20:50:08 +01:00
J-P Nurmi fb0dcc0dd9 Make --makeconf warn early about an existing config (#572) 2014-08-11 10:37:26 +02:00
Uli Schlachter e0e86e8b02 CThreadPool::cancelJobs(): Add a comment explaining the logic a bit
Signed-off-by: Uli Schlachter <psychon@znc.in>
2014-08-11 09:09:38 +02:00
Uli Schlachter 74fdd97a52 CJob: Even cancel finished jobs
When a job was cancelled after its runThread() method finished, but before the
main thread noticed this and reacted, we would just run runMain() before and
pretend the job finished normally.

However, with CModuleJob this means that runMain() might get called for a module
which is currently being destructed. This has bad effects with virtual functions
and thus causes problems. It's better to just really cancel the job instead.

Signed-off-by: Uli Schlachter <psychon@znc.in>
2014-08-11 09:09:38 +02:00
Alexey Sokolov f2f3edb9e1 travis: Use only 3 cores, not all of them.
There's no enough memory for so big parallelism:
https://travis-ci.org/znc/znc/builds/32185840
2014-08-11 08:08:35 +01:00
Alexey Sokolov 2aecdf0be2 Merge pull request #622 from Mkaysi/master
.travis.yml: use more CPUs for compiling
2014-08-10 17:40:56 +01:00
Mikaela Suomalainen 6a1af6bf89 .travis.yml: use more CPUs for compiling 2014-08-10 16:01:14 +03:00
Alexey Sokolov da378afe85 Merge pull request #619 from jpnurmi/cchan-sendbuffer
Fix CChan::SendBuffer()
2014-08-09 09:07:29 +01:00
J-P Nurmi f238a24190 Fix CChan::SendBuffer()
The CChan::SendBuffer(CClient,CBuffer) overload should just playback
the given buffer and obviously not clear the channel's own buffer
=> auto-clear the buffer in CChan::SendBuffer(CClient) as appropriate.
2014-08-08 23:36:21 +02:00