conversations - copy of conversations repo

	Commit message (Expand)	Author	Age	Files	Lines
...
* \| \|	Merge remote branch 'master'	steckbrief	2016-03-08	4	-22/+21
\|\ \ \
\| * \| \|	incremented version code	lookshe	2016-03-08	1	-1/+1
* \| \| \|	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/rename' (early part) into trz/rebase	lookshe	2016-03-08	0	-0/+0
\| \|\ \ \| \|/ / \|/\| \|
* \| \|	Merge branch 'trz/rebase' into trz/rename	lookshe	2016-03-08	72	-619/+1207
\|\\| \|
\| * \|	Fixes FS#153 - Check if url, phone and email are linkified correctly	lookshe	2016-03-08	2	-6/+41
\| * \|	Use ImageUtil instead of old stupid generic FileBackend for cropCenterSquaretrz/merge_1.11.0	steckbrief	2016-03-08	1	-1/+1
\| * \|	Fixed merge issue with AxolotlService (differentiation between impl and inter...	steckbrief	2016-03-08	3	-133/+171
\| * \|	Merge tag '1.11.0' into trz/merge_1.11.0	lookshe	2016-03-08	68	-484/+993
\| \|\\|
\| \| *	version bump to 1.11.01.11.0	Daniel Gultsch	2016-03-07	1	-2/+2
\| \| *	pulled translations from transifex	Daniel Gultsch	2016-03-06	28	-82/+272
\| \| *	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	2	-1/+15
\| \| *	version bump to 1.11.0-beta.3	Daniel Gultsch	2016-03-05	1	-2/+2
\| \| *	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
\| \| * \|	show host in file size checker	Daniel Gultsch	2016-03-04	2	-1/+15
\| \| * \|	mark oob messages and always display download button	Daniel Gultsch	2016-03-04	4	-6/+30
\| \| * \|	don't automatically crop avatar	Daniel Gultsch	2016-03-04	8	-22/+49
\| \| * \|	add a few more know file extensions	Daniel Gultsch	2016-03-04	4	-10/+13
\| \| * \|	allow to copy original url even while downloading. fixes #1743	Daniel Gultsch	2016-03-04	1	-6/+9
\| \| * \|	version bump to 1.11.0-beta.2	Daniel Gultsch	2016-03-03	1	-2/+2
\| \| * \|	moved avatarfetcher reset code to bind	Daniel Gultsch	2016-03-03	1	-8/+8
\| \| * \|	avoid unnecessary disconnect. prevent NetworkOnMainThreadException	Daniel Gultsch	2016-03-03	1	-3/+3
\| \| * \|	don't break with srcoll events on empty message lists	Daniel Gultsch	2016-03-03	1	-2/+7
\| \| * \|	expert option to treat vibrate as silent mode for XA. fixes #1530	Daniel Gultsch	2016-03-01	4	-7/+26
\| \| * \|	removed unused config variable	Daniel Gultsch	2016-03-01	1	-4/+0
\| \| * \|	properly persist accepted crypto targets	Daniel Gultsch	2016-03-01	1	-5/+1
\| \| * \|	version bump to 1.11.0-beta, changelog and updated readme	Daniel Gultsch	2016-03-01	3	-9/+30
\| \| * \|	let users confirm each member in a conference even if that contact is already...	Daniel Gultsch	2016-03-01	6	-52/+137
\| \| * \|	use correct jid when leaving a conference. fixes #1732	Daniel Gultsch	2016-02-29	2	-6/+6
\| \| * \|	refactored omemo to take multiple recipients	Daniel Gultsch	2016-02-29	12	-173/+320
\| \| * \|	rename purge keys positive button to 'purge keys'	Daniel Gultsch	2016-02-28	1	-1/+1
\| \| * \|	made hashtable in roster store jids instead of strings	Daniel Gultsch	2016-02-28	1	-9/+7
\| \| * \|	removed unneeded proguard files	Daniel Gultsch	2016-02-27	2	-47/+0
\| \| * \|	always search offline contacts as well. fixes #1653	Daniel Gultsch	2016-02-27	1	-0/+1
\| \| * \|	Merge branch 'master' of github.com:siacs/Conversations	Daniel Gultsch	2016-02-27	3	-1/+34
\| \| \|\ \
\| \| \| * \	Merge pull request #1721 from fiaxh/export_logs_storage_permission	Daniel Gultsch	2016-02-27	3	-1/+34
\| \| \| \|\ \
\| \| \| \| * \|	Request WRITE_EXTERNAL_STORAGE for ExportLogsPreference in >= M	fiaxh	2016-02-24	2	-0/+33
\| \| \| \| * \|	No possibility of multiple invocation of log export	fiaxh	2016-02-24	1	-1/+1
\| \| * \| \| \|	changed single_account config into more simple lock_settings	Daniel Gultsch	2016-02-27	8	-8/+29
\| \| \|/ / /
* \| \| \| \|	Merge branch 'trz/rebase' into trz/rename	lookshe	2016-03-08	1	-1/+2
\|\\| \| \| \|
\| * \| \| \|	use Build.VERSION_CODES.KITKAT instead of hard coded 19	lookshe	2016-03-08	1	-1/+2
* \| \| \| \|	Merge branch 'trz/rebase' into trz/rename	lookshe	2016-03-07	9	-22/+49
\|\\| \| \| \|
\| * \| \| \|	Fixes FS#151 - Missing button on image-links	lookshe	2016-03-07	4	-5/+6
\| * \| \| \|	corrected getRealPathFromUri	lookshe	2016-03-07	2	-4/+43
\| * \| \| \|	Finally fixes FS#142	lookshe	2016-03-07	3	-13/+0
* \| \| \| \|	Merge branch 'trz/rebase' into trz/rename	lookshe	2016-03-07	2	-0/+1
\|\\| \| \| \|