conversations - copy of conversations repo

	Commit message (Expand)	Author	Age	Files	Lines
*	Merge remote-tracking branch 'remotes/origin/trz/rename' into trz/rebase	steckbrief	2016-10-20	1	-2/+3
\|\
* \|	Merge remote-tracking branch 'remotes/origin/trz/rename' into trz/rebase	steckbrief	2016-04-23	1	-5/+5
\|\\|
* \|	FS#169 - Merge Conversations 1.11.2 into Conversations+ dev	lookshe	2016-03-25	1	-1/+4
\|\ \
* \| \|	Merge tag '1.11.0' into trz/merge_1.11.0	lookshe	2016-03-08	1	-33/+54
\|\\| \|
\| * \|	expert option to treat vibrate as silent mode for XA. fixes #1530	Daniel Gultsch	2016-03-01	1	-6/+9
\| * \|	Request WRITE_EXTERNAL_STORAGE for ExportLogsPreference in >= M	fiaxh	2016-02-24	1	-0/+26
* \| \|	Fixes FS#147: Disable OMEMO	steckbrief	2016-03-02	1	-0/+7
* \| \|	Fixes FS#146: Remove Tor-Support	steckbrief	2016-03-02	1	-10/+0
* \| \|	Fixes FS#48 and FS#136trz/merge_1.10.0	lookshe	2016-02-28	1	-1/+1
* \| \|	Removed stupid message correction	steckbrief	2016-02-23	1	-2/+1
* \| \|	Merge tag '1.10.0' into trz/merge_1.10.0	lookshe	2016-02-22	1	-1/+2
\|\\| \|
\| * \|	added setting to opt-out of message correction. renamed preferences and optio...	Daniel Gultsch	2016-02-16	1	-1/+2
* \| \|	Fixed settings synchronization	steckbrief	2016-02-12	1	-60/+66
* \| \|	Imports organized	steckbrief	2016-02-12	1	-16/+0
* \| \|	Merge tag '1.9.3' into trz/merge_1.9.3	lookshe	2016-02-11	1	-30/+53
\|\\| \|
\| * \|	splite PARANOIA_MODE into three different options	Daniel Gultsch	2015-12-14	1	-1/+1
\| * \|	introduced build-time paranoia mode that disables unencrypted chats and force...	Daniel Gultsch	2015-12-01	1	-0/+12
\| * \|	initial tor support	Daniel Gultsch	2015-12-01	1	-0/+2
\| * \|	introduced expert options to set status to away and xa if screen is off or if...	Daniel Gultsch	2015-10-08	1	-5/+6
\| * \|	rely on refreshUi/refreshUiReal and make sure it is being used everywhere	Daniel Gultsch	2015-07-20	1	-0/+4
\| * \|	Optimize imports	Andreas Straub	2015-07-20	1	-13/+11
\| * \|	Add option to remove manually approved certificates	BrianBlade	2015-04-19	1	-0/+91
\| * \|	maintain state when rotating settings activity	iNPUTmice	2015-04-14	1	-14/+16
\| * \|	Merge branch 'dont_trust_cas_preference' of https://github.com/BrianBlade/Con...	iNPUTmice	2015-04-14	1	-1/+2
\| \|\ \
\| \| * \|	Add option to use MTM without default TrustManager	BrianBlade	2015-04-11	1	-1/+2
\| * \| \|	don't resume old session when changing resource	iNPUTmice	2015-04-09	1	-3/+9
\| \|/ /
* \| \|	Merge trz/rename into trz/rebase	steckbrief	2015-10-22	1	-4/+3
\|\ \ \ \| \| \|/ \| \|/\|
\| * \|	renaming eu.siacs.conversations to de.thedevstack.conversationsplus	steckbrief	2015-06-19	1	-92/+0
* \| \|	Fixes FS#12 - Move smiley replacement from UIHelper to Emojicon module	lookshe	2015-08-16	1	-2/+6
* \| \|	Merge tag '1.5.2' into trz/rebasetrz/1.5.2.1	lookshe	2015-08-11	1	-16/+115
\|/ /
* \|	changed received and read confirmation setting to one list and put it to sett...	lookshe	2015-04-14	1	-2/+3
* \|	Merge tag '1.2.0' into trz/master	steckbrief	2015-03-30	1	-1/+1
\|\\|
\| *	avoid unnecessary thread creation	iNPUTmice	2015-03-05	1	-1/+1
* \|	Merge master-origin	steckbrief	2015-02-20	1	-0/+9
\|\\|
\| *	adapt caps on whether or not message confirmation is on	iNPUTmice	2015-01-26	1	-0/+8
* \|	- Avoiding accessing shared preferences to know if emoticons should be parsed...	steckbrief	2015-01-20	1	-14/+19
\|/
*	remove unused imports.	Michael	2014-11-21	1	-1/+0
*	turn on foreground service in expert settings	iNPUTmice	2014-11-15	1	-0/+2
*	It builds again!	Sam Whited	2014-11-09	1	-2/+4
*	Make conversations the root project	Sam Whited	2014-10-22	1	-0/+74