Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge remote-tracking branch 'origin/master' into canonicalize | Vincent Breitmoser | 2014-06-13 | 7 | -2/+28 |
|\ | |||||
| * | Merge pull request #650 from open-keychain/v/import-log | Dominik Schürmann | 2014-06-06 | 1 | -0/+39 |
| |\ | |||||
| * \ | Merge pull request #649 from mar-v-in/automatic-contact-discovery | Dominik Schürmann | 2014-06-06 | 4 | -0/+19 |
| |\ \ | |||||
| | * | | Fixing TAG and string resource | mar-v-in | 2014-06-06 | 1 | -2/+1 |
| | * | | Show keys with android contacts | mar-v-in | 2014-06-05 | 2 | -3/+2 |
| | * | | Merge branch 'master' into automatic-contact-discovery | mar-v-in | 2014-06-04 | 93 | -649/+1315 |
| | |\ \ | |||||
| | * | | | First version of automatic contact discovery. | mar-v-in | 2014-06-04 | 4 | -0/+21 |
| * | | | | Move SlidingTabLayout and SlidingTabStrip into appropriate subpackage | Dominik Schürmann | 2014-06-06 | 2 | -2/+2 |
| * | | | | Hide subkeys, certs tabs in key view, checkable menu item to show/hide them | Dominik Schürmann | 2014-06-06 | 2 | -0/+7 |
| | |/ / | |/| | | |||||
* | | | | canonicalize: require primary key binding certificates for signing subkeys | Vincent Breitmoser | 2014-06-12 | 1 | -2/+5 |
* | | | | canonicalize: simplify import with info from canonicalization | Vincent Breitmoser | 2014-06-12 | 1 | -4/+0 |
* | | | | canonicalize: filter out future and local certificates | Vincent Breitmoser | 2014-06-12 | 1 | -6/+13 |
* | | | | import-log: more minor improvements | Vincent Breitmoser | 2014-06-12 | 1 | -8/+6 |
* | | | | import: use wrapped keyring instead of uncached keyring for trust | Vincent Breitmoser | 2014-06-12 | 1 | -1/+1 |
* | | | | import-log: minor improvements | Vincent Breitmoser | 2014-06-12 | 1 | -1/+3 |
* | | | | canonicalize: more stuff | Vincent Breitmoser | 2014-06-12 | 1 | -7/+10 |
* | | | | canonicalize: implementation, first draft | Vincent Breitmoser | 2014-06-12 | 1 | -1/+20 |
* | | | | import-log: better way to check self trust, and fix log level filtering | Vincent Breitmoser | 2014-06-12 | 1 | -1/+0 |
* | | | | import-log: work on log fragment ui | Vincent Breitmoser | 2014-06-10 | 2 | -3/+11 |
* | | | | import-log: switch to flags instead of statuses for result int | Vincent Breitmoser | 2014-06-10 | 11 | -70/+72 |
* | | | | import-log: more interface work | Vincent Breitmoser | 2014-06-10 | 1 | -10/+23 |
* | | | | import-log: some cosmetics | Vincent Breitmoser | 2014-06-10 | 5 | -23/+26 |
* | | | | import-log: add LogDisplay activity | Vincent Breitmoser | 2014-06-10 | 4 | -17/+91 |
* | | | | import-log: add OperationResults, use it in ImportKeys operation | Vincent Breitmoser | 2014-06-10 | 1 | -3/+9 |
| |_|/ |/| | | |||||
* | | | import-log: better stripped key logging | Vincent Breitmoser | 2014-06-06 | 1 | -1/+2 |
* | | | import-log: add import log string resources | Vincent Breitmoser | 2014-06-06 | 1 | -0/+38 |
|/ / | |||||
* | | Merge remote-tracking branch 'origin/master' into edit-key-rewrite | Vincent Breitmoser | 2014-06-02 | 93 | -652/+1317 |
|\ \ | |||||
| * | | Merge branch 'master' of github.com:open-keychain/open-keychain | Dominik Schürmann | 2014-05-31 | 1 | -3/+3 |
| |\| | |||||
| | * | Add Log.d for QueryFailedException | Tim Bray | 2014-05-23 | 1 | -3/+3 |
| * | | Pull from transifex | Dominik Schürmann | 2014-05-31 | 92 | -649/+1314 |
| |/ | |||||
* | | Merge remote-tracking branch 'origin/master' into wrapped-key-ring | Vincent Breitmoser | 2014-05-21 | 10 | -67/+59 |
|\| | |||||
| * | Layout fixes for key import | Dominik Schürmann | 2014-05-19 | 9 | -66/+58 |
| * | Clarify help start | Dominik Schürmann | 2014-05-14 | 1 | -1/+1 |
* | | Merge remote-tracking branch 'origin/master' into wrapped-key-ring | Vincent Breitmoser | 2014-05-14 | 366 | -941/+2107 |
|\| | |||||
| * | Add pgpauth app to help, update html-textview | Dominik Schürmann | 2014-05-13 | 3 | -27/+4 |
| * | Add Tim Bray to about | Dominik Schürmann | 2014-05-09 | 1 | -0/+1 |
| * | Translations from transifex | Dominik Schürmann | 2014-05-08 | 19 | -3/+141 |
| * | Changelog 2.7 | Dominik Schürmann | 2014-05-08 | 1 | -0/+9 |
| * | Translations from transifex | Dominik Schürmann | 2014-05-08 | 4 | -8/+12 |
| * | Use flat buttons where appropriate | Dominik Schürmann | 2014-05-08 | 12 | -26/+67 |
| * | use LoaderFragment in ViewKey tabs | Vincent Breitmoser | 2014-05-08 | 3 | -9/+3 |
| * | extract generic LoaderFragment superclass from KeyList | Vincent Breitmoser | 2014-05-08 | 2 | -83/+93 |
| * | Update from transifex | Dominik Schürmann | 2014-05-08 | 27 | -14/+202 |
| * | Add applications section to help | Dominik Schürmann | 2014-05-07 | 5 | -20/+6 |
| * | Start app menu item for registered apps | Dominik Schürmann | 2014-05-07 | 6 | -0/+7 |
| * | Better handling of actionbars back | Dominik Schürmann | 2014-05-07 | 1 | -3/+3 |
| * | Design fixes for certification activity | Dominik Schürmann | 2014-05-07 | 3 | -11/+28 |
| * | Alignment in certify activity | Dominik Schürmann | 2014-05-07 | 1 | -0/+1 |
| * | Change drawer nav icon back to gray | Dominik Schürmann | 2014-05-07 | 8 | -0/+0 |
| * | Translations from transifex | Dominik Schürmann | 2014-05-07 | 1 | -5/+6 |