Alexey Sokolov 3e458a98e4 Merge some work by Jens-Andre Koch ...

Only his changes to the core are presented here.
Unfortunately, the skin itself looks ugly on Opera,
and simply doesn't work on Firefox...

Merge branch 'master' into znc-ation

Conflicts:
	modules/data/lastseen/tmpl/lastseen_WebadminUser.tmpl
	modules/data/webadmin/tmpl/settings.tmpl

2012-04-10 23:19:15 +07:00

..

Buffer.cpp

Use @t=time instead of @time for server-time capability.

2012-01-15 12:51:03 +07:00

Chan.cpp

ResetJoinTries once we enable a channel

2012-03-21 22:25:45 +00:00

Client.cpp

Allow disabling the use of adding networks for non admins

2012-02-15 16:27:47 +00:00

ClientCommand.cpp

Add SSL/IPv6/DNS info to znc --version

2012-03-15 01:38:37 +07:00

Config.cpp

Welcome in 2012

2012-01-01 09:30:19 +01:00

Csocket.cpp

Csock: able use non-int number of secs for timer.

2012-03-20 09:03:44 +07:00

FileUtils.cpp

CFile: Make sure errno is always set correctly

2012-01-22 18:51:01 +01:00

HTTPSock.cpp

Serve web pages as utf-8

2012-03-23 11:53:20 +07:00

IRCNetwork.cpp

Rewrite the JOIN channel logic, dropping MaxJoins

2012-03-21 22:06:54 +00:00

IRCSock.cpp

Fix an dangerous substr() call

2012-03-30 23:13:03 +02:00

Listener.cpp

Update Csocket to e00323f9f18

2012-01-14 11:33:38 +01:00

main.cpp

Add SSL/IPv6/DNS info to znc --version

2012-03-15 01:38:37 +07:00

MD5.cpp

Move core .cpp files to src/

2011-09-23 03:33:13 +07:00

Modules.cpp

Csock: able use non-int number of secs for timer.

2012-03-20 09:03:44 +07:00

Nick.cpp

Welcome in 2012

2012-01-01 09:30:19 +01:00

Server.cpp

Welcome in 2012

2012-01-01 09:30:19 +01:00

SHA256.cpp

Move core .cpp files to src/

2011-09-23 03:33:13 +07:00

Socket.cpp

A bit more debug output for tdns

2012-03-24 00:36:13 +07:00

Template.cpp

Welcome in 2012

2012-01-01 09:30:19 +01:00

User.cpp

Deprecate TimezoneOffset

2012-03-22 23:21:25 +07:00

Utils.cpp

Show list of timezones in webadmin.

2012-03-23 01:16:25 +07:00

WebModules.cpp

Merge some work by Jens-Andre Koch

2012-04-10 23:19:15 +07:00

znc.cpp

Show link to http://znc.in from web

2012-03-22 04:27:26 +07:00

ZNCDebug.cpp

Welcome in 2012

2012-01-01 09:30:19 +01:00

ZNCString.cpp

CString("off").ToBool() shouldn't be true

2012-03-06 18:00:43 +00:00