conversations-plus - improved conversations

	Commit message (Expand)	Author	Age	Files	Lines
*	Merge remote-tracking branch 'remotes/origin/trz/rename' into trz/rebase	steckbrief	2016-10-20	2	-7/+35
\|\
* \|	Merge remote-tracking branch 'remotes/origin/trz/rename' into trz/rebase	steckbrief	2016-04-18	1	-1/+1
\|\\|
* \|	Merge tag '1.11.3' into trz/rebase	lookshe	2016-04-05	1	-0/+36
\|\ \
* \ \	Merge remote-tracking branch 'remotes/origin/trz/rename' into trz/rebase	steckbrief	2016-03-29	1	-13/+17
\|\ \ \ \| \| \|/ \| \|/\|
* \| \|	FS#169 - Merge Conversations 1.11.2 into Conversations+ dev	lookshe	2016-03-25	1	-4/+5
\|\ \ \ \| \| \|/ \| \|/\|
\| * \|	show room nick for /me command in sent muc messages. fixes #1773	Daniel Gultsch	2016-03-20	1	-4/+5
* \| \|	Merge branch 'trz/rename' into trz/rebase	lookshe	2016-03-20	1	-1/+1
\|\ \ \ \| \| \|/ \| \|/\|
* \| \|	fixed merge errors	lookshe	2016-03-20	1	-0/+2
* \| \|	Merge tag '1.11.1' into trz/merge_1.11.1	lookshe	2016-03-17	1	-1/+8
\|\ \ \ \| \| \|/ \| \|/\|
\| * \|	Check if path for URI is accessible	fiaxh	2016-03-15	1	-1/+10
* \| \|	Merge remote-tracking branch 'remotes/origin/trz/rename' into trz/rebase	steckbrief	2016-03-12	1	-5/+10
\|\ \ \ \| \| \|/ \| \|/\|
* \| \|	fixed possible NPE	lookshe	2016-03-12	1	-0/+6
* \| \|	small bugfixes	lookshe	2016-03-12	1	-1/+1
* \| \|	removed duplicated source	lookshe	2016-03-12	1	-0/+23
* \| \|	Added method to get body from message if hasMeCommand and harmonized extracti...	lookshe	2016-03-12	1	-4/+2
* \| \|	Merge tag '1.11.0' into trz/merge_1.11.0	lookshe	2016-03-08	1	-1/+4
\|\ \ \ \| \| \|/ \| \|/\|
\| * \|	mark oob messages and always display download button	Daniel Gultsch	2016-03-04	1	-1/+4
* \| \|	corrected getRealPathFromUri	lookshe	2016-03-07	1	-2/+3
* \| \|	Fixes FS#146: Remove Tor-Support	steckbrief	2016-03-02	1	-4/+0
* \| \|	Merge tag '1.10.1' into trz/merge_1.10.1	steckbrief	2016-02-28	1	-1/+3
\|\\| \|
\| * \|	Retry decryption from message menu	fiaxh	2016-02-23	1	-1/+3
* \| \|	Fixes FS#48 and FS#136	lookshe	2016-02-28	1	-6/+0
* \| \|	Changed access to presences according to new Presence representation in C	steckbrief	2016-02-23	1	-6/+7
* \| \|	Merge tag '1.9.4' into trz/merge_1.9.4	lookshe	2016-02-16	1	-0/+11
\|\\| \|
\| * \|	use TLSv1.2 as SSL context on supported plattforms	Daniel Gultsch	2016-02-03	1	-0/+11
* \| \|	Partially implements FS#6: Conference ID changed to c+bugs@conference.thedevs...	steckbrief	2016-02-13	1	-2/+2
* \| \|	Imports organized	steckbrief	2016-02-12	6	-45/+8
* \| \|	Simplification of DNS requests.	steckbrief	2016-02-12	1	-191/+70
* \| \|	Compilation errors and merge mixups fixed	steckbrief	2016-02-11	1	-3/+1
* \| \|	Merge tag '1.9.3' into trz/merge_1.9.3	lookshe	2016-02-11	12	-153/+748
\|\\| \|
\| * \|	prefer dns servers from networsk with the default route	Daniel Gultsch	2016-01-29	1	-2/+17
\| * \|	catch security exception when user prevents access to address book	Daniel Gultsch	2016-01-20	1	-27/+45
\| * \|	move some ssl socket modifiers into a seperate helper class	Daniel Gultsch	2016-01-12	1	-0/+62
\| * \|	Implement XEP-0368: SRV records for XMPP over TLS	moparisthebest	2016-01-11	1	-50/+71
\| * \|	ask to be excluded from battery optimization	Daniel Gultsch	2016-01-11	1	-27/+29
\| * \|	null check in getOriginalPath	Daniel Gultsch	2016-01-04	1	-0/+3
\| * \|	handle null names in getColorForName	Daniel Gultsch	2015-12-29	1	-1/+1
\| * \|	lower case all fingerprints. fixes #1521	Daniel Gultsch	2015-12-27	1	-1/+2
\| * \|	code cleanup	Daniel Gultsch	2015-12-23	1	-22/+0
\| * \|	show certificate information	Daniel Gultsch	2015-12-23	1	-0/+50
\| * \|	ask for contact permissions when first opening StartConversationActivity	Daniel Gultsch	2015-12-07	1	-0/+11
\| * \|	avoid some NPEs	Daniel Gultsch	2015-12-04	1	-2/+3
\| * \|	add error state for unavailable tor network	Daniel Gultsch	2015-12-01	1	-4/+9
\| * \|	refactored socks5 connection code. make jingle transport use that new code	Daniel Gultsch	2015-12-01	1	-0/+52
\| * \|	pgp fixes and revert configuration changes	Daniel Gultsch	2015-11-25	1	-21/+0
\| * \|	show encryption type in warned/red messages	Daniel Gultsch	2015-10-28	1	-0/+15
\| * \|	Reset the margins manually after rotating	saqura	2015-10-26	1	-0/+21
\| * \|	introduced code to verify omemo device keys with x509 certificates.	Daniel Gultsch	2015-10-16	1	-4/+24
\| * \|	add menu item in account details to renew certificate	Daniel Gultsch	2015-10-11	1	-0/+19
\| * \|	let DnsHelper provide a fallback solution	Daniel Gultsch	2015-09-19	1	-1/+8