2670 Commits

Author	SHA1	Message	Date
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	10a5f29023	Merge branch 'master' into openpgp	2015-06-14 00:02:00 +01:00
James Booth	e50461a897	Set columns when running functional tests	2015-06-13 23:59:33 +01:00
James Booth	0ef00e87ab	Merge branch 'master' into openpgp	2015-06-13 16:27:20 +01:00
James Booth	698288ab5c	Show message when offline for /pgp fps	2015-06-13 01:19:56 +01:00
James Booth	e0783e20db	Renamed otr trusted window property	2015-06-13 01:13:56 +01:00
James Booth	a408ca7326	Removed TODO in gpg.c	2015-06-13 00:35:53 +01:00
James Booth	abcf67044c	Merge branch 'master' into openpgp	2015-06-08 20:33:03 +01:00
James Booth	549fceaa7f	Set default autoaway mode to off ... fixes #555	2015-06-08 20:26:23 +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	a0a7d04a5f	Tidy up windows when enabling	2015-06-01 14:47:02 +01:00
Pete	e8eb23c4f0	Merge branch '#551' of github.com:PMaynard/profanity into #551	2015-06-01 11:45:22 +01:00
Pete	2ce35fe61c	Added Theme UI option for window auto tidy	2015-06-01 11:44:52 +01:00
Pete Maynard	7bc671e07c	Extra underline	2015-06-01 11:33:19 +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	837f8b1f10	add examples and be more specific about time formatting	2015-05-30 00:42:19 -05:00
Will Song	83bed119e4	remove memory leak from creating a gdatetime string	2015-05-29 20:55:33 -05:00
Will Song	0e7507a1aa	update autocomplete	2015-05-29 20:49:28 -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	e295a474dc	Added more connect tests	2015-05-24 20:31:18 +01:00
James Booth	80665ea051	Added rooms iq test	2015-05-24 04:13:28 +01:00
James Booth	2241473ee6	Added bad password test	2015-05-24 00:56:13 +01:00
James Booth	09f01d518c	Merge branch 'master' into stabber-tests	2015-05-17 22:28:25 +01:00
James Booth	34d9b2b272	Merge branch 'master' into openpgp	2015-05-17 22:28:12 +01:00
James Booth	2c5b44421e	Added initial stabber test	2015-05-17 22:05:43 +01:00
Adam Ehlers Nyholm Thomsen	882ca85aca	allow enabling / disabling carbons without being connected.	2015-05-17 13:29:08 +02:00
James Booth	7f861b7743	Removed libgpg include from presence.c	2015-05-10 23:54:48 +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	acd2d2309f	Moved pgp signature generation to cl_ev_presence_send	2015-05-08 00:07:21 +01:00
James Booth	0db7bcbdcd	Merge branch 'master' into openpgp	2015-05-07 23:23:45 +01:00
James Booth	d853284f92	Added cl_ev_presence_send	2015-05-07 23:21:48 +01:00
James Booth	a2281dbccf	Merge branch 'master' into openpgp	2015-05-07 23:16:22 +01:00
James Booth	56cbce2ff3	Renamed presence_update -> presence_send	2015-05-07 23:12:49 +01:00
James Booth	beeadd6ae3	Merge branch 'master' into openpgp	2015-05-07 22:51:42 +01:00
James Booth	f69ccbf0cc	Tidied _roster_result_handler	2015-05-07 22:51:35 +01:00
James Booth	8ebc1d4ac1	Moved pgp signature verification to sv_ev_contact_online	2015-05-07 22:22:28 +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	8c347de298	Merge branch 'master' into openpgp	2015-05-07 00:26:45 +01:00
James Booth	6fd9b179a0	Optimised occupant comparisons, create utf8 collate key once	2015-05-07 00:26:24 +01:00
James Booth	ca3f7412f5	Optimised contact comparisons, create utf8 collate key once	2015-05-07 00:16:22 +01:00
James Booth	6840f3b599	Merge branch 'master' into openpgp	2015-05-06 22:04:47 +01:00
James Booth	5067e565e3	Set ui nonblocking on presence updates ... Speeds up joining rooms, and connecting.	2015-05-06 22:02:50 +01:00
James Booth	c9e21a557e	Merge branch 'master' into openpgp	2015-05-05 00:51:16 +01:00
James Booth	d52f86ef0f	Tidied form field autocompleters	2015-05-05 00:13:41 +01:00
James Booth	44aa2fd1bf	Use null check convention in gpg.c	2015-05-04 23:41:22 +01:00
James Booth	3fd9692aec	Merge branch 'master' into pgp	2015-05-04 23:40:58 +01:00
James Booth	6f3750c6aa	Use null check convention in roster_list.c	2015-05-04 23:31:05 +01:00
James Booth	59788752c7	Use null check convention in resource.c	2015-05-04 23:29:53 +01:00
James Booth	0930f0f688	Use null check convention in profanity.c	2015-05-04 23:29:24 +01:00
James Booth	41724218c0	Use null check convention in log.c	2015-05-04 23:28:34 +01:00
James Booth	4c78534be0	Use null check convention in jid.c	2015-05-04 23:27:41 +01:00
James Booth	1bfaa49fb3	Use null check convention in contact.c	2015-05-04 23:26:57 +01:00
James Booth	1d002e5bdc	Use null check convention in common.c	2015-05-04 23:26:08 +01:00
James Booth	49e450767d	Use null check convention in chat_session.c	2015-05-04 23:24:37 +01:00
James Booth	c487fe5f77	Use null check convention in stanza.c	2015-05-04 23:23:55 +01:00
James Booth	defa955ae0	Use null check convention in roster.c	2015-05-04 23:22:06 +01:00
James Booth	8e64323503	Use null check convention in presence.c	2015-05-04 23:21:06 +01:00
James Booth	8e2578459e	Use null check convention in iq.c	2015-05-04 23:19:10 +01:00
James Booth	cbcf476a7c	Use null check convention in form.c	2015-05-04 23:17:18 +01:00
James Booth	af75bc4be6	Use null check convention in connection.c	2015-05-04 23:16:44 +01:00
James Booth	067ad7fa2c	Use null check convention in capabilities.c	2015-05-04 23:15:15 +01:00
James Booth	398eac4ed6	Use null check convention in bookmark.c	2015-05-04 23:14:18 +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	09e1e7618e	Use null check convention in tinyurl.c	2015-05-04 22:57:49 +01:00
James Booth	fe216b4e97	Use null check convention in parser.c	2015-05-04 22:57:19 +01:00
James Booth	fa2e33e11d	Use null check convention in otrlibv4.c	2015-05-04 22:55:28 +01:00
James Booth	2426a7fcfc	Use null check convention in otrlibv3.c	2015-05-04 22:55:04 +01:00
James Booth	a979d23e10	Use null check convention in otr.c	2015-05-04 22:52:48 +01:00
James Booth	4dc9033472	Use null check convention in server_events.c	2015-05-04 22:51:15 +01:00
James Booth	4ba33005d0	Use null check convention in theme.c	2015-05-04 22:33:55 +01:00
James Booth	b093b99c15	Use null check convention in preferences.c	2015-05-04 22:33:19 +01:00
James Booth	a293045d85	Use null check convention in accounts.c	2015-05-04 22:32:42 +01:00
James Booth	47549452f1	Use null check convention in account.c	2015-05-04 22:29:51 +01:00
James Booth	4acf853b1c	Use null check convention in commands.c	2015-05-04 22:23:59 +01:00
James Booth	2b3cc65b52	Use null check convention in command.c	2015-05-04 22:16:39 +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	65ea572dae	Merge branch 'master' into pgp	2015-05-04 21:31:22 +01:00
James Booth	a0c872edf8	Extracted carbons handling	2015-05-04 21:31:05 +01:00
James Booth	a5677206e9	Merge branch 'master' into pgp	2015-05-04 21:20:40 +01:00
James Booth	ac940c2c8a	Revert "Added carbons handler" ... This reverts commit ff867e7f2b.	2015-05-04 21:18:53 +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	3dace733d9	Merge branch 'master' into pgp	2015-05-04 01:10:30 +01:00
James Booth	b1dd1e2726	cl_ev_send_muc_msg takes ProfMucWin as arg	2015-05-04 01:06:12 +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	0f3bece9e2	Merge branch 'master' into pgp	2015-05-03 02:35:15 +01:00
James Booth	ff867e7f2b	Added carbons handler	2015-05-03 02:34:58 +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	f65c82e112	Merge branch 'master' into pgp	2015-05-03 01:48:32 +01:00
James Booth	f25f90b38b	Extracted receipt request processing in message.c	2015-05-03 01:48:12 +01:00
James Booth	d3f4347513	Merge branch 'master' into pgp ... Conflicts: src/xmpp/message.c	2015-05-03 01:30:14 +01:00
James Booth	530c060d2a	Extract private message hanlding in message.c	2015-05-03 01:25:33 +01:00
James Booth	79d21d4cd2	Merge branch 'master' into pgp	2015-05-03 00:35:47 +01:00
James Booth	236c854419	Tidy message.c	2015-05-03 00:35:31 +01:00
James Booth	03ef791401	Merge branch 'master' into pgp	2015-05-03 00:06:12 +01:00
James Booth	5a90e2862e	Extracted receipt received handler	2015-05-03 00:05:47 +01:00
James Booth	0bc4377ad7	Merge branch 'master' into pgp	2015-05-02 23:40:34 +01:00
James Booth	ddc64755a0	Tidy message.c	2015-05-02 23:40:14 +01:00
James Booth	8c72f0deb5	Merge branch 'master' into pgp	2015-05-02 23:24:50 +01:00
James Booth	be4ee40ed4	Pass ProfChatWin to otr_on_message_send	2015-05-02 23:23:12 +01:00
James Booth	cade9e7c4c	Merge branch 'master' into pgp	2015-05-01 00:55:58 +01:00
James Booth	0118178080	Removed server event delegation functions	2015-05-01 00:55:40 +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	0df8b8beff	Return new window on new chat win event	2015-04-29 22:10:32 +01:00
James Booth	8de308c96a	Changed message when sending non encrypted message with OTR policy always	2015-04-29 21:55:09 +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	d3698e6bee	Added ui events module	2015-04-28 23:53:37 +01:00
James Booth	8aba52f4fe	Renamed event functions	2015-04-28 23:38:56 +01:00
James Booth	403e9b47fe	Removed commented code	2015-04-28 23:00:06 +01:00
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	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	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