Commit Graph
1744 Commits
Author SHA1 Message Date
Tim Bray 0f59e6bd95 In the ImportKeysList display, arrange for Keybase UserIDs to sort below the rest. Also mention Keybase stuff other than Twitter/GitHub/Website 2014-11-18 22:12:50 -08:00
Tim Bray 36bac67dd5 All keybase proofs now in place 2014-11-11 18:45:36 -08:00
Tim Bray 4929e346a2 XML fragment for proof listing 2014-11-07 12:29:17 -08:00
Tim Bray c05441667e Moved from WebView to Spannables, some proof cleanup too 2014-11-07 12:28:27 -08:00
Dominik Schürmann f3da3b31e5 Pull from transifex 2014-11-02 17:54:10 +01:00
Dominik Schürmann 9dc8c0d506 Changelog 2014-11-02 17:50:31 +01:00
Dominik Schürmann f4d0e5250b Pull from transifex 2014-10-30 12:52:33 +01:00
Dominik Schürmann 26a4cf2a56 Changelog 3.1.1 2014-10-30 12:48:06 +01:00
Dominik Schürmann e02b2ab30c Pull from transifex 2014-10-26 23:32:34 +01:00
Dominik Schürmann 5f20abdb26 Pull from transifex 2014-10-26 23:23:30 +01:00
Dominik Schürmann 893a4620c1 Changelog 3.1 2014-10-26 23:15:46 +01:00
Dominik Schürmann 1e5797387a Rename multi certify files to certify 2014-10-26 22:41:40 +01:00
Vincent Breitmoser 84b234af37 Display error on certification attempt with yubikey
Closes #978
2014-10-26 22:29:47 +01:00
Vincent Breitmoser b8ed54bc69 Merge branch 'development' of github.com:open-keychain/open-keychain into development 2014-10-26 05:25:54 +01:00
Vincent Breitmoser 84a57411a5 add descriptive text to safeslinger activity 2014-10-26 02:12:29 +01:00
Dominik Schürmann 3325ff57a7 Use new safe slinger activity from share tab 2014-10-26 02:34:51 +02:00
Dominik Schürmann 4631f45ed7 Merge branch 'development' of github.com:open-keychain/open-keychain into development 2014-10-26 02:17:26 +02:00
Dominik Schürmann be3e6ae6ef Move advanced info into own activity 2014-10-26 02:16:39 +02:00
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