conversations-plus - improved conversations

	Commit message (Expand)	Author	Age	Files	Lines
*	Merge tag '1.11.7' into trz/merge_1.11.7	lookshe	2016-04-17	5	-11/+56
\|\
\| *	add setting for quick sharing	Daniel Gultsch	2016-04-14	1	-2/+25
\| *	hacky workaround to determine if uri points to private file on < lolipop	Daniel Gultsch	2016-04-13	1	-2/+2
\| *	added share uri button to conference details	Daniel Gultsch	2016-04-12	1	-0/+17
\| *	fixed 'connecting…' button	Daniel Gultsch	2016-04-10	1	-3/+6
\| *	don't show contact details when in conversations with self	Daniel Gultsch	2016-04-09	2	-1/+4
\| *	check file owner when attaching files or using them as avatar	Daniel Gultsch	2016-04-07	1	-2/+11
\| *	prevent null pointer when checking http upload max size	Daniel Gultsch	2016-04-07	1	-6/+6
* \|	Merge remote-tracking branch 'remotes/origin/trz/rename' into trz/rebase	steckbrief	2016-04-06	8	-78/+57
\|\ \
* \ \	Merge tag '1.11.3' into trz/rebase	lookshe	2016-04-05	6	-10/+43
\|\ \ \ \| \| \|/ \| \|/\|
\| * \|	don't ask for resource when server uses http upload v0.1	Daniel Gultsch	2016-04-02	2	-5/+4
\| * \|	check max http file size when attaching files	Daniel Gultsch	2016-04-01	3	-6/+39
\| * \|	add methods to check max file size for http upload	Daniel Gultsch	2016-03-31	1	-1/+1
\| * \|	save otr fingerprint in message	Daniel Gultsch	2016-03-31	2	-3/+3
* \| \|	fixed installation error "W/PackageManager: Can't install because provider na...	lookshe	2016-04-03	1	-1/+1
* \| \|	Merge branch 'trz/rename' into trz/rebase	lookshe	2016-04-01	1	-1/+6
\|\ \ \ \| \| \|/ \| \|/\|
* \| \|	Merge remote-tracking branch 'remotes/origin/trz/rename' into trz/rebase	steckbrief	2016-03-30	1	-1/+3
\|\\| \|
* \| \|	Merge branch 'trz/rename' into trz/rebase	lookshe	2016-03-30	1	-0/+2
\|\\| \|
* \| \|	Merge remote-tracking branch 'remotes/origin/trz/rename' into trz/rebase	steckbrief	2016-03-29	1	-20/+9
\|\\| \|
* \| \|	Merge remote-tracking branch 'remotes/origin/trz/rename' into trz/rebase	steckbrief	2016-03-29	5	-70/+28
\|\\| \|
* \| \|	Merge remote-tracking branch 'remotes/origin/trz/rename' into trz/rebase	steckbrief	2016-03-29	10	-84/+52
\|\\| \|
* \| \|	Merge remote-tracking branch 'remotes/origin/trz/rename' into trz/rebase	steckbrief	2016-03-28	1	-1/+1
\|\\| \|
* \| \|	Merge branch 'trz/rename' into trz/rebase	lookshe	2016-03-27	1	-2/+23
\|\\| \|
* \| \|	FS#169 - Merge Conversations 1.11.2 into Conversations+ dev	lookshe	2016-03-25	5	-13/+31
\|\ \ \ \| \| \|/ \| \|/\|
\| * \|	allow to delete attachments. fixes #1539	Daniel Gultsch	2016-03-23	1	-7/+25
\| * \|	be less strict when sharing EXTRA_TEXT intents	Daniel Gultsch	2016-03-20	1	-1/+1
\| * \|	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-22	1	-25/+37
\|\ \ \ \| \| \|/ \| \|/\|
* \| \|	Merge branch 'trz/rebase' into trz/merge_1.11.1	lookshe	2016-03-20	1	-1/+1
\|\ \ \
\| * \| \|	Merge branch 'trz/rename' into trz/rebase	lookshe	2016-03-20	1	-1/+1
\| \|\\| \|
* \| \| \|	fixed merge errors	lookshe	2016-03-20	2	-19/+25
* \| \| \|	Merge tag '1.11.1' into trz/merge_1.11.1	lookshe	2016-03-17	4	-59/+100
\|\ \ \ \ \| \|/ / / \|/\| \| / \| \| \|/ \| \|/\|
\| * \|	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
\| * \|	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
* \| \|	Merge branch 'trz/rename' into trz/rebase	lookshe	2016-03-15	1	-1/+1
\|\ \ \ \| \| \|/ \| \|/\|
* \| \|	Merge remote-tracking branch 'remotes/origin/trz/rename' into trz/rebase	steckbrief	2016-03-12	1	-1/+1
\|\\| \|
* \| \|	Added method to get body from message if hasMeCommand and harmonized extracti...	lookshe	2016-03-12	1	-3/+3
* \| \|	Merge remote-tracking branch 'remotes/origin/trz/rename' into trz/rebase	steckbrief	2016-03-11	3	-77/+11
\|\\| \|
* \| \|	Merge remote-tracking branch 'remotes/origin/trz/rename' into trz/rebase	steckbrief	2016-03-11	3	-16/+7
\|\\| \|
* \| \|	Merge remote-tracking branch 'remotes/origin/trz/rename' into trz/rebase	steckbrief	2016-03-10	1	-2/+1
\|\\| \|
* \| \|	Merge branch 'trz/rename' into trz/rebase	lookshe	2016-03-08	1	-17/+20
\|\\| \|
* \| \|	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 cropCenterSquare	steckbrief	2016-03-08	1	-1/+1
* \| \|	Merge tag '1.11.0' into trz/merge_1.11.0	lookshe	2016-03-08	13	-200/+365
\|\ \ \ \| \| \|/ \| \|/\|
\| * \|	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