775 Commits

Author	SHA1	Message	Date
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	475dfebd97	Added pgpkeyid account setting, send signed presence	2015-03-23 23:38:06 +00:00
James Booth	f1f047889e	Added individual options to send and request delivery receipts	2015-03-19 22:57:51 +00:00
James Booth	8e80a8ccf7	Merge remote-tracking branch 'origin/master'	2015-03-18 21:31:58 +00:00
James Booth	e7e94eed7f	Added keybindings for rxvt	2015-03-18 21:30:43 +00:00
James Booth	d6977e31cd	Fix buffer entry free	2015-03-17 20:42:21 +00:00
James Booth	981618b7da	Added static functions to commands.c for sending messages	2015-03-16 01:29:03 +00:00
James Booth	fae2717f27	Tidied help	2015-03-15 20:04:53 +00:00
James Booth	2762f18a3e	Added /receipts command	2015-03-15 19:48:19 +00:00
James Booth	b21edfaa51	Added receipt.sent theme setting	2015-03-15 19:35:25 +00:00
James Booth	448c91af61	Fixed merge	2015-03-15 01:30:27 +00:00
James Booth	8c552e8a70	Merge branch 'master' into xep-0184	2015-03-15 01:27:09 +00:00
James Booth	49022068ef	Added OTR error messages	2015-03-15 01:26:09 +00:00
James Booth	ca30ff3910	Merge branch 'master' into xep-0184 ... Conflicts: src/server_events.c src/ui/core.c src/ui/ui.h tests/ui/stub_ui.c	2015-03-14 23:10:51 +00:00
James Booth	385336c10b	Don't switch window on sent carbon	2015-03-14 22:59:49 +00:00
James Booth	1014244408	Use colouring for message receipts	2015-03-14 16:05:13 +00:00
James Booth	bc6e32175d	Removed from argument from outgoing message functions	2015-03-14 14:50:45 +00:00
James Booth	6fd5b617ef	Renamed win_save_newline -> win_newline	2015-03-14 14:16:50 +00:00
James Booth	b84bddc46b	Renamed win_save_println -> win_println	2015-03-14 14:14:46 +00:00
James Booth	e02dbe24da	Renamed win_save_print -> win_print	2015-03-14 14:12:32 +00:00
James Booth	f4441ec64f	Renamed win_save_vprint -> win_vprint	2015-03-14 14:10:10 +00:00
James Booth	57c7564445	Show message received text for receipts	2015-03-11 23:47:11 +00:00
James Booth	78becceedb	Added basic delivery receipts	2015-03-11 23:18:28 +00:00
James Booth	e5bb12a0d6	Added /time statusbar preference	2015-03-10 23:35:08 +00:00
James Booth	945f29873e	Merge remote-tracking branch 'oliverlemoal/xep-0280' into xep-0280	2015-03-08 21:51:50 +00:00
James Booth	2e493112bb	Merge branch 'master' into readline	2015-03-08 18:12:50 +00:00
James Booth	6be4b400b8	Fixed swapping windows when in source win	2015-03-03 22:10:01 +00:00
James Booth	7ae71391de	Merge branch 'master' into readline	2015-02-24 22:58:19 +00:00
James Booth	68a8ab3401	Updated default preferences	2015-02-24 22:53:57 +00:00
James Booth	84c02ffb72	Added /roster by preference to UI preferences summary	2015-02-24 22:24:20 +00:00
James Booth	9a408024d3	Merge branch 'master' into readline	2015-02-24 21:47:49 +00:00
James Booth	434fb1878b	Fixed /resource preference display	2015-02-24 21:42:43 +00:00
James Booth	7454bede8b	Merge branch 'master' into readline	2015-02-23 00:50:58 +00:00
Christian Storm	a1d14c4526	Fixed spelling.	2015-02-17 10:52:37 +01:00
James Booth	32b8ead198	Merge branch 'master' into readline	2015-02-14 20:46:11 +00:00
James Booth	c9a6e10c26	Use single quotes for terminal notifier notifications to avoid variable expansion	2015-02-14 16:20:15 +00:00
James Booth	b24510c776	Merge branch 'master' into readline ... Conflicts: src/tools/history.c src/tools/history.h	2015-02-11 00:09:58 +00:00
James Booth	b3be26a214	Updated copyright	2015-02-10 23:16:09 +00:00
James Booth	13297a151f	Merge branch 'master' into readline ... Conflicts: src/ui/inputwin.c	2015-02-10 20:47:22 +00:00
James Booth	75d7663876	Free wins summary list	2015-02-10 19:42:13 +00:00
James Booth	30739ed157	Free contact list	2015-02-10 19:39:18 +00:00
James Booth	6bee6cb0fb	Free string on backspace	2015-02-10 19:30:18 +00:00
Olivier LE MOAL	48f9f3b3b0	Add XEP-0280 support	2015-02-10 11:32:22 +01:00
James Booth	64774a947e	Merge branch 'master' into readline	2015-02-09 22:11:25 +00:00
James Booth	5c9dd2802a	Free lists on get muc and private windows	2015-02-09 22:08:47 +00:00
James Booth	75f791da8f	Free hash table keys before modifying hash table	2015-02-09 21:53:55 +00:00
James Booth	1a98f1404b	Free resource lists	2015-02-09 21:46:54 +00:00
James Booth	51ccb69580	Merge branch 'master' into readline ... Conflicts: src/ui/inputwin.c	2015-02-09 21:28:08 +00:00
James Booth	aad7b3ed8a	Free GTimer on switch to console	2015-02-09 20:15:24 +00:00