conversations - copy of conversations repo

	Commit message (Expand)	Author	Age	Files	Lines
*	Merge branch 'trz/rename' into trz/rebase	lookshe	2016-03-20	1	-59/+83
\|\
\| *	Fixes FS#168 - Not possible to share more than one picture at once	lookshe	2016-03-20	1	-59/+83
\| *	fixed merge error	lookshe	2016-03-20	1	-1/+1
\| *	Merge branch 'trz/rebase' (early part) into trz/rename	lookshe	2016-03-20	3	-19/+27
\| \|\
\| * \	Merge branch 'trz/rebase' (early part) into trz/rename	lookshe	2016-03-20	14	-179/+553
\| \|\ \
* \| \ \	Merge branch 'trz/rebase' into trz/merge_1.11.1trz/merge_1.11.1	lookshe	2016-03-20	7	-38/+96
\|\ \ \ \ \| \|_\|_\|/ \|/\| \| \|
\| * \| \|	Merge branch 'trz/rename' into trz/rebase	lookshe	2016-03-20	7	-38/+96
\| \|\\| \|
\| \| * \|	Fixes FS#167: Resized images are larger than original images	steckbrief	2016-03-18	1	-2/+2
\| \| * \|	Merge branch 'master' of git.fucktheforce.de:conversations-plus	steckbrief	2016-03-18	7	-39/+96
\| \| \|\ \
\| \| \| * \|	Fixes FS#164	lookshe	2016-03-18	1	-8/+0
\| \| \| * \|	Fixes FS#156 and FS#135 (occured again)	lookshe	2016-03-17	1	-4/+10
\| \| \| * \|	completely implements FS#161	lookshe	2016-03-17	3	-14/+41
\| \| \| * \|	partially implements FS#161	lookshe	2016-03-16	2	-17/+49
\| \| * \| \|	Refs FS#140: Rework message display	steckbrief	2016-03-13	1	-1/+2
* \| \| \| \|	fixed merge errors	lookshe	2016-03-20	5	-21/+29
\| \|_\|_\|/ \|/\| \| \|
* \| \| \|	Merge tag '1.11.1' into trz/merge_1.11.1	lookshe	2016-03-17	14	-179/+553
\|\ \ \ \ \| \|/ / / \|/\| \| \|
\| * \| \|	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
\| * \| \|	Check if path for URI is accessible	fiaxh	2016-03-15	1	-1/+10
\| * \| \|	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
* \| \| \|	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	9	-139/+14
\|\\| \|
\| * \|	Fixes FS#51: Change toggle in Account Management back to standard	steckbrief	2016-03-11	9	-138/+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	3	-21/+20
\| \|\ \
\| * \| \|	Fixes FS#145: Dialog for decision in Android 5	steckbrief	2016-03-08	1	-1/+2
* \| \| \|	Merge branch 'trz/rename' into trz/rebasetrz/1.11.0.1	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/rebase' into trz/rename	lookshe	2016-03-08	69	-608/+1193
\| \|\ \ \| \|/ / \|/\| \|
\| * \|	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	9	-22/+49
\| \|\ \ \
\| * \ \ \	Merge branch 'trz/rebase' into trz/rename	lookshe	2016-03-06	302	-5778/+20658
\| \|\ \ \ \