| Commit message (Collapse) | Author | Age | Files | Lines | |
|---|---|---|---|---|---|
| * | Switch to html-textview from JCenter | Dominik Schürmann | 2015-04-12 | 1 | -4/+0 |
| | | |||||
| * | Add TokenAutoComplete and StickyListHeaders as maven dependencies instead of ↵ | Dominik Schürmann | 2015-03-30 | 1 | -8/+0 |
| | | | | | git submodules | ||||
| * | use top line in snackbar for status indication | Vincent Breitmoser | 2015-03-22 | 1 | -0/+3 |
| | | |||||
| * | Add ignore dirty to other git submodules | Dominik Schürmann | 2015-03-15 | 1 | -2/+9 |
| | | |||||
| * | Fixed Spacing issue | Ishan Khanna | 2015-03-04 | 1 | -3/+3 |
| | | |||||
| * | This edit prevents some modules from throwing untracked content warning in git | Ishan Khanna | 2015-03-04 | 1 | -1/+3 |
| | | |||||
| * | Removed unused submodules | Dominik Schürmann | 2015-03-02 | 1 | -9/+0 |
| | | |||||
| * | Removed submodule android-lockpattern | Dominik Schürmann | 2015-02-23 | 1 | -3/+0 |
| | | |||||
| * | Add android-lockpattern library | Dominik Schürmann | 2014-12-29 | 1 | -0/+3 |
| | | |||||
| * | Removed submodule openpgp-card-nfc-lib | Dominik Schürmann | 2014-09-24 | 1 | -3/+0 |
| | | |||||
| * | Add safeslinger submodule | Dominik Schürmann | 2014-09-04 | 1 | -1/+4 |
| | | |||||
| * | Merge branch 'master' into yubikey | Dominik Schürmann | 2014-08-06 | 1 | -0/+3 |
| |\ | | | | | | | | | | | | | | | | | Conflicts: .gitmodules OpenKeychain/build.gradle OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/KeychainIntentService.java extern/openpgp-api-lib settings.gradle | ||||
| | * | Merge branch 'master' into improve-file-more | mar-v-in | 2014-07-31 | 1 | -6/+0 |
| | |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 | ||||
| | * | | Many changes to file ... and still incomplete | mar-v-in | 2014-07-06 | 1 | -0/+3 |
| | | | | | | | | | | | | | | | | - Multi file - Reworked UI | ||||
| * | | | Merge branch 'master' into yubikey | Dominik Schürmann | 2014-08-01 | 1 | -3/+0 |
| |\ \ \ | | |/ | |/| | | | | | | | | | | | | | | | | Conflicts: .gitmodules OpenKeychain/src/main/java/org/sufficientlysecure/keychain/helper/Preferences.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/CanonicalizedSecretKey.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/UncachedKeyRing.java | ||||
| | * | | Merge branch 'master' into ditch-appmsg | Vincent Breitmoser | 2014-07-26 | 1 | -3/+0 |
| | |\ \ | | | | | | | | | | | | | | | | | | | | | Conflicts: OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/EditKeyActivityOld.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/KeyListActivity.java | ||||
| | * | | | get rid of AppMsg library | Vincent Breitmoser | 2014-07-07 | 1 | -3/+0 |
| | | |/ | |/| | |||||
| * | | | Merge branch 'master' into yubikey | Dominik Schürmann | 2014-07-18 | 1 | -4/+1 |
| |\ \ \ | | |/ | |/| | | | | | | | Conflicts: .gitmodules | ||||
| | * | | Removed OpenPGP-haskell submodule | Dominik Schürmann | 2014-07-18 | 1 | -4/+1 |
| | | | | |||||
| * | | | Add nfc lib | Dominik Schürmann | 2014-07-16 | 1 | -0/+3 |
| |/ / | |||||
| * / | put unit tests into external module (CAVEAT) | Vincent Breitmoser | 2014-07-09 | 1 | -2/+2 |
| |/ | | | | | | | this requires a more up to date version of gradle-android-test-plugin than is currently in the repositories. it must be added to the local maven repo using ./install-custom-gradle-test-plugin.sh before compiling. | ||||
| * | Removed submodule AndroidBootstrap | Dominik Schürmann | 2014-06-30 | 1 | -3/+0 |
| | | |||||
| * | Change keybase submodule to our fork | Dominik Schürmann | 2014-06-28 | 1 | -1/+1 |
| | | |||||
| * | Merge submodules | Dominik Schürmann | 2014-06-24 | 1 | -0/+3 |
| |\ | |||||
| | * | https for submodules | Art O Cathain | 2014-06-23 | 1 | -1/+1 |
| | | | |||||
| | * | add OpenPGP-Haskell to test collateral | Art O Cathain | 2014-06-23 | 1 | -0/+3 |
| | | | |||||
| * | | Add minidns submodule | mar-v-in | 2014-06-23 | 1 | -0/+3 |
| | | | |||||
| * | | Remove dnsjava module | mar-v-in | 2014-06-23 | 1 | -3/+0 |
| |/ | |||||
| * | Moved Keybase stuff into KeybaseLib submodule | Tim Bray | 2014-06-20 | 1 | -0/+3 |
| | | |||||
| * | Merge remote-tracking branch 'origin/master' into canonicalize | Vincent Breitmoser | 2014-06-13 | 1 | -0/+3 |
| |\ | | | | | | | | | | | | | | | | | | | 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 | ||||
| | * | Add dnsjava as submodule | mar-v-in | 2014-06-05 | 1 | -0/+3 |
| | | | |||||
| * | | import-log: add SuperToast external library | Vincent Breitmoser | 2014-06-10 | 1 | -0/+3 |
| |/ | |||||
| * | Move API libs and API example into their own git repos | Dominik Schürmann | 2014-05-07 | 1 | -0/+6 |
| | | |||||
| * | Use git submodules for libs, fix compilation, remove library sourcecode | Dominik Schürmann | 2014-04-16 | 1 | -0/+21 |
 |
index : connectbot-yubikey/open-keychain | |
| open-keychain with patches to support ssh authentication | James |
| aboutsummaryrefslogtreecommitdiffstats |
path: root/.gitmodules