3653 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
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	7ba7e098fe	Merge branch 'master' into pgp ... Conflicts: .travis.yml	2015-04-12 00:04:37 +01:00
James Booth	a8669bb2bd	Updated travis build to include uuid-dev dependency	2015-04-12 00:01:59 +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	3597a89233	Merge branch 'master' into pgp	2015-04-11 21:43:54 +01:00
James Booth	f18759192c	Updated CHANGELOG	2015-04-11 21:42:58 +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