aboutsummaryrefslogtreecommitdiffstats
path: root/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui
Commit message (Expand)AuthorAgeFilesLines
...
* Merge pull request #728 from mar-v-in/improve-file-moreDominik Schürmann2014-08-0416-941/+1220
|\
| * Minor cleanupmar-v-in2014-08-022-2/+1
| * Fix focusing with To fieldmar-v-in2014-08-022-3/+18
| * Encrypt UI (drop downs)mar-v-in2014-08-014-21/+40
| * Cache input file thumbnail.mar-v-in2014-08-011-3/+20
| * Fix first key is not used erroneouslymar-v-in2014-08-011-1/+0
| * Fixes after mergemar-v-in2014-08-011-2/+5
| * Merge branch 'master' into improve-file-moremar-v-in2014-08-0111-132/+171
| |\
| * | Fix string resourcesmar-v-in2014-07-311-1/+1
| * | Fix mergemar-v-in2014-07-313-37/+19
| * | Merge branch 'master' into improve-file-moremar-v-in2014-07-3131-1706/+1688
| |\ \
| * | | - add multi select for storage api (kitkat)mar-v-in2014-07-318-86/+95
| * | | Make DecryptFragment abstract, as it should bemar-v-in2014-07-251-4/+2
| * | | Load of rework on EncryptActivity, still some TODOsmar-v-in2014-07-207-557/+541
| * | | Merge branch 'master' into improve-file-moremar-v-in2014-07-0623-1314/+1608
| |\ \ \
| * | | | Many changes to file ... and still incompletemar-v-in2014-07-066-98/+524
| * | | | Encrypt/Decrypt UI workmar-v-in2014-07-027-66/+99
| * | | | Missing import after mergemar-v-in2014-07-011-0/+1
| * | | | Merge branch 'master' into improve-file-moremar-v-in2014-07-0128-260/+907
| |\ \ \ \
| * \ \ \ \ Merge branch 'master' into improve-file-moremar-v-in2014-06-248-54/+461
| |\ \ \ \ \
| * \ \ \ \ \ Merge branch 'master' of github.com:mar-v-in/open-keychain into improve-file-...mar-v-in2014-06-2215-79/+495
| |\ \ \ \ \ \
| * | | | | | | Improve file more, Part 1mar-v-in2014-06-229-379/+162
* | | | | | | | Merge branch 'master' of github.com:open-keychain/open-keychainDominik Schürmann2014-08-011-2/+2
|\ \ \ \ \ \ \ \
| * | | | | | | | make FileImportCache generic, iterable, and add unit testVincent Breitmoser2014-08-011-2/+2
| | |_|_|_|_|_|/ | |/| | | | | |
* / | | | | | | Add user id with dialogDominik Schürmann2014-08-017-155/+366
|/ / / / / / /
* | | | | | | Start fixing CachedPublicKeyRingDominik Schürmann2014-08-011-13/+17
* | | | | | | Certifying instead of signingDominik Schürmann2014-08-011-7/+6
* | | | | | | Use darker colorsDominik Schürmann2014-08-013-9/+9
* | | | | | | Show file tab only for import of existing keysDominik Schürmann2014-08-011-15/+42
* | | | | | | Merge branch 'master' of github.com:open-keychain/open-keychainDominik Schürmann2014-07-313-32/+43
|\ \ \ \ \ \ \
| * | | | | | | move upload/update buttons from menu to buttonsVincent Breitmoser2014-07-313-32/+43
* | | | | | | | Show revoked and expired for private keysDominik Schürmann2014-07-311-29/+28
|/ / / / / / /
* | | | | | | Fixes for uploadDominik Schürmann2014-07-313-15/+19
* | | | | | | Merge branch 'master' of github.com:open-keychain/open-keychainDominik Schürmann2014-07-312-25/+15
|\ \ \ \ \ \ \
| * | | | | | | fix bug in UploadKeyActivity, minor work on uri handlingVincent Breitmoser2014-07-312-25/+15
| | |_|_|_|_|/ | |/| | | | |
* / | | | | | Create key: design fixesDominik Schürmann2014-07-311-1/+7
|/ / / / / /
* | | | | | Fix animations in create keyDominik Schürmann2014-07-313-22/+18
* | | | | | Robots like coffee too...Dominik Schürmann2014-07-315-17/+16
* | | | | | Parcelable data over 1MB can not be send through binder, parcel into a cache ...Dominik Schürmann2014-07-311-9/+21
* | | | | | Handle result in create keyDominik Schürmann2014-07-311-2/+7
* | | | | | Keyserver exception translateableDominik Schürmann2014-07-311-2/+4
* | | | | | reduce memory usage while parsing multiple keyrings from a streamVincent Breitmoser2014-07-311-4/+6
* | | | | | couple of logging fixesVincent Breitmoser2014-07-311-2/+0
* | | | | | rename Wrapped*Key* to Canonicalized*Key*Vincent Breitmoser2014-07-314-18/+19
* | | | | | Better exception handling for import of keysDominik Schürmann2014-07-312-36/+16
* | | | | | More file association hacks for AndroidManifest and key importDominik Schürmann2014-07-312-14/+24
* | | | | | Create key: work on uploadDominik Schürmann2014-07-304-10/+14
* | | | | | Create key: repeat passphraseDominik Schürmann2014-07-302-7/+32
* | | | | | Create key: uploadDominik Schürmann2014-07-301-13/+20
* | | | | | return values for create keyDominik Schürmann2014-07-302-4/+20