| Commit message (Collapse) | Author | Age | Files | Lines | ||
|---|---|---|---|---|---|---|
| ... | ||||||
| * | | | | | | 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 | 12 | -70/+33 | |
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: OpenKeychain/src/main/java/org/sufficientlysecure/keychain/remote/ui/AccountSettingsFragment.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/CreateKeyActivity.java | |||||
| | * \ \ \ \ \ | Merge branch 'ditch-appmsg' | Vincent Breitmoser | 2014-07-29 | 12 | -70/+33 | |
| | |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 | |||||
| | | * | | | | | | introduce EditKeyResult with transient UncachedKeyRing (half-baked!) | Vincent Breitmoser | 2014-07-27 | 7 | -7/+7 | |
| | | | | | | | | | ||||||
| | | * | | | | | | 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 | 11 | -227/+183 | |
| | | |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 | 3 | -1/+7 | |
| | | | | | | | | | | ||||||
| | | * | | | | | | | get rid of AppMsg library | Vincent Breitmoser | 2014-07-07 | 1 | -0/+1 | |
| | | | |_|_|_|_|/ | | |/| | | | | | ||||||
| * | / | | | | | | Create key with fragments | Dominik Schürmann | 2014-07-30 | 9 | -80/+261 | |
| |/ / / / / / / | ||||||
| * | | | | | | | Fix build by removing old icon reference | Dominik Schürmann | 2014-07-28 | 1 | -1/+0 | |
| | | | | | | | | ||||||
| * | | | | | | | Use new icons in other key related activites, delete old icons | Dominik Schürmann | 2014-07-28 | 31 | -30/+28 | |
| | | | | | | | | ||||||
| * | | | | | | | Use verified icon for certify action | Dominik Schürmann | 2014-07-28 | 1 | -11/+40 | |
| | | | | | | | | ||||||
| * | | | | | | | Use icons in key view | Dominik Schürmann | 2014-07-28 | 3 | -21/+25 | |
| | | | | | | | | ||||||
| * | | | | | | | Use new status icons in key list | Dominik Schürmann | 2014-07-28 | 1 | -24/+6 | |
| | | | | | | | | ||||||
| * | | | | | | | Smaller status images, green test | Dominik Schürmann | 2014-07-28 | 60 | -0/+0 | |
| | | | | | | | | ||||||
| * | | | | | | | Fix resource names, add small test | Dominik Schürmann | 2014-07-28 | 61 | -2/+2 | |
| | | | | | | | | ||||||
| * | | | | | | | Add icons from ModernPGP project | Dominik Schürmann | 2014-07-28 | 60 | -0/+0 | |
| | | | | | | | | ||||||
| * | | | | | | | Fix background color of notify area | Dominik Schürmann | 2014-07-27 | 1 | -2/+0 | |
| | | | | | | | | ||||||
| * | | | | | | | Redesigned QR Code view | Dominik Schürmann | 2014-07-27 | 4 | -19/+47 | |
| | | | | | | | | ||||||
| * | | | | | | | Open keyboard on passphrase dialog, this should now work on all Android ↵ | Dominik Schürmann | 2014-07-27 | 1 | -0/+2 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | versions... hopefully | |||||
| * | | | | | | | Prettify buttons | Dominik Schürmann | 2014-07-27 | 1 | -34/+70 | |
| | | | | | | | | ||||||
| * | | | | | | | Work on first time wizard design | Dominik Schürmann | 2014-07-27 | 4 | -84/+120 | |
| | |/ / / / / |/| | | | | | ||||||
| * | | | | | | test and fix: adding an empty user id should fail | Vincent Breitmoser | 2014-07-26 | 1 | -0/+1 | |
| | | | | | | | ||||||
| * | | | | | | canonicalize: fix for tests | Vincent Breitmoser | 2014-07-19 | 1 | -0/+2 | |
| | | | | | | | ||||||
| * | | | | | | Fixed another unescaped apostrophe. | Daniel Albert | 2014-07-17 | 1 | -1/+1 | |
| | | | | | | | ||||||
| * | | | | | | Fixed unescaped apostrophe | Daniel Albert | 2014-07-17 | 1 | -1/+1 | |
| | | | | | | | ||||||
| * | | | | | | Added description to Setting, Changed title to suggested one | Daniel Albert | 2014-07-17 | 2 | -3/+5 | |
| | | | | | | | ||||||
| * | | | | | | Merge remote-tracking branch 'upstream/master' | Daniel Albert | 2014-07-16 | 8 | -212/+130 | |
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: OpenKeychain-Test/src/test/resources/extern/OpenPGP-Haskell OpenKeychain/src/main/java/org/sufficientlysecure/keychain/Constants.java | |||||
| | * | | | | | | Simple create key | Dominik Schürmann | 2014-07-16 | 1 | -5/+0 | |
| | | | | | | | | ||||||
| | * | | | | | | New first time screen | Dominik Schürmann | 2014-07-16 | 8 | -205/+114 | |
| | | | | | | | | ||||||
| | * | | | | | | merge: different msg if nothing was merged | Vincent Breitmoser | 2014-07-15 | 1 | -0/+1 | |
| | | | | | | | | ||||||
| | * | | | | | | Merge remote-tracking branch 'origin/master' into external-test | Vincent Breitmoser | 2014-07-15 | 1 | -0/+7 | |
| | |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: OpenKeychain-Test/src/test/resources/extern/OpenPGP-Haskell OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/KeychainIntentService.java | |||||
| | * | | | | | | | createKey: better logging, handle empty user id case | Vincent Breitmoser | 2014-07-12 | 1 | -0/+5 | |
| | | | | | | | | | ||||||
| | * | | | | | | | Merge remote-tracking branch 'origin/master' into external-test | Vincent Breitmoser | 2014-07-11 | 3 | -14/+34 | |
| | |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: OpenKeychain-Test/src/test/resources/extern/OpenPGP-Haskell OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/OperationResultParcel.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/EditKeyFragment.java | |||||
| | * | | | | | | | | get rid of some inspection warnings | Vincent Breitmoser | 2014-07-11 | 1 | -1/+1 | |
| | | | | | | | | | | ||||||
| | * | | | | | | | | modifyKey: error out on nonexisting new primary user id | Vincent Breitmoser | 2014-07-11 | 1 | -0/+1 | |
| | | | | | | | | | | ||||||
| | * | | | | | | | | add come createKey strings | Vincent Breitmoser | 2014-07-11 | 1 | -1/+8 | |
| | | |_|/ / / / / | |/| | | | | | | ||||||
| * | | | | | | | | Merge remote-tracking branch 'upstream/master' into feature-conceal-software | Daniel Albert | 2014-07-13 | 1 | -2/+2 | |
| |\ \ \ \ \ \ \ \ | | |_|/ / / / / | |/| | | | | | | ||||||
| | * | | | | | | | Fix strings from 'keys' to 'passphrases' | Dominik Schürmann | 2014-07-12 | 1 | -2/+2 | |
| | | | | | | | | | ||||||
| * | | | | | | | | Added Preference for concealing the PgpApplication | Daniel Albert | 2014-07-12 | 2 | -0/+6 | |
| |/ / / / / / / | ||||||
| * | | | | | | | Wello there, That's Java, not C^^ | Daniel Albert | 2014-07-12 | 1 | -1/+1 | |
| | | | | | | | | ||||||
| * | | | | | | | Fixed issues discussed in #713 | Daniel Albert | 2014-07-12 | 1 | -2/+3 | |
| | | | | | | | | ||||||
| * | | | | | | | Put text into strings.xml, for internationalization | Daniel Albert | 2014-07-12 | 1 | -0/+6 | |
| | |/ / / / / |/| | | | | | ||||||
| * | | | | | | cleanup | Dominik Schürmann | 2014-07-08 | 1 | -30/+0 | |
| | | | | | | | ||||||
| * | | | | | | Work on subkeys adapter | Dominik Schürmann | 2014-07-08 | 4 | -14/+64 | |
| |/ / / / / | ||||||
| * | | | | | Bett API string | Dominik Schürmann | 2014-07-04 | 1 | -3/+3 | |
| | | | | | | ||||||
| * | | | | | Use strings in edit key | Dominik Schürmann | 2014-07-03 | 2 | -4/+14 | |
| | | | | | | ||||||
| * | | | | | Pull from transifex | Dominik Schürmann | 2014-07-03 | 3 | -7/+30 | |
| | | | | | | ||||||
| * | | | | | Pull from transifex | Dominik Schürmann | 2014-07-03 | 25 | -352/+1289 | |
| | | | | | | ||||||
 |
index : connectbot-yubikey/open-keychain | |
| open-keychain with patches to support ssh authentication | James |
| aboutsummaryrefslogtreecommitdiffstats |