897 Commits

Author	SHA1	Message	Date
James Booth	637b8bee9f	Merge branch 'master' into openpgp	2015-06-15 23:17:11 +01:00
James Booth	fb0e065902	Tidied cmd_otr, added check-unit target to Makefile	2015-06-15 23:16:22 +01:00
James Booth	de47450594	Merge branch 'master' into openpgp	2015-06-15 22:03:25 +01:00
James Booth	6097a5bade	Removed ui_get_current_chat()	2015-06-15 22:01:28 +01:00
James Booth	c76692516a	Merge branch 'master' into openpgp	2015-06-15 20:39:17 +01:00
James Booth	5cdd69f478	Moved UI interfaces to ui.h	2015-06-15 20:11:34 +01:00
James Booth	38ed9188d3	Moved ui/windows -> window_list	2015-06-15 19:26:28 +01:00
James Booth	6b44b988f4	Moved refresh subwin logic to window.c	2015-06-15 18:59:20 +01:00
James Booth	989dde77cd	Added win_resize() function	2015-06-15 18:08:47 +01:00
James Booth	a849b200b3	Added win_clear() function	2015-06-15 17:54:47 +01:00
James Booth	e9aa4ea084	Removed unused variable	2015-06-15 17:40:22 +01:00
James Booth	732533ee5a	I removed ncurses header dependencies, removed unused code	2015-06-15 17:11:11 +01:00
James Booth	0ef00e87ab	Merge branch 'master' into openpgp	2015-06-13 16:27:20 +01:00
James Booth	e0783e20db	Renamed otr trusted window property	2015-06-13 01:13:56 +01:00
James Booth	9aff8abd2e	Merge branch 'master' into openpgp ... Conflicts: .travis.yml	2015-06-05 23:02:56 +01:00
James Booth	78a4446023	Merge branch 'master' into stabber-tests	2015-06-02 20:32:15 +01:00
James Booth	a3693cfbe7	Merge branch 'master' into openpgp	2015-06-02 20:32:07 +01:00
James Booth	f0f3a739f4	Merge remote-tracking branch 'PMaynard/#551'	2015-06-02 20:29:35 +01:00
Pete	0564976264	Refactored 'ui_tidy_wins()' to return bool and not output text, Corrected underline, removed call to function 'wins_resize_all()'.	2015-06-01 11:27:01 +01:00
Will Song	83bed119e4	remove memory leak from creating a gdatetime string	2015-05-29 20:55:33 -05:00
Will Song	3842daa334	fix indent code	2015-05-29 20:45:10 -05:00
Will Song	f2629aca7b	updated statusbar to use strftime formats	2015-05-29 20:23:09 -05:00
Will Song	9463c67190	fix conflicts	2015-05-29 19:53:37 -05:00
Pete	fbc57765a3	Added window auto tidy.	2015-05-29 14:25:14 +01:00
James Booth	e4ad201324	Merge branch 'master' into stabber-tests	2015-05-25 21:17:06 +01:00
James Booth	06fe9bec37	Merge branch 'master' into openpgp	2015-05-25 21:16:51 +01:00
James Booth	304e08a9c0	Added jid to OTR errors in console	2015-05-25 21:16:10 +01:00
James Booth	80665ea051	Added rooms iq test	2015-05-24 04:13:28 +01:00
James Booth	58b5e39b95	Merge branch 'master' into openpgp	2015-05-10 01:45:07 +01:00
James Booth	aeffca496c	Tidy ui_room_message	2015-05-10 01:44:34 +01:00
James Booth	487f5da17d	Merge branch 'master' into openpgp	2015-05-10 01:08:30 +01:00
James Booth	aaad3ff909	Moved logic to notify_message	2015-05-10 01:03:34 +01:00
James Booth	8673488368	Merge branch 'master' into openpgp	2015-05-07 22:06:02 +01:00
James Booth	a2c6211732	Added ui_contact_online	2015-05-07 22:05:36 +01:00
James Booth	3fd9692aec	Merge branch 'master' into pgp	2015-05-04 23:40:58 +01:00
James Booth	a71d1dab6a	Use null check convention in windows.c	2015-05-04 23:12:55 +01:00
James Booth	c19a05ca09	Use null check convention in window.c	2015-05-04 23:11:32 +01:00
James Booth	dd386b4a4e	Use null check convention in titlebar.c	2015-05-04 23:08:09 +01:00
James Booth	bf5646aee3	Use null check convention in statusbar.c	2015-05-04 23:07:36 +01:00
James Booth	dda812cd3e	Use null check convention in notifier.c	2015-05-04 23:06:35 +01:00
James Booth	aefe458b60	Use null check convention in core.c	2015-05-04 23:05:52 +01:00
James Booth	2e2b3f9403	Use null check convention in console.c	2015-05-04 23:02:57 +01:00
James Booth	176fba84a0	Merge branch 'master' into pgp	2015-05-04 21:39:56 +01:00
James Booth	8ccbeade44	Added enc_mode to ProfChatWin	2015-05-04 21:38:19 +01:00
James Booth	aca102f542	Merge branch 'master' into pgp	2015-05-04 01:34:18 +01:00
James Booth	c8eaaa0ce9	Added ui_ev_new_private_win to ui events	2015-05-04 01:31:27 +01:00
James Booth	bb2b5d20d5	Merge branch 'master' into pgp	2015-05-04 00:57:17 +01:00
James Booth	ef54ff305e	ui_outgoing_chat_msg now takes ProfChatWin as argument	2015-05-04 00:55:43 +01:00
James Booth	bab4da039a	Merge branch 'master' into pgp	2015-05-04 00:43:36 +01:00
James Booth	c3d2a7e937	Added roster list function to get display name for messages	2015-05-03 23:38:46 +01:00
James Booth	bec9b53f10	Merge branch 'master' into pgp	2015-05-03 02:04:21 +01:00
James Booth	4e1c2a4f64	Show resource in status bar	2015-05-03 02:04:04 +01:00
James Booth	0bd642edf8	Merge branch 'master' into pgp	2015-04-30 23:38:28 +01:00
James Booth	e11e55e31a	Move current win check to event, removed next and prev win functions	2015-04-30 22:43:08 +01:00
James Booth	a3a4b6267b	Merge branch 'master' into pgp	2015-04-30 22:10:03 +01:00
James Booth	d68fb25dde	Removed ui_win_switch_num	2015-04-30 22:09:39 +01:00
James Booth	20555fcb36	Added assert to ui_switch_win	2015-04-30 21:27:44 +01:00
James Booth	7730674f45	Merge branch 'master' into pgp	2015-04-30 21:24:06 +01:00
James Booth	0a6b76d6d3	Removed some ui functions, inlined	2015-04-30 21:23:43 +01:00
James Booth	d5188a160e	Merge branch 'master' into pgp	2015-04-29 23:16:43 +01:00
James Booth	2e75e54460	Added ui_win_error_line()	2015-04-29 23:16:28 +01:00
James Booth	0fece78dfe	Merge branch 'master' into pgp	2015-04-29 23:08:23 +01:00
James Booth	665c34414d	Return result on OTR message sending	2015-04-29 22:59:44 +01:00
James Booth	15b34692fd	Reuse ui_new_chat_win	2015-04-29 21:42:29 +01:00
James Booth	0296a60390	_win_show_history takes ProfChatWin as first arg	2015-04-29 21:19:20 +01:00
James Booth	5d827cafec	Merge branch 'master' into pgp ... Conflicts: src/xmpp/message.c	2015-04-28 23:57:28 +01:00
James Booth	403e9b47fe	Removed commented code	2015-04-28 23:00:06 +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	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	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