3935 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
James Booth	a3dccce2fa	Updated CHANGELOG	2015-09-15 19:13:07 +01:00
James Booth	c42921cb92	Merge branch 'master' into osx-functional	2015-09-09 23:03:34 +01:00
James Booth	232cc7601d	Added otr and pgp to /prefs command help	2015-09-09 22:59:47 +01:00
James Booth	22c1144f6a	Merge branch 'master' into osx-functional	2015-09-09 22:40:48 +01:00
James Booth	03ee1d56e6	Added conference and receipts features to caps query response	2015-09-09 22:36:07 +01:00
James Booth	99eac102d6	Merge branch 'master' into osx-functional	2015-09-09 19:32:04 +01:00
James Booth	fed6128bbc	Spelling fix	2015-09-09 19:31:11 +01:00
James Booth	94b685d692	Merge branch 'master' into osx-functional	2015-09-08 20:21:55 +01:00
James Booth	b266e4d035	Pass delay timestamp to all incoming chat events	2015-09-08 20:18:31 +01:00
James Booth	b4b2b9c907	Merge branch 'master' into osx-functional	2015-09-06 22:28:40 +01:00
James Booth	3883e04d24	Added install-all.sh gpg dependency for opensuse	2015-09-06 21:54:28 +01:00
James Booth	0dd3f7a476	Merge branch 'master' into osx-functional	2015-09-04 00:19:57 +01:00
James Booth	a37344f8dd	Fixed fedora uuid dependency	2015-09-04 00:12:32 +01:00
James Booth	5b99c1976c	Updated fedora dependencies in install-all.sh	2015-09-03 23:57:06 +01:00
James Booth	a0f034c6a4	Merge branch 'master' into osx-functional	2015-09-03 00:40:01 +01:00
James Booth	06882c0144	Updated CHANGELOG	2015-09-03 00:39:04 +01:00
James Booth	9c59eb056e	Merge branch 'master' into osx-functional	2015-09-02 00:08:29 +01:00
James Booth	e44688306b	Removed duplicate help entry for /roster show empty	2015-09-02 00:07:25 +01:00
James Booth	9ad5011622	Merge branch 'master' into osx-functional	2015-09-01 21:52:57 +01:00
James Booth	8a90e1acf1	PGP: Use old gpgme_io_write	2015-09-01 21:52:11 +01:00
James Booth	80422ae70a	Merge branch 'master' into osx-functional	2015-09-01 21:40:56 +01:00
James Booth	aee832f7c1	PGP: Use old gpgme_io_write	2015-09-01 21:40:07 +01:00
James Booth	1f63c6e114	Merge branch 'master' into osx-functional	2015-09-01 21:31:10 +01:00
James Booth	b468fd7ae4	PGP: UI tweaks for passphrase request	2015-09-01 21:25:58 +01:00
James Booth	4d18c5ff52	PGP: Added null check for passphrase_attempt	2015-09-01 21:08:23 +01:00
James Booth	53035f5e4c	Save PGP passphrase when correct	2015-09-01 21:05:17 +01:00
James Booth	7dc1b9d428	Fixed passing from arg in PGP ask passphrase	2015-09-01 20:33:23 +01:00
James Booth	1f4fd0fcb3	Added UI function to get PGP passphrase	2015-09-01 20:16:04 +01:00
James Booth	dd346eefc4	Added PGP passphrase callback	2015-09-01 19:24:56 +01:00
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