470 Commits

Author	SHA1	Message	Date
James Booth	ea99012d9b	Added initial /pgp start checks	2015-06-18 01:34:27 +01:00
James Booth	85cc5ab50d	Added cmd_pgp tests	2015-06-18 00:12:01 +01:00
James Booth	1af3565cbd	Merge branch 'master' into openpgp	2015-06-17 19:55:52 +01:00
James Booth	e00a03f916	Removed wins_get_current_* functions	2015-06-17 19:49:55 +01:00
James Booth	8fde14879a	Merge branch 'master' into openpgp ... Conflicts: src/command/commands.c src/command/commands.h	2015-06-17 00:40:06 +01:00
James Booth	2215a3791f	Added current window reference to command functions	2015-06-17 00:15:28 +01:00
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	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	82ff85c329	Revert back to original rooms test	2015-06-13 22:13:01 +01:00
James Booth	dda79aed24	Debugging travis build	2015-06-13 21:31:38 +01:00
James Booth	5b58e2d0bc	Debugging travis build	2015-06-13 21:20:13 +01:00
James Booth	5c13f00e2f	Debugging travis build	2015-06-13 21:13:21 +01:00
James Booth	0fcfa65f15	Use regex for multiline assert in rooms functional test	2015-06-13 20:53:51 +01:00
James Booth	0c3fe51799	Changed assert order in rooms test	2015-06-13 20:10:12 +01:00
James Booth	b07a7035df	Merge branch 'master' into openpgp	2015-06-13 19:50:53 +01:00
James Booth	6255420b80	Increase connection time, functional tests	2015-06-13 19:49:26 +01:00
James Booth	eb1f8a499a	Merge branch 'master' into openpgp	2015-06-13 19:41:34 +01:00
James Booth	a48b9fcec2	Tidied functional tests	2015-06-13 19:41:11 +01:00
James Booth	c2c2cee6c9	Moved stub_gpg.c	2015-06-12 23:58:44 +01:00
James Booth	efb07f8187	Merge branch 'master' into openpgp	2015-06-12 23:55:28 +01:00
James Booth	68ed20f10d	Moved all tests to tests folder	2015-06-12 23:53:30 +01:00
James Booth	1cd23e0efc	Moved gpg stub	2015-06-12 23:27:39 +01:00
James Booth	9aff8abd2e	Merge branch 'master' into openpgp ... Conflicts: .travis.yml	2015-06-05 23:02:56 +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
Pete Maynard	9c659246bc	Added winstidy to test stub	2015-05-31 11:43:08 +01:00
James Booth	6d6bb64588	Moved tests -> unittests	2015-05-28 18:50:55 +01:00
James Booth	2c5b44421e	Added initial stabber test	2015-05-17 22:05:43 +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	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	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	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	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	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	5d827cafec	Merge branch 'master' into pgp ... Conflicts: src/xmpp/message.c	2015-04-28 23:57:28 +01:00
James Booth	8aba52f4fe	Renamed event functions	2015-04-28 23:38:56 +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	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	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	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	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	551f7df1f7	Added signature verification, /pgp fps command	2015-03-24 00:47:13 +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	2490c3ed20	Added pgp key list command	2015-03-22 00:12:14 +00:00
James Booth	11966d39b0	Added otr_tag_message, removed commands.c dependency on libotr	2015-03-16 21:41:35 +00:00
James Booth	8944a3b5bb	Move common chat logging code to log.c	2015-03-15 23:19:00 +00:00
James Booth	2762f18a3e	Added /receipts command	2015-03-15 19:48:19 +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	bc6e32175d	Removed from argument from outgoing message functions	2015-03-14 14:50:45 +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	2ff6873cf1	Send private carbons element with message when encrypted	2015-03-10 21:16:34 +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	7638f379ca	Fixed tests for --disable-otr	2015-03-04 23:32:47 +00:00
Olivier LE MOAL	48f9f3b3b0	Add XEP-0280 support	2015-02-10 11:32:22 +01:00
James Booth	8cec79faef	Merge branch 'master' into readline	2015-02-08 21:03:26 +00:00