conversations - copy of conversations repo

	Commit message (Expand)	Author	Age	Files	Lines
*	Imports organized	steckbrief	2016-02-12	1	-4/+1
*	Compilation errors and merge mixups fixed	steckbrief	2016-02-11	1	-3/+3
*	Merge tag '1.9.3' into trz/merge_1.9.3	lookshe	2016-02-11	1	-53/+110
\|\
\| *	use extract account from intent method and final EXTRA_ACCOUNT variable	Daniel Gultsch	2016-01-22	1	-38/+29
\| *	add intent!=null check in onActivityResultin PublishProfilePicture	Daniel Gultsch	2016-01-20	1	-1/+1
\| *	show toast when image cropper get oom	Daniel Gultsch	2016-01-15	1	-0/+7
\| *	check for file storage permission before selecting avatar	Daniel Gultsch	2016-01-13	1	-5/+25
\| *	properly rotate avatars	Daniel Gultsch	2016-01-04	1	-33/+38
\| *	fixed avatar loading for non-file uris	Daniel Gultsch	2015-12-02	1	-9/+5
\| *	users are now able to crop their avatar pictures using the android-crop	Philip Flohr	2015-12-02	1	-6/+33
\| *	added Config.java varibale to lock account creation to specfic domain	Daniel Gultsch	2015-08-03	1	-1/+8
\| *	rely on refreshUi/refreshUiReal and make sure it is being used everywhere	Daniel Gultsch	2015-07-20	1	-0/+4
\| *	call StartConversationActivity in init mode only after adding the first account	Daniel Gultsch	2015-05-15	1	-1/+3
\| *	fixed service discovery by properly storing and checking identities	Daniel Gultsch	2015-04-25	1	-2/+1
* \|	Merge remote-tracking branch 'remotes/origin/trz/rename' into trz/rebase	steckbrief	2016-01-15	1	-1/+1
\|\ \
* \| \|	Merge remote-tracking branch 'remotes/origin/trz/rename' into trz/rebase	steckbrief	2016-01-13	1	-1/+2
\|\\| \|
* \| \|	Merge remote-tracking branch 'remotes/origin/trz/rename' into trz/rebase	steckbrief	2015-11-06	1	-2/+3
\|\\| \|
\| * \|	renaming eu.siacs.conversations to de.thedevstack.conversationsplus	steckbrief	2015-06-19	1	-253/+0
\| \|/
* /	Merge tag '1.5.2' into trz/rebasetrz/1.5.2.1	lookshe	2015-08-11	1	-3/+4
\|/
*	init mode (first start) for StartConversationActivity (no up button) and avoi...	iNPUTmice	2015-02-22	1	-4/+8
*	show toast when avatar has been published - fixed #874	iNPUTmice	2015-01-15	1	-13/+13
*	Rework `Account.getJid()' to return full JIDs	Sam Whited	2014-11-09	1	-1/+1
*	Update another chunk of stuff to use JID objects	Sam Whited	2014-11-09	1	-3/+10
*	Make conversations the root project	Sam Whited	2014-10-22	1	-0/+242