Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | 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 | ||||
| | * | | use SuperToast instead of AppMsg in code, part 1 | Vincent Breitmoser | 2014-07-07 | 1 | -5/+0 |
| | | | | |||||
| * | | | Redesigned QR Code view | Dominik Schürmann | 2014-07-27 | 1 | -0/+4 |
| | | | | |||||
| * | | | Open keyboard on passphrase dialog, this should now work on all Android ↵ | Dominik Schürmann | 2014-07-27 | 1 | -17/+15 |
| | | | | | | | | | | | | | | | | versions... hopefully | ||||
| * | | | Work on first time wizard design | Dominik Schürmann | 2014-07-27 | 1 | -1/+5 |
| | |/ | |/| | |||||
| * | | New first time screen | Dominik Schürmann | 2014-07-16 | 1 | -2/+7 |
| |/ | |||||
* | | - add multi select for storage api (kitkat) | mar-v-in | 2014-07-31 | 1 | -2/+3 |
| | | | | | | | | | | - UI fixes - refactoring | ||||
* | | Merge branch 'master' into improve-file-more | mar-v-in | 2014-07-06 | 1 | -2/+2 |
|\| | | | | | | | | | | | | | | | | | 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 | ||||
| * | Remove old edit button, rename activities | Dominik Schürmann | 2014-07-03 | 1 | -2/+2 |
| | | |||||
* | | Many changes to file ... and still incomplete | mar-v-in | 2014-07-06 | 1 | -0/+1 |
| | | | | | | | | | | - Multi file - Reworked UI | ||||
* | | Add temporary file storage as discussed in #665 | mar-v-in | 2014-07-01 | 1 | -0/+9 |
|/ | | | | Writable from OpenKeychain, readable worldwide. Should be used to write shared files to it by first creating the file using TemporaryStorageProvider.createFile and then write to the Uri returned. | ||||
* | Magic to find possible mails and names of device owner | Dominik Schürmann | 2014-06-28 | 1 | -0/+1 |
| | |||||
* | Start work on a first-time wizard | Dominik Schürmann | 2014-06-27 | 1 | -0/+5 |
| | |||||
* | Start new designed activity | Dominik Schürmann | 2014-06-21 | 1 | -0/+5 |
| | |||||
* | Fix new actionbar icon sizes, rename icon to ic_launcher following Android ↵ | Dominik Schürmann | 2014-06-18 | 1 | -1/+1 |
| | | | | naming conventions | ||||
* | Merge remote-tracking branch 'origin/master' into canonicalize | Vincent Breitmoser | 2014-06-13 | 1 | -0/+33 |
|\ | | | | | | | | | | | | | | | | | | | Conflicts: .gitmodules OpenKeychain/build.gradle OpenKeychain/src/main/AndroidManifest.xml OpenKeychain/src/main/java/org/sufficientlysecure/keychain/keyimport/ImportKeysListEntry.java OpenKeychain/src/main/res/values/strings.xml settings.gradle | ||||
| * | Show keys with android contacts | mar-v-in | 2014-06-05 | 1 | -0/+6 |
| | | | | | | | | This means to sync userid + keyid into contact storage. Android will merge them to normal contacts based on primary userid. | ||||
| * | First version of automatic contact discovery. | mar-v-in | 2014-06-04 | 1 | -0/+26 |
| | | | | | | | | | | | | | | | | | | TODO: - Configuration (much of it) - Enabled by default? - Which keys to import? Current state: All non-revoked and non-expired with matching userid - Search for keys if already known? Current state: yes, may cause traffic (configuration: only when wifi?) - Update interval: Currently Android handles it, might be good (causes automatic refresh on new contact and stuff like that) or bad (too many of refreshes) | ||||
| * | ContactHelper can read email addresses from contact list | mar-v-in | 2014-05-26 | 1 | -0/+1 |
| | | |||||
* | | import-log: add LogDisplay activity | Vincent Breitmoser | 2014-06-10 | 1 | -0/+6 |
|/ | |||||
* | Version 2.7 | Dominik Schürmann | 2014-05-08 | 1 | -2/+2 |
| | |||||
* | Better handling of actionbars back | Dominik Schürmann | 2014-05-07 | 1 | -2/+12 |
| | |||||
* | Version 2.6.1 | Dominik Schürmann | 2014-04-22 | 1 | -2/+2 |
| | |||||
* | version 2.6 | Dominik Schürmann | 2014-04-19 | 1 | -2/+2 |
| | |||||
* | OK 2.6 RC1 | Dominik Schürmann | 2014-04-17 | 1 | -2/+2 |
| | |||||
* | add up navigation in ViewCertActivity | Vincent Breitmoser | 2014-04-17 | 1 | -1/+1 |
| | | | | Fixes #567 | ||||
* | Update comments in AndroidManifest | Dominik Schürmann | 2014-04-17 | 1 | -4/+6 |
| | |||||
* | Version 2.6 beta1 | Dominik Schürmann | 2014-04-16 | 1 | -2/+2 |
| | |||||
* | Remove unused blob classes and other dead code | Dominik Schürmann | 2014-04-13 | 1 | -26/+3 |
| | |||||
* | Rename folder structure from OpenPGP Keychain to OpenKeychain | Dominik Schürmann | 2014-04-06 | 1 | -0/+450 |