109 Commits

Author	SHA1	Message	Date
James Booth	4a590e5ac9	Merge branch 'master' into plugins	2015-09-29 00:55:50 +01:00
James Booth	bfdda17b7f	Fix last active query	2015-09-29 00:53:58 +01:00
James Booth	f968a9afeb	Merge branch 'master' into plugins	2015-09-29 00:02:03 +01:00
James Booth	26d160cae8	WIP: Added last activity request and response	2015-09-29 00:01:38 +01:00
James Booth	17e435dfaf	Merge branch 'master' into plugins ... Conflicts: src/xmpp/roster.c	2015-09-27 23:58:11 +01:00
James Booth	9593e17c3c	Include last activity in initial presence	2015-09-27 23:53:06 +01:00
James Booth	79d3aae50e	Merge branch 'master' into plugins ... Conflicts: .travis.yml configure.ac src/profanity.c src/xmpp/connection.c	2015-09-24 22:37:18 +01:00
James Booth	d96e68ea53	Save trusted certificates to tlscerts file with more information	2015-09-24 00:18:18 +01:00
James Booth	40ce5cb0e0	Parse TLS cert subject	2015-09-23 23:01:59 +01:00
James Booth	0321adde3e	Fixed spelling	2015-09-23 20:38:52 +01:00
James Booth	bd9c28c100	Tidied output for cert callback	2015-09-23 00:17:10 +01:00
James Booth	a964050b87	Use subject name in cert callback	2015-09-22 23:56:22 +01:00
James Booth	b88885aaae	Store trusted TLS cert fingerprints	2015-09-22 22:44:18 +01:00
James Booth	9414ad268d	Prompt user to allow or deny untrusted TLS certificates	2015-09-22 21:42:05 +01:00
James Booth	74151e6419	Added TLS cert fail callback	2015-09-22 20:55:41 +01:00
James Booth	7d59286429	Merge branch 'master' into plugins ... Conflicts: src/event/server_events.c	2015-09-08 20:21:35 +01:00
James Booth	b266e4d035	Pass delay timestamp to all incoming chat events	2015-09-08 20:18:31 +01:00
James Booth	f76154cc69	Fixed merge	2015-08-30 01:47:04 +01:00
James Booth	5499580b6d	Merge branch 'master' into plugins ... Conflicts: src/event/client_events.c src/ui/core.c	2015-08-30 01:37:22 +01:00
James Booth	b4722632b6	Split PGP incoming and outgoing message handling	2015-08-30 01:32:13 +01:00
James Booth	c57b7b8276	Merge branch 'master' into plugins ... Conflicts: src/event/server_events.c	2015-08-27 00:42:03 +01:00
James Booth	1484e94b35	Fixed OTR decryption check	2015-08-27 00:37:48 +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	b15d24397b	Merge branch 'master' into plugins	2015-08-26 21:42:43 +01:00
James Booth	fc60c9fbf1	Fixed OTR char display	2015-08-26 21:42:16 +01:00
James Booth	5e962fe0f5	Fixed compile when no OTR or PGP support	2015-08-26 01:48:21 +01:00
James Booth	ade1070c8e	Merge branch 'master' into plugins ... Conflicts: src/config/preferences.h src/event/client_events.c src/event/server_events.c src/ui/core.c	2015-08-26 01:45:19 +01:00
James Booth	f998ab8f3b	Display special char for encrypted messages	2015-08-26 00:42:56 +01:00
James Booth	0df8d12965	Merge branch 'master' into plugins	2015-08-24 00:17:53 +01:00
James Booth	525876770a	Removed unused barejid argument from PGP decryption	2015-08-24 00:13:57 +01:00
James Booth	51a4378b76	Merge remote-tracking branch 'origin/master' into plugins	2015-08-11 01:00:55 +01:00
James Booth	2af5c151a0	Tidied pgp memory allocations	2015-08-11 01:00:23 +01:00
James Booth	e5dec6abe8	Merge branch 'master' into plugins ... Conflicts: src/command/commands.c src/command/commands.h src/ui/console.c tests/unittests/test_cmd_otr.c tests/unittests/test_cmd_pgp.c	2015-08-02 00:19:52 +01:00
James Booth	8ec931eb84	Added cons_show_padded	2015-07-29 23:48:28 +01:00
James Booth	8888e12871	Merge branch 'master' into plugins ... Conflicts: src/event/server_events.c src/ui/core.c	2015-07-01 20:34:44 +01:00
James Booth	dd206ef637	WIP fix for #516, needs memory cleanup	2015-06-29 23:48:41 +01:00
James Booth	4d4a3cb1b9	Merge branch 'master' into plugins	2015-06-24 22:15:34 +01:00
James Booth	524c7a8671	Free account on pgp presence send	2015-06-24 22:02:29 +01:00
James Booth	398c3c0ba6	Merge branch 'master' into plugins ... Conflicts: src/event/server_events.c	2015-06-23 23:43:14 +01:00
James Booth	d89a9862b1	Merge remote-tracking branch 'pasis/pgp-without-otr-fix'	2015-06-23 23:32:41 +01:00
James Booth	358e9d6af0	Added /pgp setkey command	2015-06-23 23:29:10 +01:00
Dmitry Podgorny	6a73ca1b52	pgp: Fixed compilation error when libotr is not supported	2015-06-23 22:13:50 +00:00
James Booth	1087041dcf	Merge branch 'master' into plugins ... Conflicts: .travis.yml src/command/commands.c src/event/client_events.c src/event/server_events.c src/ui/core.c src/ui/titlebar.c	2015-06-21 23:22:09 +01:00
James Booth	3d2f999efb	Added PGP logging preferences	2015-06-21 21:42:58 +01:00
James Booth	446027b950	Moved setting otr.warn -> enc.warn	2015-06-21 21:07:57 +01:00
James Booth	e72ddf5488	Show message when contact ends PGP	2015-06-21 20:27:56 +01:00
James Booth	5669799690	Encryption modes for sv_ev_incoming_message	2015-06-21 20:08:46 +01:00
James Booth	03a4aa4408	Tidied OTR and PGP combinations in client_events.c	2015-06-21 19:29:23 +01:00
James Booth	13a612cbc2	Moved window creation to sv_ev_incoming_message	2015-06-21 18:29:20 +01:00