5041 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
James Booth	98b77fa6d2	Merge branch 'master' into osx-functional ... Conflicts: .travis.yml tests/functionaltests/functionaltests.c	2016-09-03 23:12:18 +01:00
James Booth	bd51ab83d6	Travis build: Run unit tests once	2016-09-03 23:07:16 +01:00
James Booth	f6e9ff5b9b	Fix missing params	2016-09-03 22:53:32 +01:00
James Booth	0fe35d5f05	Merge pull request #845 from pasis/tray ... Fix implicit declaration of function free	2016-09-03 22:39:16 +01:00
James Booth	bb7314c3fc	Merge pull request #846 from pasis/client_events ... Add missed argument	2016-09-03 22:30:12 +01:00
James Booth	b5b73ab8ff	Add travis build script	2016-09-03 22:26:14 +01:00
James Booth	22e53c9fdc	Add travis build script	2016-09-03 22:25:26 +01:00
Dmitry Podgorny	6090f76f72	Add missed argument	2016-09-02 20:56:20 +03:00
Dmitry Podgorny	5be8f5f560	Fix implicit declaration of function free	2016-09-02 20:53:41 +03:00
James Booth	47a1a62009	Add sv_ev_bookmark_autojoin	2016-08-28 22:42:09 +01:00
James Booth	ea98a8b04a	Rename Bookmark->jid to Bookmark->barejid	2016-08-28 22:12:50 +01:00
James Booth	6a18dedca8	Fixed typos	2016-08-28 17:30:15 +01:00
James Booth	fca59a3110	log_info on private carbons	2016-08-28 17:27:26 +01:00
James Booth	9ca6d9ef8b	Merge branch 'master' into osx-functional	2016-08-22 22:26:05 +01:00
James Booth	ea9216f054	Change autoping timeout default to 20 seconds	2016-08-22 22:22:43 +01:00
James Booth	5f9360446c	Merge branch 'master' into osx-functional	2016-08-22 00:40:18 +01:00
James Booth	ab1337af01	Merge remote-tracking branch 'origin/master'	2016-08-22 00:38:18 +01:00
James Booth	f14a3e075e	Update help	2016-08-22 00:34:35 +01:00
James Booth	be40e206fb	Update CHANGELOG	2016-08-21 23:58:56 +01:00
James Booth	a49c63fc75	Updated man page	2016-08-21 23:48:22 +01:00
James Booth	2612b72d18	Update CHANGELOG	2016-08-21 23:44:55 +01:00
James Booth	698a35aec9	Merge branch 'master' into osx-functional	2016-08-21 15:27:07 +01:00
James Booth	0886062806	Use hash table for bookmarks	2016-08-21 15:25:49 +01:00
James Booth	9f14e2c0aa	Merge branch 'master' into osx-functional	2016-08-21 00:58:49 +01:00
James Booth	a52230978f	Tidy presence.c	2016-08-20 23:31:27 +01:00
James Booth	948d63d855	Tidy _handle_carbons	2016-08-20 21:37:20 +01:00
James Booth	63f1798158	Merge branch 'master' into osx-functional	2016-08-20 20:42:05 +01:00
James Booth	583fb2b8c6	Use libstrophe xmpp_presence_new convenience function	2016-08-20 20:37:48 +01:00
James Booth	27263508c7	Use libstrophe xmpp_iq_new convenience function	2016-08-20 20:20:38 +01:00
James Booth	d61abd3577	Use libstrophe xmpp_message_get_body convenience function	2016-08-20 19:23:32 +01:00
James Booth	39ff399626	Use libstrophe xmpp_message_new convenience function	2016-08-20 19:08:13 +01:00
James Booth	45048e3ac8	Replace stanza_create_message with libstrophe convenience functions	2016-08-20 18:51:19 +01:00
James Booth	24c3eff428	Use libstrophe convenience functions for stanza attributes	2016-08-20 18:16:51 +01:00
James Booth	b6ab90124b	Merge branch 'master' into osx-functional	2016-08-18 22:56:12 +01:00
James Booth	a978bb12bf	Send receipt request only when receiver supports feature ... issue #829	2016-08-18 22:53:23 +01:00
James Booth	3f9a61c336	Merge branch 'master' into osx-functional	2016-08-18 00:31:38 +01:00
James Booth	71dcb2e427	Only include lastactivity feature in disco responses when enabled	2016-08-18 00:29:33 +01:00
James Booth	61072e4cef	Merge branch 'master' into osx-functional	2016-08-18 00:16:12 +01:00
James Booth	4de570b1ee	Only include receipts feature in disco responses when enabled ... issue #829	2016-08-18 00:10:15 +01:00
James Booth	ecc2d3face	Merge branch 'master' into osx-functional	2016-08-17 23:49:47 +01:00
James Booth	41acaee955	Use hashtable to store profanity disco features	2016-08-17 23:49:20 +01:00
James Booth	45010e35b5	Merge branch 'master' into osx-functional	2016-08-17 23:35:12 +01:00
James Booth	7b22c813c8	Copy feature strings on caps_get_features	2016-08-17 23:32:43 +01:00
James Booth	92668611da	Merge branch 'master' into osx-functional	2016-08-17 23:22:42 +01:00
James Booth	9945246a64	Use hashtables for plugin disco features	2016-08-17 23:21:48 +01:00
James Booth	cd919b4854	Merge branch 'master' into osx-functional	2016-08-14 01:06:41 +01:00
James Booth	8b6549b36c	Add caps_create	2016-08-14 01:06:13 +01:00
James Booth	b26c961730	Move caps_create -> stanza_create_caps_from_query_element	2016-08-14 00:15:03 +01:00
James Booth	d5f14abd4e	Move caps_create_sha1_str -> stanza_create_caps_sha1_from_query	2016-08-14 00:07:08 +01:00
James Booth	9c4e02db77	Move caps static functions	2016-08-13 23:53:41 +01:00