conversations - copy of conversations repo

	Commit message (Collapse)	Author	Age	Files	Lines
*	add omemo fingerprints to web links as well	Daniel Gultsch	2016-12-03	3	-18/+33
\|
*	show warning dialog beforing verifying keys via a link	Daniel Gultsch	2016-12-03	4	-10/+92
\|
*	Merge branch 'feature-quotation' of ↵	Daniel Gultsch	2016-12-02	20	-11/+305
\|\ \| \| \| \| \| \|	https://github.com/Mishiranu/Conversations into Mishiranu-feature-quotation
\| *	Add quotation support	Mishiranu	2016-11-25	20	-11/+305
\| \|
* \|	default using internal storage to false	Daniel Gultsch	2016-12-02	1	-1/+1
\| \|
* \|	Merge branch 'master' of https://github.com/Fenisu/Conversations into ↵	Daniel Gultsch	2016-12-02	12	-24/+150
\|\ \ \| \| \| \| \| \| \| \| \|	Fenisu-master
\| * \|	Private files using a boolean flag from Config.java.	Ignacio Quezada	2016-11-08	10	-18/+147
\| \| \|
* \| \|	support for jid escapting when displaying localpart only	Daniel Gultsch	2016-12-01	4	-3/+17
\| \| \|
* \| \|	use prepped string when building axolotl session	Daniel Gultsch	2016-12-01	1	-3/+3
\| \| \|
* \| \|	don't use own jid joined from another client to generate muc title	Daniel Gultsch	2016-12-01	1	-1/+4
\| \| \|
* \| \|	don't show share button before account is setup	Daniel Gultsch	2016-12-01	1	-0/+3
\| \| \|
* \| \|	only show contact related snackbars when conversation is single	Daniel Gultsch	2016-12-01	1	-3/+3
\| \| \|
* \| \|	made provider authorities relativ to deal with different package ids	Daniel Gultsch	2016-12-01	5	-9/+15
\| \| \|
* \| \|	avoid binding multiple times from BarcodeService	Daniel Gultsch	2016-12-01	1	-15/+22
\| \| \|
* \| \|	increment version code and release version 1.15.01.15.0	Daniel Gultsch	2016-11-30	1	-2/+2
\| \| \|
* \| \|	pulled translations from transifex	Daniel Gultsch	2016-11-30	5	-2/+61
\| \| \|
* \| \|	renamed foreground service preference	Daniel Gultsch	2016-11-30	3	-3/+4
\| \| \|
* \| \|	pulled translations from transifex	Daniel Gultsch	2016-11-29	4	-0/+5
\| \| \|
* \| \|	better handle the case when same user is joined with multiple nicks in the ↵	Daniel Gultsch	2016-11-29	2	-8/+26
\| \| \| \| \| \| \| \| \| \| \| \|	same room
* \| \|	pulled translations from transifex	Daniel Gultsch	2016-11-28	5	-0/+36
\| \| \|
* \| \|	mark conversations as read after receiving blocklist push for that conversations	Daniel Gultsch	2016-11-28	1	-0/+9
\| \| \|
* \| \|	allow fingerprint verification via context menu	Daniel Gultsch	2016-11-28	7	-20/+100
\| \| \|
* \| \|	add support for body paramater in xmpp uri	Daniel Gultsch	2016-11-28	2	-6/+36
\| \| \|
* \| \|	sent messages from unverified devices show red lock	Daniel Gultsch	2016-11-28	1	-1/+1
\| \| \|
* \| \|	pulled translations from transifex	Daniel Gultsch	2016-11-25	29	-50/+128
\| \| \|
* \| \|	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
\| \| * \| \|	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
\| * \| \|	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
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	* untrusted messages have red background * unverified message have normal background and red lock
* \| \| \|	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
\| \| \| \| \| \| \| \| \| \| \| \|	read more about the concept on https://gultsch.de/trust.html
* \| \|	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
\| \| * \| \|	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
\| \| \|/ \| \|/\|