conversations - copy of conversations repo

	Commit message (Expand)	Author	Age	Files	Lines
*	Merge branch 'trz/rebase' into trz/rename	lookshe	2016-03-25	16	-39/+88
\|\
\| *	FS#169 - Merge Conversations 1.11.2 into Conversations+ dev	lookshe	2016-03-25	16	-39/+87
\| \|\
\| \| *	allow to delete attachments. fixes #1539	Daniel Gultsch	2016-03-23	8	-31/+46
\| \| *	only add image files to media scanner	Daniel Gultsch	2016-03-23	6	-13/+26
\| \| *	Typo `attempt`	licaon-kter	2016-03-22	1	-1/+1
\| \| *	show room nick for /me command in sent muc messages. fixes #1773	Daniel Gultsch	2016-03-20	1	-4/+5
\| \| *	be less strict when sharing EXTRA_TEXT intents	Daniel Gultsch	2016-03-20	1	-1/+1
\| \| *	be more careful to avoid creating multiple connections	Daniel Gultsch	2016-03-20	2	-3/+8
\| \| *	don't show v\omemo keys as such if not enabled	Daniel Gultsch	2016-03-20	2	-4/+5
\| * \|	Merge branch 'trz/rename' into trz/rebase	lookshe	2016-03-23	32	-317/+450
\| \|\ \ \| \|/ / \|/\| \|
\| * \|	Merge branch 'trz/rename' into trz/rebase	lookshe	2016-03-22	2	-26/+42
\| \|\ \
\| * \ \	Merge branch 'trz/rename' into trz/rebase	lookshe	2016-03-21	1	-4/+19
\| \|\ \ \
\| * \ \ \	Merge branch 'trz/rename' into trz/rebase	lookshe	2016-03-20	1	-1/+1
\| \|\ \ \ \
\| * \ \ \ \	Merge branch 'trz/rename' into trz/rebase	lookshe	2016-03-20	1	-18/+14
\| \|\ \ \ \ \
\| * \ \ \ \ \	Merge branch 'trz/rename' into trz/rebase	lookshe	2016-03-20	7	-4/+15
\| \|\ \ \ \ \ \
\| * \ \ \ \ \ \	Merge branch 'trz/rename' into trz/rebase	lookshe	2016-03-20	1	-59/+83
\| \|\ \ \ \ \ \ \
\| * \ \ \ \ \ \ \	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
\| \| \|\ \ \ \ \ \ \ \
* \| \| \| \| \| \| \| \| \| \|	pulled from transifex	lookshe	2016-03-23	32	-317/+450
\| \|_\|_\|_\|_\|_\|_\|_\|/ / \|/\| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \|	Correct notifications to user if swiping with disabled or not connected accou...	lookshe	2016-03-22	1	-25/+37
* \| \| \| \| \| \| \| \| \|	Fixes FS#87 - Crash on load messages after delete account	lookshe	2016-03-22	1	-1/+5
\| \|_\|_\|_\|_\|_\|_\|/ / \|/\| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \|	One more fix in Message.equals() (FS#104)	lookshe	2016-03-21	1	-4/+19
\| \|_\|_\|_\|_\|_\|/ / \|/\| \| \| \| \| \| \|
* \| \| \| \| \| \| \|	Show file name instead of mime type (FS#102)	lookshe	2016-03-20	1	-1/+1
\| \|_\|_\|_\|_\|/ / \|/\| \| \| \| \| \|
* \| \| \| \| \| \|	FS#104 - Fix Message.equals()	lookshe	2016-03-20	1	-18/+14
\| \|_\|_\|_\|/ / \|/\| \| \| \| \|
* \| \| \| \| \|	Fixes FS#143 - Displaying of emoticons too large	lookshe	2016-03-20	7	-4/+15
\| \|_\|_\|/ / \|/\| \| \| \|
* \| \| \| \|	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
\|\\| \| \| \|
\| * \| \| \|	fixed merge errors	lookshe	2016-03-20	5	-21/+29
* \| \| \| \|	Merge branch 'trz/rebase' (early part) into trz/rename	lookshe	2016-03-20	14	-179/+553
\|\\| \| \| \| \| \|_\|/ / \|/\| \| \|
\| * \| \|	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
\| \|\ \
\| * \ \	Merge remote-tracking branch 'remotes/origin/trz/rename' into trz/rebase	steckbrief	2016-03-12	5	-97/+16
\| \|\ \ \
* \| \| \| \|	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
\| \| \|_\|/ / \| \|/\| \| \|
\| * \| \| \|	once again: FS#34 - review all calls for String.trim()	lookshe	2016-03-14	2	-4/+4
\| \| \|/ / \| \|/\| \|
* / \| \|	Refs FS#140: Rework message display	steckbrief	2016-03-13	1	-1/+2
\|/ / /