Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Remove monospace from encrypt item | Dominik Schürmann | 2014-10-07 | 1 | -1/+0 |
| | |||||
* | Cleanup and fix decrypt activity | Dominik Schürmann | 2014-10-07 | 1 | -20/+32 |
| | |||||
* | Certify design | Dominik Schürmann | 2014-10-07 | 1 | -1/+1 |
| | |||||
* | Certify design | Dominik Schürmann | 2014-10-07 | 4 | -109/+120 |
| | |||||
* | forgot layout piece for 096f6e436 | Vincent Breitmoser | 2014-10-06 | 1 | -3/+5 |
| | |||||
* | get rid of some old code in LogDisplayFragment | Vincent Breitmoser | 2014-10-06 | 1 | -70/+4 |
| | |||||
* | certify: checkbox fake click area tidbit | Vincent Breitmoser | 2014-10-06 | 1 | -0/+10 |
| | |||||
* | move "synchronize" checkbox to bottom section as well | Vincent Breitmoser | 2014-10-06 | 1 | -17/+14 |
| | |||||
* | multicertify: move key spinner to the bottom | Vincent Breitmoser | 2014-10-06 | 4 | -45/+33 |
| | |||||
* | Fix app name | Dominik Schürmann | 2014-10-05 | 2 | -1/+3 |
| | |||||
* | Merge branch 'jacobshack-certify' of github.com:open-keychain/open-keychain ↵ | Vincent Breitmoser | 2014-10-05 | 14 | -81/+59 |
|\ | | | | | | | into jacobshack-certify | ||||
| * | UI stuff | Dominik Schürmann | 2014-10-05 | 14 | -81/+59 |
| | | |||||
* | | use sub results in import | Vincent Breitmoser | 2014-10-05 | 2 | -3/+14 |
| | | |||||
* | | add support for second line in log view | Vincent Breitmoser | 2014-10-05 | 4 | -34/+113 |
| | | |||||
* | | add support for hierarchical log entries | Vincent Breitmoser | 2014-10-05 | 3 | -10/+103 |
|/ | |||||
* | use status icons in public key selection | Dominik Schürmann | 2014-10-05 | 8 | -129/+45 |
| | |||||
* | Add cloud icon | Dominik Schürmann | 2014-10-05 | 5 | -0/+1 |
| | |||||
* | Merge branch 'jacobshack-certify' of github.com:open-keychain/open-keychain ↵ | Vincent Breitmoser | 2014-10-05 | 4 | -56/+63 |
|\ | | | | | | | into jacobshack-certify | ||||
| * | Give result down to list | Dominik Schürmann | 2014-10-05 | 2 | -50/+58 |
| | | |||||
| * | Make bit size optional | Dominik Schürmann | 2014-10-05 | 3 | -6/+5 |
| | | |||||
* | | even more layout neatification | Vincent Breitmoser | 2014-10-05 | 2 | -17/+35 |
|/ | |||||
* | Merge branch 'jacobshack-certify' of github.com:open-keychain/open-keychain ↵ | Vincent Breitmoser | 2014-10-05 | 6 | -11/+40 |
|\ | | | | | | | | | | | | | into jacobshack-certify Conflicts: OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/MultiCertifyKeyFragment.java | ||||
| * | preselect certify key | Dominik Schürmann | 2014-10-05 | 6 | -14/+35 |
| | | |||||
| * | Display result in multi certify | Dominik Schürmann | 2014-10-04 | 3 | -1/+9 |
| | | |||||
* | | more layout neatification | Vincent Breitmoser | 2014-10-05 | 3 | -4/+22 |
| | | |||||
* | | slight layout changes to keyspinner_item | Vincent Breitmoser | 2014-10-05 | 3 | -7/+6 |
|/ | |||||
* | Merge branch 'jacobshack-certify' of github.com:open-keychain/open-keychain ↵ | Vincent Breitmoser | 2014-10-04 | 3 | -137/+141 |
|\ | | | | | | | into jacobshack-certify | ||||
| * | use new multi certify, layout fixes | Dominik Schürmann | 2014-10-04 | 3 | -137/+141 |
| | | |||||
* | | merge key ids in getSelectedCertifyActions | Vincent Breitmoser | 2014-10-04 | 2 | -24/+28 |
|/ | |||||
* | Merge branch 'jacobshack-certify' of github.com:open-keychain/open-keychain ↵ | Vincent Breitmoser | 2014-10-04 | 13 | -206/+378 |
|\ | | | | | | | into jacobshack-certify | ||||
| * | add divider | Dominik Schürmann | 2014-10-04 | 2 | -3/+7 |
| | | |||||
| * | qr code download, cleanup | Dominik Schürmann | 2014-10-04 | 2 | -117/+63 |
| | | |||||
| * | Workings on new parcel for key downloads | Dominik Schürmann | 2014-10-04 | 8 | -86/+212 |
| | | |||||
| * | Pass imported master key ids via result parcel | Dominik Schürmann | 2014-10-04 | 5 | -51/+87 |
| | | |||||
| * | Fixing import, start qr code stuff | Dominik Schürmann | 2014-10-04 | 1 | -50/+116 |
| | | |||||
* | | implement preliminary MultiCertifyActivity (most heavy lifting is done) | Vincent Breitmoser | 2014-10-04 | 10 | -9/+822 |
| | | |||||
* | | certify: get rid of fingerprint check | Vincent Breitmoser | 2014-10-04 | 5 | -16/+6 |
|/ | | | | | | Master key ids are unambiguous by database design, and only keys which are in the database are signed. There is no reason to check the fingerprint again during the certify operation. | ||||
* | Merge branch 'jacobshack-certify' of github.com:open-keychain/open-keychain ↵ | Vincent Breitmoser | 2014-10-04 | 12 | -42/+751 |
|\ | | | | | | | into jacobshack-certify | ||||
| * | Merge branch 'jacobshack-certify' of github.com:open-keychain/open-keychain ↵ | Dominik Schürmann | 2014-10-04 | 10 | -289/+653 |
| |\ | | | | | | | | | | into jacobshack-certify | ||||
| * | | Import code, fix collision of key spinner with other loaders | Dominik Schürmann | 2014-10-04 | 7 | -46/+321 |
| | | | |||||
| * | | New add keys activity | Dominik Schürmann | 2014-10-04 | 8 | -13/+447 |
| | | | |||||
* | | | improve CertifyResult, add custom notify | Vincent Breitmoser | 2014-10-04 | 15 | -26/+140 |
| |/ |/| | |||||
* | | redesign certify action to work with parcel input and result | Vincent Breitmoser | 2014-10-04 | 10 | -43/+389 |
| | | |||||
* | | keychainintentservice: rearrange actions in alphabetical order | Vincent Breitmoser | 2014-10-04 | 1 | -263/+281 |
|/ | |||||
* | canonicalize: compare user ids as string rather than bytes | Vincent Breitmoser | 2014-10-04 | 1 | -3/+3 |
| | |||||
* | Merge branch 'master' of github.com:open-keychain/open-keychain | Vincent Breitmoser | 2014-10-03 | 36 | -72/+165 |
|\ | |||||
| * | Make app_name translatable | Dominik Schürmann | 2014-10-03 | 2 | -6/+2 |
| | | |||||
| * | Version 3.0.1 | Dominik Schürmann | 2014-10-03 | 1 | -2/+2 |
| | | |||||
| * | Fix string reference | Dominik Schürmann | 2014-10-03 | 1 | -1/+1 |
| | | |||||
| * | Pull from transifex | Dominik Schürmann | 2014-10-03 | 31 | -63/+154 |
| | |