2856 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
James Booth	3e6048582e	Merge branch 'master' into muc_roles	2014-10-02 01:38:14 +01:00
James Booth	41d6994310	Merge remote-tracking branch 'origin/muc_roles' into muc_roles	2014-10-02 01:38:02 +01:00
James Booth	bdad22e548	Merge remote-tracking branch 'origin/master'	2014-10-02 01:35:41 +01:00
James Booth	ae4d83fb47	Update UI before generating OTR key	2014-10-02 01:34:35 +01:00
James Booth	e561e2bd11	Update UI before generating OTR key	2014-10-02 01:34:00 +01:00
James Booth	44764e12dd	Merge branch 'master' into muc_roles	2014-10-02 01:01:38 +01:00
James Booth	92a0aba93f	Removed usages of strcpy	2014-10-02 00:57:29 +01:00
James Booth	60e0d5ef7b	Store real jid with occupants	2014-10-01 13:27:01 +01:00
James Booth	b189f8f52e	Show fixed form fields	2014-10-01 13:01:20 +01:00
James Booth	c90f4a37a3	Added /room <affiliation> command	2014-10-01 00:46:58 +01:00
James Booth	5879f497ad	Added /room <role> command	2014-10-01 00:27:25 +01:00
James Booth	76d2b9e9b5	Moved room info output to ui module, added TODO for roles	2014-09-30 23:08:48 +01:00
James Booth	7ec0dd0b83	Show occupants affiliation and role with /info in rooms	2014-09-30 21:58:18 +01:00
James Booth	9bff9c850b	Merge branch 'master' into muc_roles	2014-09-30 21:23:31 +01:00
James Booth	ded712c35c	Fixed help for jid-multi form fields	2014-09-30 21:22:13 +01:00
James Booth	95f03665df	Merge branch 'master' into muc_roles	2014-09-30 21:11:16 +01:00
James Booth	3dc14a8342	travis: added m4 dir for libstrophe	2014-09-30 21:06:09 +01:00
James Booth	38b58b7a61	Revert "Fix travis build by adding m4 dir" ... This reverts commit 5d9a7ec36c.	2014-09-30 21:03:29 +01:00
James Booth	5d9a7ec36c	Fix travis build by adding m4 dir	2014-09-30 20:57:32 +01:00
James Booth	bca5a5f78d	Merge branch 'master' into muc_roles ... Conflicts: .gitignore	2014-09-30 20:46:26 +01:00
James Booth	fbeb107cbe	Dont check for var attribute on form fields of type fixed	2014-09-30 20:44:00 +01:00
James Booth	0365e88b7b	wip - Store roles and affiliations with occupants	2014-09-30 19:46:35 +01:00
James Booth	b7088363e6	Merge branch 'master' into muc_roles	2014-09-30 00:27:35 +01:00
James Booth	780a3f1cc7	Merge pull request #430 from acoffman/master ... free latest_release regardless of its validity	2014-09-30 00:25:00 +01:00
James Booth	4f7feedb65	Changed rooms to use Occupant type instead of PContact	2014-09-30 00:16:01 +01:00
Adam Coffman	652bc54bc8	free latest_release regardless of its validity	2014-09-29 17:09:42 -05:00
James Booth	2dacfc823a	Updated gitignore	2014-09-29 00:00:11 +01:00
James Booth	ef34ddc1eb	Updated gitignore	2014-09-28 23:32:06 +01:00
James Booth	51bb5f9e60	Added codelite project to gitignore	2014-09-28 23:04:16 +01:00
James Booth	d25d6b4502	Tidied muc module	2014-09-28 22:09:20 +01:00
James Booth	41b49cb5d6	Store room affiliation and role	2014-09-28 01:55:24 +01:00
James Booth	a4f7932ed7	Check for NULL inside autocomplete_free	2014-09-26 00:48:48 +01:00
James Booth	ccbaa67a01	Create room list on muc_init	2014-09-26 00:43:00 +01:00
James Booth	70169f8ab9	Tidied muc.c	2014-09-26 00:27:58 +01:00
James Booth	0b2a1a1bc7	Renamed autocomplete function to get list	2014-09-26 00:06:50 +01:00
James Booth	0afdbfaf03	Removed NULL check when checking roster for nick	2014-09-25 20:59:59 +01:00
James Booth	7703f57584	Use log_warning for room config form errors	2014-09-25 20:26:42 +01:00
James Booth	9094c483d0	Fixed spelling mistake in form.h	2014-09-25 20:14:16 +01:00
James Booth	41f4621e6f	Free caps, remove strdup	2014-09-24 01:06:49 +01:00
James Booth	a288c200d7	Unreference date time	2014-09-24 00:52:32 +01:00
James Booth	5c36f85199	Free unique id	2014-09-24 00:48:28 +01:00
James Booth	95a2cec953	Handle errors for /disco info requests	2014-09-24 00:30:05 +01:00
James Booth	999525c6aa	Removed TODO	2014-09-23 22:31:50 +01:00
James Booth	7f8305c16e	Updated TODO	2014-09-23 22:19:05 +01:00
James Booth	162aeab827	Capabilities: check for identity locale	2014-09-23 21:36:46 +01:00
James Booth	af2199adb0	Updated TODO	2014-09-23 18:56:45 +01:00
James Booth	ab9c3ac330	Reordered identity attributes in caps cache for readability	2014-09-23 00:22:59 +01:00
James Booth	e88cc0079a	Updated caps TODO	2014-09-23 00:10:35 +01:00
James Booth	345a9e3f40	Create sha-1 of own capabilities once	2014-09-23 00:08:26 +01:00
James Booth	7621a84675	Updated todo	2014-09-22 12:49:20 +01:00