3906 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
James Booth	03117fd12f	Merge branch 'master' into osx-functional	2015-08-31 02:11:01 +01:00
James Booth	508f858b0b	Added libgpgme-devel to Cygwin dependencies install-all.sh	2015-08-31 00:18:28 +01:00
James Booth	0a2df8ae89	Merge branch 'master' into osx-functional	2015-08-30 02:13:03 +01:00
James Booth	688be91c23	PGP: Format fingerprints	2015-08-30 02:12:05 +01:00
James Booth	816274457e	Merge branch 'master' into osx-functional	2015-08-30 01:37:33 +01:00
James Booth	b4722632b6	Split PGP incoming and outgoing message handling	2015-08-30 01:32:13 +01:00
James Booth	d7b56a468d	Merge branch 'master' into osx-functional	2015-08-27 00:42:27 +01:00
James Booth	1484e94b35	Fixed OTR decryption check	2015-08-27 00:37:48 +01:00
James Booth	ef52840d91	Added str_contains_str to common	2015-08-26 23:52:40 +01:00
James Booth	55158767cc	Renamed enc_message parameter for incoming messages	2015-08-26 23:23:12 +01:00
James Booth	4b90a53566	Tidied sv_ev_incoming_message	2015-08-26 23:15:10 +01:00
James Booth	0cf0b2c37e	Disable travis build in osx-functional branch	2015-08-26 21:52:34 +01:00
James Booth	fba46b71b1	Merge branch 'master' into osx-functional	2015-08-26 21:42:49 +01:00
James Booth	fc60c9fbf1	Fixed OTR char display	2015-08-26 21:42:16 +01:00
James Booth	c673e2fae5	Merge branch 'master' into osx-functional	2015-08-26 01:50:14 +01:00
James Booth	5e962fe0f5	Fixed compile when no OTR or PGP support	2015-08-26 01:48:21 +01:00
James Booth	9e9d31cbac	Merge branch 'master' into osx-functional	2015-08-26 01:38:14 +01:00
James Booth	35239ee319	Added otr and pgp char to themes	2015-08-26 01:36:41 +01:00
James Booth	98ea744648	Added /otr char and /pgp char	2015-08-26 01:24:53 +01:00
James Booth	1bf584793f	Added preference for encryption char	2015-08-26 01:06:10 +01:00
James Booth	48630d45a4	Added check for libgpgme on account autocomplete	2015-08-26 00:48:01 +01:00
James Booth	4625651340	Fixed test stubs	2015-08-26 00:45:09 +01:00
James Booth	f998ab8f3b	Display special char for encrypted messages	2015-08-26 00:42:56 +01:00
James Booth	4b0ee89fa3	PGP: Added key ID autocompletion to /account setting	2015-08-25 23:48:21 +01:00
James Booth	cb19be2ffc	Added PGP key autocompleter	2015-08-25 23:44:03 +01:00
James Booth	55c2d1cc21	PGP: Display whether contact public key was received or manually set	2015-08-25 23:04:21 +01:00
James Booth	fc1ee79190	PGP: Show key IDs for assigned public keys	2015-08-25 22:45:51 +01:00
James Booth	592a3695a5	PGP: Do not save contact's fingerprint when no key found	2015-08-25 21:58:24 +01:00
James Booth	b285dd943e	Merge branch 'master' into osx-functional	2015-08-25 20:42:06 +01:00
James Booth	872ab8e529	Added HAVE_LIBGPGME check for setting account key	2015-08-25 20:35:45 +01:00
James Booth	c5184e8060	Merge branch 'master' into osx-functional	2015-08-25 00:22:49 +01:00
James Booth	f6a91145b6	Show public/private indicator when listing PGP keys	2015-08-25 00:21:49 +01:00
James Booth	d6ff72cf48	Show public keys in PGP key list	2015-08-24 22:27:15 +01:00
James Booth	6700f9afbb	Merge branch 'master' into osx-functional	2015-08-24 00:18:23 +01:00
James Booth	525876770a	Removed unused barejid argument from PGP decryption	2015-08-24 00:13:57 +01:00
James Booth	d61e1b3149	Merge branch 'master' into osx-functional	2015-08-23 23:58:41 +01:00
James Booth	b8b54f91a5	Leave chat rooms before receiving self unavailable presence ... Fixes bug for servers that don't send the self presence	2015-08-23 23:56:34 +01:00
James Booth	be802b7221	Merge branch 'master' into osx-functional	2015-08-23 23:12:46 +01:00
James Booth	b1ab4b2854	Added JID to log when failing to load PGP fingerprint ... Added PGP stub for tests	2015-08-23 23:09:44 +01:00
James Booth	8501d1db33	Validate PGP key when chosen for account	2015-08-23 23:05:39 +01:00
James Booth	57ca441f02	Check for valid PGP key on start	2015-08-23 22:54:41 +01:00
James Booth	c07638746a	Log recipient used for PGP decryption	2015-08-23 22:18:54 +01:00
James Booth	a24a8e6019	Merge branch 'master' into osx-functional	2015-08-20 22:24:17 +01:00
James Booth	d791e4dd59	Free OTR TLVS	2015-08-20 22:23:31 +01:00
James Booth	c18b7f4d67	Free id for OTR messages	2015-08-20 22:02:58 +01:00
James Booth	f1a575de26	Merge branch 'master' into osx-functional	2015-08-20 21:27:47 +01:00
James Booth	3000916ad9	Added roster.empty to themes	2015-08-20 21:26:16 +01:00
James Booth	97a70e3123	Merge branch 'master' into osx-functional	2015-08-11 01:02:08 +01:00
James Booth	2af5c151a0	Tidied pgp memory allocations	2015-08-11 01:00:23 +01:00
James Booth	e2a528cad4	Free pgp key on connect	2015-08-10 22:18:19 +01:00