3686 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
James Booth	43189b1ab4	Merge branch 'master' into pgp	2015-04-27 23:45:51 +01:00
James Booth	70d1756a1c	Moved otr message send event to otr module	2015-04-27 23:30:33 +01:00
James Booth	eb177ccbef	Removed server_events dependency on libotr headers	2015-04-27 23:17:38 +01:00
James Booth	f219302f06	Renamed incoming otr message	2015-04-27 22:34:06 +01:00
James Booth	7a44e17141	Merge branch 'master' into pgp ... Conflicts: src/config/account.h	2015-04-23 23:48:43 +01:00
James Booth	bc9e6b79cd	Tidied account login	2015-04-23 21:56:48 +01:00
James Booth	5f2c6cbd28	Merge branch 'master' into pgp	2015-04-22 00:30:00 +01:00
James Booth	ba286c54ef	Moved login events to client events module	2015-04-22 00:29:37 +01:00
James Booth	1c47b57e19	Tidy execute alias code	2015-04-21 23:45:03 +01:00
James Booth	bc445ccdfb	Merge branch 'master' into pgp	2015-04-21 23:35:37 +01:00
James Booth	88739d5c59	Moved new chat win events to client events module	2015-04-21 23:28:52 +01:00
James Booth	ebca38e224	Merge branch 'master' into pgp	2015-04-21 22:08:00 +01:00
James Booth	53f2a4a35c	Moved all message sending to client events module	2015-04-21 21:57:39 +01:00
James Booth	65c0a87f97	Merge branch 'master' into pgp	2015-04-21 20:56:47 +01:00
James Booth	a4f9661da2	Removed unused otr check	2015-04-19 21:03:20 +01:00
James Booth	9be265591a	Merge branch 'master' into pgp	2015-04-19 19:50:19 +01:00
James Booth	32da6548da	Added client_events module, reuse message sending code for all commands	2015-04-19 19:40:15 +01:00
James Booth	d612b9695a	Merge branch 'master' into pgp ... Conflicts: src/xmpp/message.c	2015-04-19 17:33:35 +01:00
James Booth	e688dd7d28	Renamed server event functions	2015-04-19 17:29:54 +01:00
James Booth	60f94722d4	Merge branch 'master' into pgp	2015-04-19 16:56:11 +01:00
James Booth	424f52c3fa	Moved server_events to event/	2015-04-19 16:54:16 +01:00
James Booth	bcfbbac49a	Merge branch 'master' into pgp	2015-04-12 02:16:13 +01:00
James Booth	57dc5f14ef	Added option to show jids in occupants panel	2015-04-12 02:14:37 +01:00
James Booth	7ba7e098fe	Merge branch 'master' into pgp ... Conflicts: .travis.yml	2015-04-12 00:04:37 +01:00
James Booth	a8669bb2bd	Updated travis build to include uuid-dev dependency	2015-04-12 00:01:59 +01:00
James Booth	7e4b756e44	Merge branch 'master' into pgp	2015-04-11 23:38:44 +01:00
James Booth	a2ccd89646	Autogenerate room name with UUID for /join with no args	2015-04-11 23:37:52 +01:00
James Booth	3597a89233	Merge branch 'master' into pgp	2015-04-11 21:43:54 +01:00
James Booth	f18759192c	Updated CHANGELOG	2015-04-11 21:42:58 +01:00
James Booth	5305a3e3a6	Fixed message sending when not PGP key found	2015-04-05 16:03:50 +01:00
James Booth	c8c12a8f7a	Merge branch 'master' into pgp	2015-03-29 03:17:41 +01:00
James Booth	71c2be599b	Use password for chat room invites	2015-03-29 03:16:41 +01:00
James Booth	c36d4b3643	Merge branch 'master' into pgp	2015-03-29 02:51:05 +01:00
James Booth	1917d4c095	Added password to direct invites	2015-03-29 02:46:59 +01:00
James Booth	c1eceebcba	Merge branch 'master' into pgp	2015-03-29 00:59:42 +00:00
James Booth	714faeb2e6	Add callback data to room disco info response handler	2015-03-29 00:55:33 +00:00
James Booth	24a45e5292	Set members only property when getting room features	2015-03-29 00:21:18 +00:00
James Booth	fac2b2cf66	Added check members only room to send mediated invites	2015-03-28 22:51:41 +00:00
James Booth	0f6bc9b55d	Decrypt incoming messages	2015-03-25 00:05:32 +00:00
James Booth	eb5cb7b2f8	Send encrypted messages	2015-03-24 23:34:24 +00:00
James Booth	551f7df1f7	Added signature verification, /pgp fps command	2015-03-24 00:47:13 +00:00
James Booth	b87130b601	Added check for HAVE_LIBGPGME in presence.c	2015-03-23 23:51:35 +00:00
James Booth	027fa2a700	Fixed tabs	2015-03-23 23:42:04 +00:00
James Booth	73e1654f28	Fixed tabs	2015-03-23 23:41:09 +00:00
James Booth	475dfebd97	Added pgpkeyid account setting, send signed presence	2015-03-23 23:38:06 +00:00
James Booth	8a5d1fef29	Added Id and fingerprint to pgp key list	2015-03-22 01:03:06 +00:00
James Booth	fd86615549	Added /pgp libver command	2015-03-22 00:29:57 +00:00
James Booth	1d90cc7894	Fixed whitespace	2015-03-22 00:15:23 +00:00
James Booth	2490c3ed20	Added pgp key list command	2015-03-22 00:12:14 +00:00
James Booth	f1f047889e	Added individual options to send and request delivery receipts	2015-03-19 22:57:51 +00:00