conversations - copy of conversations repo

	Commit message (Expand)	Author	Age	Files	Lines
...
\| \| * \|	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
\|\\| \| \| \|
\| * \| \| \|	Fixes FS#150 - Swipe out conversation kills app	lookshe	2016-03-07	2	-0/+1
* \| \| \| \|	Version bump to 0.0.6	steckbrief	2016-03-06	1	-2/+2
* \| \| \| \|	Merge branch 'trz/rebase' into trz/rename	lookshe	2016-03-06	397	-7994/+23249
\|\\| \| \| \|
\| * \| \| \|	Fixes: FS#94 - wrong size on emojicon keyboardtrz/1.10.1.1	lookshe	2016-03-06	2	-3/+20
\| * \| \| \|	Implements: FS#142 - Fix Conference notifications	lookshe	2016-03-06	2	-7/+5
\| * \| \| \|	Fixes FS#147: Disable OMEMO	steckbrief	2016-03-02	20	-981/+1331
\| * \| \| \|	Readme updated	steckbrief	2016-03-02	1	-0/+5
\| * \| \| \|	Fixes FS#146: Remove Tor-Support	steckbrief	2016-03-02	34	-142/+13
\| * \| \| \|	Fixes FS#148: Remove 'store' hint from chat-markers	steckbrief	2016-03-02	1	-2/+1
\| * \| \| \|	externalized string 'Retry decryption'trz/merge_1.10.1	steckbrief	2016-02-28	3	-1/+3
\| * \| \| \|	Merge tag '1.10.1' into trz/merge_1.10.1	steckbrief	2016-02-28	26	-100/+238
\| \|\\| \| \|
\| \| * \| \|	version bump to 1.10.1 and changelog1.10.1	Daniel Gultsch	2016-02-26	2	-2/+6
\| \| * \| \|	disallow message correction by default. fixes #1720	Daniel Gultsch	2016-02-26	2	-2/+2
\| \| * \| \|	execute pending mam queries every time we come online	Daniel Gultsch	2016-02-26	1	-1/+1
\| \| * \| \|	hide add account icons when single_account is set to true	Daniel Gultsch	2016-02-24	2	-1/+5
\| \| * \| \|	optionally lock conference domains as well and hide known domains in ui	Daniel Gultsch	2016-02-24	10	-22/+76
\| \| * \| \|	made hard coded choice for encryptions more flexible and disable parsing	Daniel Gultsch	2016-02-24	6	-26/+66
\| \| \| \|/ \| \| \|/\|
\| \| * \|	Merge pull request #1715 from fiaxh/gpg_decryption_failed	Daniel Gultsch	2016-02-24	5	-2/+21
\| \| \|\ \
\| \| \| * \|	Retry decryption from message menu	fiaxh	2016-02-23	5	-2/+21
\| \| \| \|/
\| \| * \|	set noMessagesLeftOnServer before conference configuration fetch	Daniel Gultsch	2016-02-23	2	-2/+2
\| \| * \|	update notification after message correction	Daniel Gultsch	2016-02-23	1	-0/+1
\| \| * \|	reset pending subscription request when receiving roster update	Daniel Gultsch	2016-02-23	1	-0/+2
\| \| * \|	Revert "disable predexing on travis"	Daniel Gultsch	2016-02-23	2	-103/+95
\| \| * \|	disable predexing on travis	Daniel Gultsch	2016-02-23	2	-95/+103
\| \| * \|	made presences object final in contact	Daniel Gultsch	2016-02-23	1	-5/+1
\| \| * \|	fixed typo in travis.yml	Daniel Gultsch	2016-02-23	1	-1/+1
\| \| * \|	fixed formating in travis config	Daniel Gultsch	2016-02-23	1	-1/+1
\| \| * \|	added remark that users don't need their own app server	Daniel Gultsch	2016-02-23	1	-1/+3
\| \| * \|	tell travis to build free version	Daniel Gultsch	2016-02-23	1	-0/+2
\| \| * \|	update build instructions in readme	Daniel Gultsch	2016-02-23	1	-2/+4
\| \| \|/
\| \| *	properly trigger show load more messages in mucs	Daniel Gultsch	2016-02-22	1	-2/+10
\| \| *	turned muc errors into enum. added error codes for service shutdown	Daniel Gultsch	2016-02-22	6	-39/+54
\| * \|	Fixes FS#48 and FS#136trz/merge_1.10.0	lookshe	2016-02-28	5	-24/+3
\| * \|	Unused imports / methods removed	steckbrief	2016-02-24	3	-27/+0
\| * \|	Fixes FS#89 after merge conflict	steckbrief	2016-02-24	1	-3/+6
\| * \|	Fixed merge issue for resolving FS#47 (preferences involved in the decision f...	steckbrief	2016-02-24	2	-11/+1