637 Commits

Author	SHA1	Message	Date
Vincent Breitmoser	e46bc24079	add cancel support to edit key action	2014-08-31 19:20:08 +02:00
Vincent Breitmoser	d483a8b73e	get rid of some last bootstrapbutton references	2014-08-31 19:01:28 +02:00
Dominik Schürmann	f6d1b45007	Move date picker to left because of width constraints inside the dialog	2014-08-31 18:51:29 +02:00
Vincent Breitmoser	06eb7148a2	Merge remote-tracking branch 'origin/master'	2014-08-31 17:37:45 +02:00
Vincent Breitmoser	7da7832284	Add cancelable mechanism and support in key import ... Closes #323	2014-08-31 17:32:13 +02:00
Dominik Schürmann	5444c14ef9	Hide keyserver spinner under advanced options in certify activity	2014-08-31 17:26:29 +02:00
Vincent Breitmoser	a73abf57f1	if there is only one private key, use it fo certification by default	2014-08-31 00:19:59 +02:00
Vincent Breitmoser	0738a38bbe	use LoaderFragment for CertifyActivity	2014-08-31 00:19:16 +02:00
Vincent Breitmoser	b6203a2b3c	Merge remote-tracking branch 'dakid/master'	2014-08-30 17:03:47 +02:00
Vincent Breitmoser	5ff3043903	canonicalize: add check for algorithm type ... closes #797	2014-08-30 17:00:58 +02:00
Daniel Albert	c7c2ccab45	Encrypted message is not being spellchecked anymore	2014-08-30 16:55:47 +02:00
Dominik Schürmann	b193965e58	Merge pull request #796 from open-keychain/develop ... ECC support	2014-08-28 10:46:58 +02:00
Dominik Schürmann	9288e4f0a9	Fix RuntimeException in KeyListActivity on tablets	2014-08-28 10:37:01 +02:00
Dominik Schürmann	c2f6aa09c5	Merge branch 'master' of github.com:open-keychain/open-keychain	2014-08-27 19:28:46 +02:00
Dominik Schürmann	d795f8d4e2	Strip out duplicate user ids	2014-08-27 19:28:33 +02:00
Vincent Breitmoser	cb2eb8aca2	small language fixes for previous commit	2014-08-27 15:42:09 +02:00
Dominik Schürmann	12a5b2174f	Abort import of pubkeys where secret keys exist but new pubkey has more subkeys, fix #696	2014-08-27 14:12:59 +02:00
Dominik Schürmann	86a05033ae	Cleanup FoldableLinearLayout	2014-08-27 13:54:33 +02:00
Vincent Breitmoser	783dae8804	add ecc support	2014-08-24 16:08:37 +02:00
Dominik Schürmann	79c4d3ea49	Pull from transifex	2014-08-22 09:54:01 +02:00
Dominik Schürmann	3acbe9052f	Add ECDH and ECDSA values	2014-08-21 15:40:09 +02:00
Dominik Schürmann	f0ff8d2222	Add sync properties	2014-08-21 11:25:41 +02:00
Dominik Schürmann	2930f83b2a	Change account type	2014-08-21 11:19:44 +02:00
Dominik Schürmann	7adf07a9f9	XML cleanup	2014-08-21 10:47:29 +02:00
Dominik Schürmann	41052d6f8f	Pull from transifex	2014-08-21 00:36:15 +02:00
Dominik Schürmann	642a63fab6	Merge branch 'master' of github.com:open-keychain/open-keychain	2014-08-20 23:26:09 +02:00
Dominik Schürmann	418e922c78	Enable sync adapter, changelog	2014-08-20 23:26:01 +02:00
Vincent Breitmoser	dcf268bcb2	move key deletion into KeychainIntentHandler	2014-08-20 23:08:52 +02:00
Dominik Schürmann	e8bc9083f2	improve certs_text	2014-08-20 23:01:27 +02:00
Vincent Breitmoser	dd1b27b28f	consolidate: small ui things	2014-08-20 21:52:54 +02:00
Vincent Breitmoser	c296529049	modifyKey: small logging changes	2014-08-20 20:15:43 +02:00
Vincent Breitmoser	1e5ac82985	Merge branch 'master' of github.com:open-keychain/open-keychain	2014-08-20 19:59:54 +02:00
Vincent Breitmoser	475293a116	consolidate: prevent concurrent calls of step 2	2014-08-20 19:59:45 +02:00
Dominik Schürmann	0e152d1db0	Merge branch 'master' of github.com:open-keychain/open-keychain ... Conflicts: OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/KeychainIntentService.java	2014-08-20 19:48:19 +02:00
Dominik Schürmann	f46f2b6895	Fixes and temporary fixes for returning results	2014-08-20 19:46:44 +02:00
Vincent Breitmoser	2a96912a96	Merge branch 'master' of github.com:open-keychain/open-keychain	2014-08-20 19:34:42 +02:00
Vincent Breitmoser	fe1f5489ff	consolidate: implement (mostly) recovery mode	2014-08-20 19:34:36 +02:00
Dominik Schürmann	c3b12bb3c2	Pull from transifex	2014-08-20 18:30:22 +02:00
Dominik Schürmann	70426041df	Pull from transifex	2014-08-20 11:09:41 +02:00
Dominik Schürmann	16ab761006	Fix strings	2014-08-19 18:12:19 +02:00
Vincent Breitmoser	9930ab7f6f	consolidate: a lot more log output, better recovery	2014-08-19 16:53:55 +02:00
Dominik Schürmann	4be8c36b43	Merge branch 'master' of github.com:open-keychain/open-keychain	2014-08-19 16:31:59 +02:00
Dominik Schürmann	5f8bbab569	Scroll fixes for certify activity	2014-08-19 16:31:51 +02:00
Vincent Breitmoser	c725239a69	consolidate: split into two steps, can pick up at second step if anything fails	2014-08-19 15:45:59 +02:00
Dominik Schürmann	c1a265bfd1	certs header design	2014-08-19 10:01:31 +02:00
Dominik Schürmann	638c29792d	Header for certs view	2014-08-19 09:52:15 +02:00
Dominik Schürmann	a5d34478df	Add subkey: at least one flag should be selected!	2014-08-18 11:13:52 +02:00
Dominik Schürmann	3e7ce0008f	Fixes for expiry UI	2014-08-18 11:02:41 +02:00
Vincent	56fb822034	Merge pull request #772 from mar-v-in/issue-729 ... Remove NoSwipeWrapContentViewPager	2014-08-17 15:46:27 +02:00
mar-v-in	3cc57a092a	Remove NoSwipeWrapContentViewPager	2014-08-17 11:07:34 +02:00