conversations - copy of conversations repo

	Commit message (Expand)	Author	Age	Files	Lines
...
* \| \|	fixed migrations from pre-btbv phase	Daniel Gultsch	2016-11-25	1	-3/+7
* \| \|	Merge branch 'master' of github.com:siacs/Conversations	Daniel Gultsch	2016-11-25	1	-1/+1
\|\ \ \
\| * \ \	Merge pull request #2147 from licaon-kter/patch-5	Daniel Gultsch	2016-11-25	1	-1/+1
\| \|\ \ \
\| \| * \| \|	Typo in Readme	licaon-kter	2016-11-24	1	-1/+1
\| \|/ / /
* / / /	changed blind trust before verification summary to a slightly longer one	Daniel Gultsch	2016-11-24	1	-3/+3
\|/ / /
* \| \|	Merge pull request #2146 from licaon-kter/patch-4	Daniel Gultsch	2016-11-24	1	-0/+4
\|\ \ \
\| * \| \|	Add FAQ about the new trust concept	licaon-kter	2016-11-24	1	-0/+4
* \| \| \|	always force close a connection when disabling from error state	Daniel Gultsch	2016-11-24	2	-1/+5
* \| \| \|	bumped gradle to 1.15.0-beta	Daniel Gultsch	2016-11-24	2	-2/+9
* \| \| \|	pulled translations from transifex	Daniel Gultsch	2016-11-24	30	-422/+804
* \| \| \|	changed design language to match BTBV proposal	Daniel Gultsch	2016-11-24	3	-8/+14
* \| \| \|	update the conversations view (and the lock icon) after receiving device list	Daniel Gultsch	2016-11-24	1	-0/+1
\|/ / /
* \| \|	explictly scan for aztec and qr codes only	Daniel Gultsch	2016-11-23	3	-31/+4
* \| \|	introduced blind trust before verification mode	Daniel Gultsch	2016-11-23	8	-7/+62
* \| \|	Merge branch 'master' of github.com:siacs/Conversations	Daniel Gultsch	2016-11-22	1	-3/+3
\|\ \ \
\| * \ \	Merge pull request #2130 from da2x/patch-2	Daniel Gultsch	2016-11-20	1	-3/+3
\| \|\ \ \
\| \| * \| \|	Fix up the langauge in some Settings strings	Daniel Aleksandersen	2016-11-19	1	-3/+3
* \| \| \| \|	added share button to account details	Daniel Gultsch	2016-11-22	7	-25/+288
* \| \| \| \|	show proper avatar for 'self' contact. fixes #2138	Daniel Gultsch	2016-11-22	2	-2/+9
* \| \| \| \|	offer verification directly from the trust keys screen	Daniel Gultsch	2016-11-22	16	-3/+96
* \| \| \| \|	use aztec code instead of qr	Daniel Gultsch	2016-11-21	2	-12/+7
* \| \| \| \|	use constants for some preferences	Daniel Gultsch	2016-11-21	3	-15/+20
* \| \| \| \|	when swiping don't clean startup counter entirely. just don't count last startup	Daniel Gultsch	2016-11-21	2	-5/+10
\|/ / / /
* \| \| \|	Merge branch 'master' of github.com:siacs/Conversations	Daniel Gultsch	2016-11-20	1	-0/+5
\|\\| \| \|
\| * \| \|	added section to FAQ about default encryption	Daniel Gultsch	2016-11-18	1	-0/+5
\| \| \|/ \| \|/\|
* \| \|	introduced custom tls socket factory to make tls1.2 work for http connections	Daniel Gultsch	2016-11-20	2	-12/+71
* \| \|	remove omemo devices from annoucement after 7 days of inactivity	Daniel Gultsch	2016-11-19	4	-22/+69
* \| \|	don't show omemo keys by default in account details	Daniel Gultsch	2016-11-19	1	-1/+1
* \| \|	don't use xmpp uri for self verification if account is disabled	Daniel Gultsch	2016-11-19	1	-1/+1
* \| \|	save last activation time in fingerprint status	Daniel Gultsch	2016-11-19	5	-8/+58
* \| \|	removed some unecessary locking	Daniel Gultsch	2016-11-19	1	-20/+19
* \| \|	close socket after failed stream open	Daniel Gultsch	2016-11-19	1	-1/+4
* \| \|	check if thread was interrupted before doing operations on socket	Daniel Gultsch	2016-11-19	2	-76/+77
* \| \|	fixed regression that would crash create contact dialog. fixes #2131	Daniel Gultsch	2016-11-19	1	-2/+4
* \| \|	show 'clear devices' button underneath own devices	Daniel Gultsch	2016-11-18	7	-53/+55
* \| \|	removed some unecessary logging from omemo message generation	Daniel Gultsch	2016-11-18	1	-4/+0
* \| \|	lower own otr fingerprint	Daniel Gultsch	2016-11-18	1	-1/+2
* \| \|	issue ping after network change	Daniel Gultsch	2016-11-18	2	-3/+3
* \| \|	lower reconnection time	Daniel Gultsch	2016-11-18	1	-1/+1
* \| \|	synchronzie on xmpp service around all state changes	Daniel Gultsch	2016-11-18	1	-106/+113
* \| \|	don't reset last connect time on network change	Daniel Gultsch	2016-11-18	2	-7/+9
* \| \|	use lower case otr fingerprints for comparison	Daniel Gultsch	2016-11-18	2	-2/+3
* \| \|	removed some very verbose logging from axolotl service	Daniel Gultsch	2016-11-18	1	-1/+0
* \| \|	lower casing fingerprints when parsing URI	Daniel Gultsch	2016-11-18	1	-1/+1
\|/ /
* \|	put omemo fingerprint in own uri (qr code / nfc)	Daniel Gultsch	2016-11-17	6	-17/+80
* \|	parse omemo fingerprints from uris	Daniel Gultsch	2016-11-17	11	-44/+172
* \|	fixed back and forth between Welcome- and EditAccountActivity	Daniel Gultsch	2016-11-17	1	-4/+25
* \|	use base64.nowrap for omemo keys	Daniel Gultsch	2016-11-17	1	-3/+3
* \|	reset startup count when swiped away (only count kills)	Daniel Gultsch	2016-11-17	2	-7/+3
* \|	update shortcut badger	Daniel Gultsch	2016-11-16	1	-1/+1