conversations - copy of conversations repo

	Commit message (Expand)	Author	Age	Files	Lines
*	Merge tag '1.11.1' into trz/merge_1.11.1	lookshe	2016-03-17	8	-74/+115
\|\
\| *	made it possible to share text files	Daniel Gultsch	2016-03-16	1	-7/+8
\| *	reworked sharewith activity to stay open during sharing	Daniel Gultsch	2016-03-16	2	-30/+66
\| *	Check if path for URI is accessible	fiaxh	2016-03-15	1	-1/+10
\| *	simplified getUsers(max) code	Daniel Gultsch	2016-03-13	1	-11/+2
\| *	added logging in case fragment wasn't attached	Daniel Gultsch	2016-03-13	1	-0/+5
\| *	fixed recursive call instead of call to super in PublishProfileActivity	Daniel Gultsch	2016-03-13	1	-5/+1
\| *	log reason for bind failure	Daniel Gultsch	2016-03-11	1	-2/+2
\| *	close cursor in caps db query	Daniel Gultsch	2016-03-11	1	-1/+3
* \|	Merge branch 'trz/rename' into trz/rebase	lookshe	2016-03-15	2	-4/+4
\|\ \
\| * \|	once again: FS#34 - review all calls for String.trim()	lookshe	2016-03-14	2	-4/+4
* \| \|	Merge remote-tracking branch 'remotes/origin/trz/rename' into trz/rebase	steckbrief	2016-03-12	5	-97/+16
\|\\| \|
\| * \|	Fixes FS#155: Check FileHelper vs. FileUtils	steckbrief	2016-03-12	5	-97/+16
\| * \|	Merge branch 'trz/rebase' into trz/rename	lookshe	2016-03-12	7	-55/+93
\| \|\ \ \| \|/ / \|/\| \|
* \| \|	fixed possible NPE	lookshe	2016-03-12	1	-0/+6
* \| \|	small bugfixes	lookshe	2016-03-12	2	-1/+4
* \| \|	removed duplicated source	lookshe	2016-03-12	4	-36/+41
* \| \|	Added method to get body from message if hasMeCommand and harmonized extracti...	lookshe	2016-03-12	6	-44/+67
* \| \|	Merge remote-tracking branch 'remotes/origin/trz/rename' into trz/rebase	steckbrief	2016-03-11	3	-77/+11
\|\\| \|
\| * \|	Fixes FS#51: Change toggle in Account Management back to standard	steckbrief	2016-03-11	3	-77/+10
* \| \|	Merge remote-tracking branch 'remotes/origin/trz/rename' into trz/rebase	steckbrief	2016-03-11	8	-149/+28
\|\\| \|
\| * \|	Fixes FS#139: Do not merge messages at all	steckbrief	2016-03-11	8	-149/+28
* \| \|	Merge remote-tracking branch 'remotes/origin/trz/rename' into trz/rebase	steckbrief	2016-03-10	5	-41/+52
\|\\| \|
\| * \|	Fixes FS#157: Trigger loading messages from MAM in MUC does not end	steckbrief	2016-03-10	3	-37/+45
\| * \|	Fixes FS#158: user decision dialog heading configurable and translateable	steckbrief	2016-03-10	2	-4/+6
* \| \|	Merge branch 'trz/rename' into trz/rebasetrz/1.11.0.1	lookshe	2016-03-08	1	-17/+20
\|\\| \|
\| * \|	reset link and highlight colors to system default	steckbrief	2016-03-08	1	-17/+20
\| * \|	Merge branch 'trz/rebase' into trz/rename	lookshe	2016-03-08	31	-477/+874
\| \|\ \ \| \|/ / \|/\| \|
\| * \|	Merge branch 'trz/rebase' into trz/rename	lookshe	2016-03-08	1	-1/+2
\| \|\ \
\| * \ \	Merge branch 'trz/rebase' into trz/rename	lookshe	2016-03-07	7	-13/+49
\| \|\ \ \
\| * \ \ \	Merge branch 'trz/rebase' into trz/rename	lookshe	2016-03-06	134	-3510/+13072
\| \|\ \ \ \
* \| \| \| \| \|	Fixes FS#153 - Check if url, phone and email are linkified correctly	lookshe	2016-03-08	1	-6/+31
* \| \| \| \| \|	Use ImageUtil instead of old stupid generic FileBackend for cropCenterSquaretrz/merge_1.11.0	steckbrief	2016-03-08	1	-1/+1
* \| \| \| \| \|	Fixed merge issue with AxolotlService (differentiation between impl and inter...	steckbrief	2016-03-08	3	-133/+171
* \| \| \| \| \|	Merge tag '1.11.0' into trz/merge_1.11.0	lookshe	2016-03-08	28	-340/+668
\|\ \ \ \ \ \ \| \|_\|_\|_\|/ / \|/\| \| \| \| / \| \| \|_\|_\|/ \| \|/\| \| \|
\| * \| \| \|	don't show opt-out of battery optimization dialog when push is enabled	Daniel Gultsch	2016-03-06	3	-4/+17
\| * \| \| \|	warn in conversations when account is disabled	Daniel Gultsch	2016-03-06	1	-1/+14
\| * \| \| \|	Merge branch 'Mess' of https://github.com/tarun018/Conversations into tarun01...	Daniel Gultsch	2016-03-04	1	-0/+10
\| \|\ \ \ \
\| \| * \| \| \|	Fix Issue #1634 : Shows XMPP URI as links.	Tarun	2016-02-29	1	-0/+10
\| * \| \| \| \|	show host in file size checker	Daniel Gultsch	2016-03-04	1	-1/+14
\| * \| \| \| \|	mark oob messages and always display download button	Daniel Gultsch	2016-03-04	4	-6/+30
\| * \| \| \| \|	don't automatically crop avatar	Daniel Gultsch	2016-03-04	1	-22/+40
\| * \| \| \| \|	add a few more know file extensions	Daniel Gultsch	2016-03-04	4	-10/+13
\| * \| \| \| \|	allow to copy original url even while downloading. fixes #1743	Daniel Gultsch	2016-03-04	1	-6/+9
\| * \| \| \| \|	moved avatarfetcher reset code to bind	Daniel Gultsch	2016-03-03	1	-8/+8
\| * \| \| \| \|	avoid unnecessary disconnect. prevent NetworkOnMainThreadException	Daniel Gultsch	2016-03-03	1	-3/+3
\| * \| \| \| \|	don't break with srcoll events on empty message lists	Daniel Gultsch	2016-03-03	1	-2/+7
\| * \| \| \| \|	expert option to treat vibrate as silent mode for XA. fixes #1530	Daniel Gultsch	2016-03-01	2	-7/+18
\| * \| \| \| \|	removed unused config variable	Daniel Gultsch	2016-03-01	1	-4/+0
\| * \| \| \| \|	properly persist accepted crypto targets	Daniel Gultsch	2016-03-01	1	-5/+1