414 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	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