| Commit message (Collapse) | Author | Age | Files | Lines | ||
|---|---|---|---|---|---|---|
| ... | ||||||
| * | Use SDK and build tools versions from root project | Dominik Schürmann | 2015-03-02 | 1 | -2/+2 | |
| | | ||||||
| * | Enable multi line snackbar option | Dominik Schürmann | 2015-02-27 | 1 | -1/+1 | |
| | | ||||||
| * | Toolbar: qr code in header, cleanup of fragment | Dominik Schürmann | 2015-02-25 | 1 | -0/+1 | |
| | | ||||||
| * | Remove old pattern lib, add new pattern lib | Dominik Schürmann | 2015-02-23 | 1 | -2/+2 | |
| | | ||||||
| * | Update tab lib and fix colors of tabs | Dominik Schürmann | 2015-02-23 | 1 | -1/+1 | |
| | | ||||||
| * | Floating action button icons and methods for key list | Dominik Schürmann | 2015-02-21 | 1 | -1/+1 | |
| | | ||||||
| * | Status bar height fix | Dominik Schürmann | 2015-02-21 | 1 | -1/+1 | |
| | | ||||||
| * | Floating Action Button added in app settings | Dominik Schürmann | 2015-02-03 | 1 | -0/+1 | |
| | | ||||||
| * | Use latest buildTools | ligi | 2015-01-29 | 1 | -1/+1 | |
| | | ||||||
| * | Merge remote-tracking branch 'origin/t/snackbar' into development | Dominik Schürmann | 2015-01-29 | 1 | -0/+1 | |
| |\ | | | | | | | | | Conflicts: OpenKeychain/build.gradle | |||||
| | * | use Notify helper everywhere, replace supertoasts with snackbar library | Vincent Breitmoser | 2015-01-19 | 1 | -0/+1 | |
| | | | ||||||
| * | | Material Design Drawer | Dominik Schürmann | 2015-01-26 | 1 | -0/+1 | |
| | | | ||||||
| * | | specify our usage of java 1.7 in build files | Vincent Breitmoser | 2015-01-25 | 1 | -0/+5 | |
| |/ | ||||||
| * | Style tabs, add missing drawables | Dominik Schürmann | 2015-01-15 | 1 | -0/+1 | |
| | | ||||||
| * | Integrate QR Code library instead of requiring the app to be installed, also ↵ | Dominik Schürmann | 2015-01-14 | 1 | -2/+5 | |
| | | | | | due to security reasons | |||||
| * | Increase minSdk to 15, according to stats | Dominik Schürmann | 2015-01-14 | 1 | -1/+1 | |
| | | ||||||
| * | Start working on Material Design | Dominik Schürmann | 2015-01-13 | 1 | -0/+1 | |
| | | ||||||
| * | Set minSdk to 14 | Dominik Schürmann | 2015-01-13 | 1 | -3/+3 | |
| | | ||||||
| * | Add android-lockpattern library | Dominik Schürmann | 2014-12-29 | 1 | -0/+1 | |
| | | ||||||
| * | Update target and support libs to SDK 21, fixing compile issues | Dominik Schürmann | 2014-12-04 | 1 | -5/+5 | |
| | | ||||||
| * | Merge openpgp-card lib into OpenKeychain, it was already depending on OK, no ↵ | Dominik Schürmann | 2014-09-24 | 1 | -1/+0 | |
| | | | | | need to separate | |||||
| * | Add safeslinger to build | Dominik Schürmann | 2014-09-04 | 1 | -3/+4 | |
| | | ||||||
| * | Merge branch 'master' into yubikey | Dominik Schürmann | 2014-08-06 | 1 | -1/+2 | |
| |\ | | | | | | | | | | | | | | | | | Conflicts: .gitmodules OpenKeychain/build.gradle OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/KeychainIntentService.java extern/openpgp-api-lib settings.gradle | |||||
| | * | Fixing lint complaints, removing unused resources | Dominik Schürmann | 2014-08-04 | 1 | -1/+1 | |
| | | | ||||||
| | * | Merge branch 'master' into improve-file-more | mar-v-in | 2014-07-31 | 1 | -9/+1 | |
| | |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 | -1/+1 | |
| | | | | | | | | | | | | | | | | - Multi file - Reworked UI | |||||
| * | | | Merge branch 'master' into yubikey | Dominik Schürmann | 2014-08-01 | 1 | -1/+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 | -9/+1 | |
| | |\ \ | | | | | | | | | | | | | | | | | | | | | 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 | -1/+0 | |
| | | |/ | |/| | ||||||
| * | | | Merge branch 'master' into yubikey | Dominik Schürmann | 2014-07-21 | 1 | -1/+0 | |
| |\ \ \ | | |/ | |/| | ||||||
| | * | | forgot to move test classpath out of root project | Vincent Breitmoser | 2014-07-21 | 1 | -1/+0 | |
| | | | | ||||||
| * | | | add lib dependency, update lib | Dominik Schürmann | 2014-07-16 | 1 | -1/+1 | |
| |/ / | ||||||
| * | | travis: get rid of lint | Vincent Breitmoser | 2014-07-11 | 1 | -1/+1 | |
| | | | ||||||
| * | | put unit tests into external module (CAVEAT) | Vincent Breitmoser | 2014-07-09 | 1 | -7/+0 | |
| |/ | | | | | | | 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. | |||||
| * | Deprecated Android Bootstrap, thus fixing #597 | Daniel Albert | 2014-06-30 | 1 | -1/+0 | |
| | | ||||||
| * | Merge pull request #686 from mar-v-in/minidns | Vincent | 2014-06-23 | 1 | -1/+1 | |
| |\ | | | | | Use minidns instead of dnsjava | |||||
| | * | Switch to dnsjava | mar-v-in | 2014-06-23 | 1 | -1/+1 | |
| | | | ||||||
| * | | Disable pre-dexing, causes exceptions on some systems | Dominik Schürmann | 2014-06-23 | 1 | -1/+5 | |
| |/ | ||||||
| * | Merge pull request #672 from artbristol/functional-testing | Dominik Schürmann | 2014-06-21 | 1 | -15/+1 | |
| |\ | | | | | VERY basic test for save keyring | |||||
| | * | VERY basic test for save keyring | Art O Cathain | 2014-06-21 | 1 | -15/+1 | |
| | | | ||||||
| * | | Moved Keybase stuff into KeybaseLib submodule | Tim Bray | 2014-06-20 | 1 | -0/+1 | |
| |/ | ||||||
| * | revert to previous min version | Art O Cathain | 2014-06-19 | 1 | -1/+1 | |
| | | ||||||
| * | Start on Robolectric integration test | Art O Cathain | 2014-06-16 | 1 | -30/+23 | |
| | | ||||||
| * | Later version of Junit prevents 'Multiple dex files define ↵ | Art O Cathain | 2014-06-14 | 1 | -1/+1 | |
| | | | | | Lorg/hamcrest/Description' error | |||||
| * | Merge remote-tracking branch 'origin/master' into canonicalize | Vincent Breitmoser | 2014-06-13 | 1 | -5/+6 | |
| |\ | | | | | | | | | | | | | | | | | | | 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 | |||||
| | * | Disable robolectric, update to android gradle 0.11.1, update gradle to 1.12 | Dominik Schürmann | 2014-06-09 | 1 | -4/+4 | |
| | | | ||||||
| | * | Update buildTools to 19.1 | Dominik Schürmann | 2014-06-09 | 1 | -1/+1 | |
| | | | ||||||
| | * | Add dnsjava as submodule | mar-v-in | 2014-06-05 | 1 | -1/+1 | |
| | | | ||||||
| | * | Merge branch 'master' into automatic-contact-discovery | mar-v-in | 2014-06-04 | 1 | -36/+25 | |
| | |\ | | | | | | | | | | | | | Conflicts: OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/KeychainIntentService.java | |||||
| | * | | Add ability to resolve HkpKeyserver from _hkp._tcp SRV record | mar-v-in | 2014-05-27 | 1 | -0/+1 | |
| | | | | ||||||
 |
index : connectbot-yubikey/open-keychain | |
| open-keychain with patches to support ssh authentication | James |
| aboutsummaryrefslogtreecommitdiffstats |