conversations-plus - improved conversations

	Commit message (Expand)	Author	Age	Files	Lines
*	Merge tag '1.11.1' into trz/merge_1.11.1	lookshe	2016-03-17	16	-181/+558
\|\
\| *	version bump to 1.11.1 and changelog	Daniel Gultsch	2016-03-16	2	-2/+5
\| *	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	3	-30/+69
\| *	Merge pull request #1767 from fiaxh/path_file_accessible	Daniel Gultsch	2016-03-16	1	-1/+10
\| \|\
\| \| *	Check if path for URI is accessible	fiaxh	2016-03-15	1	-1/+10
\| \|/
\| *	removed requirement of external component for http upload	Daniel Gultsch	2016-03-14	1	-3/+2
\| *	pulled translations from transifex	Daniel Gultsch	2016-03-13	5	-106/+443
\| *	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
\| *	mention mod_smacks_offline and ejabberds settings in readme	Daniel Gultsch	2016-03-10	1	-0/+6
* \|	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 commit 'remotes/origin/trz/rename~1' into trz/rebase	steckbrief	2016-03-12	0	-0/+0
\|\\| \|
\| * \|	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 branch 'trz/rebase' (early part) into trz/rename	lookshe	2016-03-12	0	-0/+0
\| \|\ \ \| \|/ / \|/\| \|
* \| \|	Merge remote-tracking branch 'remotes/origin/trz/rename' into trz/rebase	steckbrief	2016-03-11	10	-140/+14
\|\\| \|
\| * \|	Fixes FS#51: Change toggle in Account Management back to standard	steckbrief	2016-03-11	10	-139/+13
* \| \|	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	6	-49/+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	3	-12/+6
* \| \|	Merge remote-tracking branch 'remotes/origin/trz/rename' into trz/rebase	steckbrief	2016-03-08	1	-1/+2
\|\\| \|
\| * \|	Merge remote branch 'master'	steckbrief	2016-03-08	4	-22/+21
\| \|\ \
\| \| * \|	incremented version code0.0.6	lookshe	2016-03-08	1	-1/+1
\| * \| \|	Fixes FS#145: Dialog for decision in Android 5	steckbrief	2016-03-08	1	-1/+2
* \| \| \|	Merge branch 'trz/rename' into trz/rebase	lookshe	2016-03-08	3	-21/+20
\|\ \ \ \ \| \| \|/ / \| \|/\| \|
\| * \| \|	reset link and highlight colors to system default	steckbrief	2016-03-08	3	-21/+20
\| \|/ /
* \| \|	Merge branch 'trz/rename' (early part) into trz/rebase	lookshe	2016-03-08	0	-0/+0
\|\\| \|
\| * \|	Merge branch 'trz/rebase' into trz/rename	lookshe	2016-03-08	72	-619/+1207
\| \|\ \ \| \|/ / \|/\| \|
* \| \|	Fixes FS#153 - Check if url, phone and email are linkified correctly	lookshe	2016-03-08	2	-6/+41
* \| \|	Use ImageUtil instead of old stupid generic FileBackend for cropCenterSquare	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	68	-484/+993
\|\ \ \ \| \| \|/ \| \|/\|
\| * \|	version bump to 1.11.0	Daniel Gultsch	2016-03-07	1	-2/+2
\| * \|	pulled translations from transifex	Daniel Gultsch	2016-03-06	28	-82/+272
\| * \|	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	2	-1/+15
\| * \|	version bump to 1.11.0-beta.3	Daniel Gultsch	2016-03-05	1	-2/+2
\| * \|	Merge branch 'Mess' of https://github.com/tarun018/Conversations into tarun01...	Daniel Gultsch	2016-03-04	1	-0/+10
\| \|\ \