Commit message (Collapse) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
* | Cleanup keyspinner layout, key id typeface monospace | Dominik Schürmann | 2014-08-31 | 1 | -32/+36 | |
| | ||||||
* | Merge branch 'master' of github.com:open-keychain/open-keychain | Dominik Schürmann | 2014-08-31 | 2 | -3/+1 | |
|\ | ||||||
| * | get rid of some last bootstrapbutton references | Vincent Breitmoser | 2014-08-31 | 2 | -3/+1 | |
| | | ||||||
* | | Better leyout for account settings | Dominik Schürmann | 2014-08-31 | 3 | -63/+90 | |
| | | ||||||
* | | Move date picker to left because of width constraints inside the dialog | Dominik Schürmann | 2014-08-31 | 1 | -6/+1 | |
|/ | ||||||
* | Hide keyserver spinner under advanced options in certify activity | Dominik Schürmann | 2014-08-31 | 2 | -8/+15 | |
| | ||||||
* | if there is only one private key, use it fo certification by default | Vincent Breitmoser | 2014-08-31 | 1 | -3/+7 | |
| | ||||||
* | use LoaderFragment for CertifyActivity | Vincent Breitmoser | 2014-08-31 | 3 | -179/+198 | |
| | ||||||
* | Encrypted message is not being spellchecked anymore | Daniel Albert | 2014-08-30 | 1 | -1/+1 | |
| | ||||||
* | Merge pull request #796 from open-keychain/develop | Dominik Schürmann | 2014-08-28 | 1 | -1/+19 | |
|\ | | | | | ECC support | |||||
| * | add ecc support | Vincent Breitmoser | 2014-08-24 | 1 | -1/+19 | |
| | | ||||||
* | | Fix RuntimeException in KeyListActivity on tablets | Dominik Schürmann | 2014-08-28 | 2 | -15/+14 | |
| | | ||||||
* | | Cleanup FoldableLinearLayout | Dominik Schürmann | 2014-08-27 | 3 | -10/+5 | |
|/ | ||||||
* | Scroll fixes for certify activity | Dominik Schürmann | 2014-08-19 | 1 | -7/+5 | |
| | ||||||
* | certs header design | Dominik Schürmann | 2014-08-19 | 1 | -3/+11 | |
| | ||||||
* | Header for certs view | Dominik Schürmann | 2014-08-19 | 2 | -23/+38 | |
| | ||||||
* | Fixes for expiry UI | Dominik Schürmann | 2014-08-18 | 1 | -0/+10 | |
| | ||||||
* | Merge pull request #772 from mar-v-in/issue-729 | Vincent | 2014-08-17 | 1 | -5/+3 | |
|\ | | | | | Remove NoSwipeWrapContentViewPager | |||||
| * | Remove NoSwipeWrapContentViewPager | mar-v-in | 2014-08-17 | 1 | -5/+3 | |
| | | ||||||
* | | API: Allow ACTION_SIGN_AND_ENCRYPT with no key ids or user ids extras, fix ↵ | Dominik Schürmann | 2014-08-16 | 1 | -5/+5 | |
|/ | | | | pre-selection of key ids (no revoked or expired ones, also select duplicates), refactor text using spannables | |||||
* | Merge pull request #767 from mar-v-in/issue-763 | Dominik Schürmann | 2014-08-14 | 3 | -9/+5 | |
|\ | | | | | Use dropdown in CertifyActivity | |||||
| * | 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 | |
|\ | | | | | Improve file encrypt | |||||
| * | 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 | |
| |\ | | | | | | | | | | | | | | | | Conflicts: OpenKeychain/src/main/java/org/sufficientlysecure/keychain/provider/CachedPublicKeyRing.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/EncryptAsymmetricFragment.java | |||||
| * | | 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 | |
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: .gitmodules OpenKeychain/build.gradle OpenKeychain/src/main/AndroidManifest.xml OpenKeychain/src/main/java/org/sufficientlysecure/keychain/provider/CachedPublicKeyRing.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/DecryptFileFragment.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/DecryptMessageFragment.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/EncryptAsymmetricFragment.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/EncryptFileFragment.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/EncryptMessageFragment.java | |||||
| * | | | - add multi select for storage api (kitkat) | mar-v-in | 2014-07-31 | 3 | -30/+25 | |
| | | | | | | | | | | | | | | | | | | | | - UI fixes - refactoring | |||||
| * | | | 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 | |
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/KeychainIntentService.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/DecryptActivity.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/EncryptActivity.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/KeyListFragment.java OpenKeychain/src/main/res/layout/encrypt_content.xml | |||||
| * | | | | Many changes to file ... and still incomplete | mar-v-in | 2014-07-06 | 10 | -237/+253 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | - Multi file - Reworked UI | |||||
| * | | | | 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 | |
| | | | |