776 Commits

Author	SHA1	Message	Date
Vincent Breitmoser	510ef40f55	implement upload of keyring after certification, check that option by default	2014-10-26 01:50:48 +02:00
Dominik Schürmann	825baeee1b	Merge branch 'development' of github.com:open-keychain/open-keychain into development	2014-10-26 00:38:31 +02:00
Dominik Schürmann	8257e450f9	Fixes from transifex	2014-10-26 00:38:25 +02:00
Vincent Breitmoser	fb7264d7fd	Merge branch 'development' of github.com:open-keychain/open-keychain into development	2014-10-26 00:34:19 +02:00
Dominik Schürmann	f51aebf52d	Move some multi select items in overflow menu, rename import	2014-10-26 00:30:10 +02:00
Vincent Breitmoser	33738b1f52	Retry canonicalization with pubkey self certs if first attempt failed ... Fixes #974	2014-10-26 00:26:13 +02:00
Dominik Schürmann	e4391c282d	Fix layout of select key adapter	2014-10-26 00:15:35 +02:00
Dominik Schürmann	74bac3ea36	Remove empty layout	2014-10-25 23:36:48 +02:00
Dominik Schürmann	c2e7c2416f	Remove tabs from import keys activity	2014-10-25 22:05:55 +02:00
Dominik Schürmann	71e3fb5380	Merge branch 'development' of github.com:open-keychain/open-keychain into development	2014-10-25 21:15:12 +02:00
Dominik Schürmann	0abfff0b0e	Fixes and icons for apps list, also add Password Store	2014-10-25 21:15:05 +02:00
Vincent Breitmoser	26bd847c32	shorter certification explanation	2014-10-25 03:18:54 +02:00
Vincent Breitmoser	ce4b8edaab	more rewording	2014-10-25 03:18:54 +02:00
Vincent Breitmoser	748049fb5b	slightly change wording in merge logs	2014-10-25 02:50:48 +02:00
Vincent Breitmoser	c5028dc9ce	Merge branch 'development' of github.com:open-keychain/open-keychain into development	2014-10-25 02:49:37 +02:00
Vincent Breitmoser	30d0afa363	change the way merging is logged	2014-10-25 02:45:16 +02:00
Dominik Schürmann	e332c664cf	Merge branch 'development' of github.com:open-keychain/open-keychain into development	2014-10-25 02:38:09 +02:00
Dominik Schürmann	33b54ab03e	Safe slinger activity preps	2014-10-25 02:38:06 +02:00
Vincent Breitmoser	ba724353e5	more work on import logging	2014-10-25 02:13:02 +02:00
Vincent Breitmoser	478b2a4d8b	add logging to import and change order of import, keyservers first	2014-10-25 01:59:15 +02:00
Dominik Schürmann	1cbedb60d6	Qr code button text	2014-10-24 00:44:26 +02:00
Dominik Schürmann	b1c164bde0	remove space in on large devices in layouts where no drawer nav is shown	2014-10-24 00:39:33 +02:00
Dominik Schürmann	bfc3774f02	Merge pull request #973 from timbray/development ... Make the Certify screen a little more self-explanatory	2014-10-24 00:23:40 +02:00
Dominik Schürmann	1624cd8349	Start safe slinger activity	2014-10-23 23:31:50 +02:00
Tim Bray	d4fb71cb76	reword sync message	2014-10-22 08:19:13 -07:00
Tim Bray	0516b80c07	Make the Certify screen a little more self-explanatory	2014-10-21 11:35:03 -07:00
Dominik Schürmann	0cdcc90984	More consisitency	2014-10-15 23:22:08 +02:00
Dominik Schürmann	4e1053c6fa	More color/icon consistency	2014-10-15 23:05:29 +02:00
Dominik Schürmann	dc87557805	Group passphrase cache settings	2014-10-13 19:34:41 +02:00
Dominik Schürmann	e9abe57aa7	Remove key list filter for now	2014-10-13 15:53:39 +02:00
Dominik Schürmann	b86d235177	wording	2014-10-13 14:44:23 +02:00
Dominik Schürmann	5219cf5207	Better qr code icon	2014-10-13 14:38:25 +02:00
Jerzy Kołosowski	13ed3bbd8a	Added option for num keypad for YubiKey	2014-10-13 04:47:48 +02:00
Vincent Breitmoser	815ed2e233	rewrite export with new operation style	2014-10-13 00:26:59 +02:00
Vincent Breitmoser	5453a3e5af	DeleteResult: add custom createNotify	2014-10-11 19:55:19 +02:00
Vincent Breitmoser	e6a7960b8f	move delete into operation class	2014-10-11 03:50:21 +02:00
Vincent Breitmoser	ee00894e27	different wording in share tab	2014-10-10 19:43:34 +02:00
Vincent Breitmoser	ebdcb53c68	fix width of displayed qr code	2014-10-10 19:42:30 +02:00
Vincent Breitmoser	21ea040910	add keys button goes to directly to qr scan	2014-10-10 19:05:33 +02:00
Vincent Breitmoser	2dcd070014	keylist: add safeslinger exchange button to secret keys	2014-10-10 19:05:30 +02:00
Dominik Schürmann	7646baf486	Better handling if no api key is selected	2014-10-09 01:51:35 +02:00
Vincent Breitmoser	f6d0347c79	rename certify_key_item to the more appropriate multi_certify_item	2014-10-08 22:47:30 +02:00
Dominik Schürmann	0d6d4653b4	Big error screen if signature is invalid or key is revoked/expired, also fixes signature status for expired and revoked keys	2014-10-08 18:31:31 +02:00
Dominik Schürmann	2eb776594f	Handle revoked and expired keys in decrypt activity	2014-10-08 17:39:53 +02:00
Dominik Schürmann	158f22a799	Merge branch 'development' of github.com:open-keychain/open-keychain into development	2014-10-08 17:32:41 +02:00
Dominik Schürmann	b573afe235	New decryption screen UI with modernPGP icons	2014-10-08 17:32:32 +02:00
Vincent Breitmoser	590650a303	remove ui hack, use padding instead of margin	2014-10-08 15:36:18 +02:00
Vincent Breitmoser	1b160f68c9	slightly change text in certify dialog	2014-10-08 15:15:25 +02:00
Dominik Schürmann	adcc07ca65	Filter key list by certified keys	2014-10-08 14:42:56 +02:00
Dominik Schürmann	27d062496f	Fix MSG_MF_UID_PRIMARY log	2014-10-07 17:50:09 +02:00