Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Certify design | Dominik Schürmann | 2014-10-07 | 1 | -1/+6 |
| | |||||
* | Fix app name | Dominik Schürmann | 2014-10-05 | 1 | -1/+1 |
| | |||||
* | UI stuff | Dominik Schürmann | 2014-10-05 | 1 | -1/+1 |
| | |||||
* | implement preliminary MultiCertifyActivity (most heavy lifting is done) | Vincent Breitmoser | 2014-10-04 | 1 | -0/+4 |
| | |||||
* | New add keys activity | Dominik Schürmann | 2014-10-04 | 1 | -8/+18 |
| | |||||
* | Version 3.0.1 | Dominik Schürmann | 2014-10-03 | 1 | -2/+2 |
| | |||||
* | Version 3.0 | Dominik Schürmann | 2014-10-02 | 1 | -2/+2 |
| | |||||
* | 3.0 beta3 | Dominik Schürmann | 2014-09-30 | 1 | -2/+2 |
| | |||||
* | 3.0 beta2 | Dominik Schürmann | 2014-09-29 | 1 | -2/+2 |
| | |||||
* | Disable NfcIntentActivity until we implement it properly | Dominik Schürmann | 2014-09-29 | 1 | -10/+10 |
| | |||||
* | Merge remote-tracking branch 'origin/master' | Vincent Breitmoser | 2014-09-29 | 1 | -1/+10 |
|\ | | | | | | | | | Conflicts: OpenKeychain/src/main/AndroidManifest.xml | ||||
| * | Fix NfcActivity task stack problem | Dominik Schürmann | 2014-09-29 | 1 | -1/+10 |
| | | |||||
* | | add barely functional nfc intent activity (WIP!) | Vincent Breitmoser | 2014-09-29 | 1 | -0/+12 |
|/ | |||||
* | Dont show keyboard by default in key creation to allow the user to get an ↵ | Dominik Schürmann | 2014-09-27 | 1 | -0/+1 |
| | | | | overview what to type, use spannable where possible | ||||
* | 3.0 beta1 | Dominik Schürmann | 2014-09-24 | 1 | -2/+2 |
| | |||||
* | Fix NfcActivity typo | Dominik Schürmann | 2014-09-24 | 1 | -1/+1 |
| | |||||
* | Merge openpgp-card lib into OpenKeychain, it was already depending on OK, no ↵ | Dominik Schürmann | 2014-09-24 | 1 | -0/+3 |
| | | | | need to separate | ||||
* | DecryptTextActivity rework | Dominik Schürmann | 2014-09-23 | 1 | -3/+12 |
| | |||||
* | Fix cleartext verify | Dominik Schürmann | 2014-09-17 | 1 | -1/+0 |
| | |||||
* | Passphrase handling in encrypt | Dominik Schürmann | 2014-09-17 | 1 | -0/+1 |
| | |||||
* | Result parcel refactorings (WIP) | Dominik Schürmann | 2014-09-17 | 1 | -1/+1 |
| | |||||
* | ACCESS_NETWORK_STATE no longer needed | Dominik Schürmann | 2014-09-15 | 1 | -1/+0 |
| | |||||
* | New decrypt activity design (WIP), saner UTF8 decoding (replacing ↵ | Dominik Schürmann | 2014-09-15 | 1 | -155/+16 |
| | | | | non-decodable characters) | ||||
* | First work on decrypt | Dominik Schürmann | 2014-09-14 | 1 | -0/+161 |
| | |||||
* | Add new PassphraseDialogActivity, a transparent activity that only holds the ↵ | Dominik Schürmann | 2014-09-13 | 1 | -2/+4 |
| | | | | passphrase dialog | ||||
* | Version 2.9.2 | Dominik Schürmann | 2014-09-09 | 1 | -2/+2 |
| | |||||
* | Dont make portrait a requirement | Dominik Schürmann | 2014-09-08 | 1 | -0/+4 |
| | |||||
* | Version 2.9.1 | Dominik Schürmann | 2014-09-08 | 1 | -2/+2 |
| | |||||
* | remove send umltiple from text API | Dominik Schürmann | 2014-09-07 | 1 | -1/+0 |
| | |||||
* | API fixes | Dominik Schürmann | 2014-09-07 | 1 | -3/+1 |
| | |||||
* | Update and fix Intent API | Dominik Schürmann | 2014-09-07 | 1 | -2/+2 |
| | |||||
* | Make Intent API as recommended in ↵ | Dominik Schürmann | 2014-09-07 | 1 | -10/+1 |
| | | | | http://developer.android.com/guide/components/intents-filters.html | ||||
* | Fix AndroidManifest for new encrypt activities | Dominik Schürmann | 2014-09-06 | 1 | -1/+25 |
| | |||||
* | Add safeslinger to build | Dominik Schürmann | 2014-09-04 | 1 | -0/+1 |
| | |||||
* | split EncryptActivity into Encrypt{Text,File}Activity | Vincent Breitmoser | 2014-09-01 | 1 | -8/+16 |
| | |||||
* | Version 2.9 | Dominik Schürmann | 2014-08-31 | 1 | -2/+2 |
| | |||||
* | v2.8 | Dominik Schürmann | 2014-08-27 | 1 | -2/+2 |
| | |||||
* | v2.8 beta4 | Dominik Schürmann | 2014-08-22 | 1 | -2/+2 |
| | |||||
* | 2.8 beta3 | Dominik Schürmann | 2014-08-21 | 1 | -2/+2 |
| | |||||
* | 2.8 beta2 | Dominik Schürmann | 2014-08-21 | 1 | -2/+2 |
| | |||||
* | Add sync properties | Dominik Schürmann | 2014-08-21 | 1 | -1/+4 |
| | |||||
* | v2.8 beta1 | Dominik Schürmann | 2014-08-21 | 1 | -2/+2 |
| | |||||
* | Fix mime types, #781 | mar-v-in | 2014-08-19 | 1 | -2/+4 |
| | |||||
* | ConsolidateDialogActivity | Dominik Schürmann | 2014-08-19 | 1 | -0/+4 |
| | |||||
* | Fix debug backup/restore methods | Dominik Schürmann | 2014-08-04 | 1 | -1/+1 |
| | |||||
* | Smaller UI fixes | Dominik Schürmann | 2014-08-04 | 1 | -25/+18 |
| | |||||
* | Merge branch 'master' into improve-file-more | mar-v-in | 2014-07-31 | 1 | -27/+186 |
|\ | | | | | | | | | | | | | | | | | | | | | | | | | 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 | ||||
| * | More file association hacks for AndroidManifest and key import | Dominik Schürmann | 2014-07-31 | 1 | -3/+157 |
| | | |||||
| * | Merge branch 'ditch-appmsg' | Vincent Breitmoser | 2014-07-29 | 1 | -5/+0 |
| |\ | | | | | | | | | | | | | | | | | | | Conflicts: OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/KeyListFragment.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ViewKeyMainFragment.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/dialog/ShareQrCodeDialogFragment.java | ||||
| | * | Merge branch 'master' into ditch-appmsg | Vincent Breitmoser | 2014-07-26 | 1 | -2/+7 |
| | |\ | | | | | | | | | | | | | | | | | | | | | Conflicts: OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/EditKeyActivityOld.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/KeyListActivity.java |