James Booth 14ede0e44c Merge branch 'master' into roomconfig ...

Conflicts:
	src/server_events.h

2014-09-07 21:54:04 +01:00

..

bookmark.c

Removed bookmarks todo

2014-08-31 23:11:30 +01:00

bookmark.h

Added license exemption for OpenSSL to source headers

2014-08-24 20:57:39 +01:00

capabilities.c

Rewrite form parser

2014-09-06 22:40:57 +01:00

capabilities.h

Added license exemption for OpenSSL to source headers

2014-08-24 20:57:39 +01:00

connection.c

Small spelling fixes in code and comments

2014-08-27 13:26:11 +02:00

connection.h

Added license exemption for OpenSSL to source headers

2014-08-24 20:57:39 +01:00

form.c

Removed unnecessary NULL checks when freeing form

2014-09-07 14:13:44 +01:00

form.h

Created form module

2014-09-05 21:04:16 +01:00

iq.c

Merge branch 'master' into roomconfig

2014-09-07 21:54:04 +01:00

iq.h

Added license exemption for OpenSSL to source headers

2014-08-24 20:57:39 +01:00

message.c

Added license exemption for OpenSSL to source headers

2014-08-24 20:57:39 +01:00

message.h

Added license exemption for OpenSSL to source headers

2014-08-24 20:57:39 +01:00

presence.c

Show message when room requires config

2014-09-03 00:23:04 +01:00

presence.h

Added license exemption for OpenSSL to source headers

2014-08-24 20:57:39 +01:00

roster.c

Added license exemption for OpenSSL to source headers

2014-08-24 20:57:39 +01:00

roster.h

Added license exemption for OpenSSL to source headers

2014-08-24 20:57:39 +01:00

stanza.c

Created form module

2014-09-05 21:04:16 +01:00

stanza.h

Parse data form for room configuration

2014-09-04 23:15:51 +01:00

xmpp.h

Rewrite form parser

2014-09-06 22:40:57 +01:00