Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | API: Allow ACTION_SIGN_AND_ENCRYPT with no key ids or user ids extras, fix pr... | Dominik Schürmann | 2014-08-16 | 1 | -5/+5 |
* | Merge pull request #767 from mar-v-in/issue-763 | Dominik Schürmann | 2014-08-14 | 3 | -9/+5 |
|\ | |||||
| * | Add and use CertifyKeySpinner | mar-v-in | 2014-08-14 | 1 | -8/+4 |
| * | factor KeySpinner out | mar-v-in | 2014-08-14 | 2 | -1/+1 |
* | | change keybase hint following pull request #755 | Dominik Schürmann | 2014-08-14 | 2 | -2/+2 |
* | | Automcomplete names and emails in keyserver tab | Dominik Schürmann | 2014-08-14 | 1 | -1/+1 |
|/ | |||||
* | Move certify action down into actions section | Dominik Schürmann | 2014-08-13 | 1 | -12/+12 |
* | Edit key: key flags | Dominik Schürmann | 2014-08-05 | 1 | -1/+1 |
* | More work on add subkey dialog design | Dominik Schürmann | 2014-08-05 | 1 | -3/+8 |
* | Work on add subkey dialog design | Dominik Schürmann | 2014-08-05 | 2 | -73/+88 |
* | Refactor expiry dialog | Dominik Schürmann | 2014-08-05 | 1 | -0/+16 |
* | Fixing lint complaints, removing unused resources | Dominik Schürmann | 2014-08-04 | 3 | -4/+3 |
* | Fix debug backup/restore methods | Dominik Schürmann | 2014-08-04 | 1 | -1/+0 |
* | Remove old edit key stuff | Dominik Schürmann | 2014-08-04 | 3 | -309/+0 |
* | Edit key: subkey adding, not finished | Dominik Schürmann | 2014-08-04 | 6 | -236/+136 |
* | Smaller UI fixes | Dominik Schürmann | 2014-08-04 | 1 | -27/+27 |
* | Merge pull request #728 from mar-v-in/improve-file-more | Dominik Schürmann | 2014-08-04 | 12 | -253/+350 |
|\ | |||||
| * | Minor cleanup | mar-v-in | 2014-08-02 | 1 | -1/+1 |
| * | Fix focusing with To field | mar-v-in | 2014-08-02 | 1 | -0/+2 |
| * | Encrypt UI (drop downs) | mar-v-in | 2014-08-01 | 2 | -14/+35 |
| * | Merge branch 'master' into improve-file-more | mar-v-in | 2014-08-01 | 7 | -15/+75 |
| |\ | |||||
| * | | Fix string resources | mar-v-in | 2014-07-31 | 1 | -1/+1 |
| * | | Fix merge | mar-v-in | 2014-07-31 | 1 | -0/+2 |
| * | | Merge branch 'master' into improve-file-more | mar-v-in | 2014-07-31 | 25 | -624/+815 |
| |\ \ | |||||
| * | | | - add multi select for storage api (kitkat) | mar-v-in | 2014-07-31 | 3 | -30/+25 |
| * | | | Load of rework on EncryptActivity, still some TODOs | mar-v-in | 2014-07-20 | 3 | -13/+43 |
| * | | | Merge branch 'master' into improve-file-more | mar-v-in | 2014-07-06 | 9 | -120/+265 |
| |\ \ \ | |||||
| * | | | | Many changes to file ... and still incomplete | mar-v-in | 2014-07-06 | 10 | -237/+253 |
| * | | | | Encrypt/Decrypt UI work | mar-v-in | 2014-07-02 | 3 | -79/+108 |
* | | | | | Add user id with dialog | Dominik Schürmann | 2014-08-01 | 6 | -67/+61 |
| |_|_|/ |/| | | | |||||
* | | | | Start fixing CachedPublicKeyRing | Dominik Schürmann | 2014-08-01 | 1 | -1/+0 |
* | | | | move upload/update buttons from menu to buttons | Vincent Breitmoser | 2014-07-31 | 2 | -0/+45 |
* | | | | Create key: design fixes | Dominik Schürmann | 2014-07-31 | 6 | -14/+30 |
| |_|/ |/| | | |||||
* | | | Fix animations in create key | Dominik Schürmann | 2014-07-31 | 1 | -25/+11 |
* | | | Add notify layouts to some activities | Dominik Schürmann | 2014-07-31 | 4 | -80/+104 |
* | | | Robots like coffee too... | Dominik Schürmann | 2014-07-31 | 4 | -11/+26 |
* | | | Smaller notes | Dominik Schürmann | 2014-07-31 | 1 | -1/+1 |
* | | | Create key: work on upload | Dominik Schürmann | 2014-07-30 | 3 | -182/+219 |
* | | | Create key: repeat passphrase | Dominik Schürmann | 2014-07-30 | 2 | -2/+11 |
* | | | Create key: upload | Dominik Schürmann | 2014-07-30 | 1 | -0/+2 |
* | | | Fix drawer in key list | Dominik Schürmann | 2014-07-30 | 1 | -4/+4 |
* | | | Create key: layout above buttons | Dominik Schürmann | 2014-07-30 | 2 | -4/+8 |
* | | | Fix conflicts | Dominik Schürmann | 2014-07-30 | 1 | -2/+23 |
* | | | Merge branch 'master' of github.com:open-keychain/open-keychain | Dominik Schürmann | 2014-07-30 | 4 | -63/+24 |
|\ \ \ | |||||
| * \ \ | Merge branch 'ditch-appmsg' | Vincent Breitmoser | 2014-07-29 | 4 | -63/+24 |
| |\ \ \ | |||||
| | * | | | some more work on supertoast and result parcel stuff | Vincent Breitmoser | 2014-07-27 | 5 | -67/+21 |
| | * | | | Merge branch 'master' into ditch-appmsg | Vincent Breitmoser | 2014-07-26 | 7 | -218/+131 |
| | |\ \ \ | |||||
| | * | | | | use SuperToast instead of AppMsg in code, part 1 | Vincent Breitmoser | 2014-07-07 | 2 | -1/+6 |
| | | |_|/ | | |/| | | |||||
* | / | | | Create key with fragments | Dominik Schürmann | 2014-07-30 | 3 | -80/+229 |
|/ / / / | |||||
* | | | | Fix build by removing old icon reference | Dominik Schürmann | 2014-07-28 | 1 | -1/+0 |