conversations - copy of conversations repo

	Commit message (Expand)	Author	Age	Files	Lines
*	made muc parser more compatible with legacy mucs?! (whatever that is exactly)	iNPUTmice	2014-12-03	1	-3/+1
*	Make sure SASL tokenizer strips strings	Sam Whited	2014-12-02	2	-1/+5
*	worked around concurrent modification exception	iNPUTmice	2014-12-03	1	-11/+11
*	fixed another npe in hasBookmark	iNPUTmice	2014-12-03	1	-2/+3
*	Merge pull request #740 from SamWhited/jidrpfix	Daniel Gultsch	2014-12-03	1	-163/+165
\|\
\| *	Allow JIDs such as "example.net/@"	Sam Whited	2014-12-02	1	-3/+2
\| *	"example.net/@/" should be a valid JID.	Sam Whited	2014-12-02	1	-164/+166
\| *	Fix RFC 6122 implementation	Sam Whited	2014-12-02	1	-4/+5
* \|	safety net in joinMuc	iNPUTmice	2014-12-03	1	-4/+6
* \|	clean up getProposedNick	iNPUTmice	2014-12-03	1	-6/+5
* \|	fixed potential npes in message parser	iNPUTmice	2014-12-03	1	-2/+7
* \|	cleaned up avatar / tile creation	iNPUTmice	2014-12-03	2	-20/+9
\|/
*	fixed #728	iNPUTmice	2014-12-01	1	-5/+2
*	bumped cap version as well0.9.1	iNPUTmice	2014-12-01	1	-1/+1
*	clear encrypted messages on reinit	iNPUTmice	2014-12-01	1	-2/+13
*	worked around rare npe	iNPUTmice	2014-12-01	1	-5/+12
*	fixed npe if roster jid couldnt be parsed	iNPUTmice	2014-12-01	1	-8/+5
*	do not query service info from main server again	iNPUTmice	2014-12-01	1	-5/+3
*	don't request fragment before updating	iNPUTmice	2014-11-30	1	-6/+2
*	Merge pull request #721 from SamWhited/warning_fixes	Daniel Gultsch	2014-11-29	1	-3/+6
\|\
\| *	Misc. "fixes" to correct warnings.	Sam Whited	2014-11-29	1	-3/+6
* \|	fixed npe for broken bookmarks	iNPUTmice	2014-11-29	1	-7/+8
* \|	fix for concurrency issue	iNPUTmice	2014-11-29	1	-1/+1
\|/
*	fixed npe. fixed #717	iNPUTmice	2014-11-27	1	-5/+6
*	create conversation with bare jid	iNPUTmice	2014-11-27	1	-1/+1
*	use getAttributeAsJid method	iNPUTmice	2014-11-27	1	-6/+1
*	Merge pull request #713 from betheg/muc	Daniel Gultsch	2014-11-24	5	-1/+65
\|\
\| *	add an listener for the muc roster update.	Michael	2014-11-23	4	-1/+63
\| *	MUC: do not add yourself to the muc user list.	Michael	2014-11-23	1	-0/+2
* \|	MUC: option to set/delete bookmark in conference details.	Michael	2014-11-23	1	-0/+39
\|/
*	work around to not confuse irc transport with real conference servers	iNPUTmice	2014-11-21	1	-2/+7
*	Merge pull request #706 from betheg/unused_imports	Daniel Gultsch	2014-11-21	12	-38/+0
\|\
\| *	remove unused imports.	Michael	2014-11-21	12	-38/+0
* \|	update action bar with conversations updates as well	iNPUTmice	2014-11-21	2	-52/+45
* \|	MUC: set from when join muc.	Michael	2014-11-21	1	-0/+1
* \|	move task to back and not finish when hitting back button	iNPUTmice	2014-11-21	1	-7/+5
\|/
*	STATUS_CODE_SELF_PRESENCE is not set in all case.	Michael	2014-11-21	1	-10/+16
*	additional null pointer saftey checks	iNPUTmice	2014-11-21	1	-15/+13
*	verify contacts key only on initiating side of smp	iNPUTmice	2014-11-21	3	-7/+18
*	changed listener timing and cache clearing after muc presences	iNPUTmice	2014-11-20	1	-6/+9
*	create file and dirs before creating file	iNPUTmice	2014-11-20	1	-0/+2
*	change status codes string 'number' to a better readable constant.	Michael	2014-11-20	1	-3/+5
*	fixed potential NPEs	iNPUTmice	2014-11-20	1	-39/+43
*	import fixes	iNPUTmice	2014-11-20	1	-0/+2
*	Merge branch 'development' of https://github.com/siacs/Conversations into dev...	iNPUTmice	2014-11-20	1	-3/+0
\|\
\| *	Remove broken / unused imports	Sam Whited	2014-11-19	1	-3/+0
* \|	brought ad hoc conferences back. fixed #688 fixed #367	iNPUTmice	2014-11-20	12	-137/+476
\|/
*	sent read marker to full jid	iNPUTmice	2014-11-19	2	-9/+10
*	some saftey checks before registering listeners in XmppActivity	iNPUTmice	2014-11-19	1	-1/+12
*	put error notification into notification service	iNPUTmice	2014-11-18	3	-46/+42