Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | removed openkeychain-test from settings.gradle | Adithya Abraham Philip | 2015-07-03 | 1 | -1/+0 |
| | |||||
* | added NetCipher as submodule | Adithya Abraham Philip | 2015-07-03 | 1 | -0/+1 |
| | |||||
* | Use new officially supported way for local unit tests, many dependencies ↵ | Dominik Schürmann | 2015-06-11 | 1 | -1/+0 |
| | | | | upgraded for this, temporary disabled separate debug builds | ||||
* | Use snackbar lib from maven repo | Dominik Schürmann | 2015-05-10 | 1 | -1/+0 |
| | |||||
* | Switch to new library repos | Dominik Schürmann | 2015-05-06 | 1 | -2/+2 |
| | |||||
* | Remove unused includes in settings.gradle | Dominik Schürmann | 2015-04-14 | 1 | -2/+0 |
| | |||||
* | Remove html-textview reference from settings.gradle | Dominik Schürmann | 2015-04-12 | 1 | -1/+0 |
| | |||||
* | use top line in snackbar for status indication | Vincent Breitmoser | 2015-03-22 | 1 | -0/+1 |
| | |||||
* | Cleanup settings.gradle | Dominik Schürmann | 2015-03-03 | 1 | -2/+0 |
| | |||||
* | Integrate QR Code library instead of requiring the app to be installed, also ↵ | Dominik Schürmann | 2015-01-14 | 1 | -2/+0 |
| | | | | due to security reasons | ||||
* | Add android-lockpattern library | Dominik Schürmann | 2014-12-29 | 1 | -0/+1 |
| | |||||
* | Fix test for future creation timestamps to account for loosen timestamp check | Dominik Schürmann | 2014-12-28 | 1 | -0/+1 |
| | |||||
* | 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 | ||||
* | Fix tests | Dominik Schürmann | 2014-09-13 | 1 | -1/+1 |
| | |||||
* | Cleanup tests | Dominik Schürmann | 2014-09-13 | 1 | -2/+1 |
| | |||||
* | deactivate screenshots in new PassphraseDialogActivity | Dominik Schürmann | 2014-09-13 | 1 | -0/+1 |
| | |||||
* | Revert "Fix test" | Dominik Schürmann | 2014-09-08 | 1 | -1/+0 |
| | | | | This reverts commit f392d95ac34361ac9b38f9f39baf57500717e665. | ||||
* | Fix test | Dominik Schürmann | 2014-09-08 | 1 | -0/+1 |
| | |||||
* | Integrate safeslinger share | Dominik Schürmann | 2014-09-04 | 1 | -1/+1 |
| | |||||
* | Add safeslinger to build | Dominik Schürmann | 2014-09-04 | 1 | -0/+1 |
| | |||||
* | Merge branch 'master' into yubikey | Dominik Schürmann | 2014-08-06 | 1 | -0/+1 |
|\ | | | | | | | | | | | | | | | | | 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 | -1/+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 | ||||
| * | | Add TokenAutoComplete to gradle | mar-v-in | 2014-07-15 | 1 | -0/+1 |
| | | | |||||
* | | | 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 | ||||
| * | | 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 | -2/+1 |
|\ \ | |||||
| * | | work on test prepare script, make the whole thing optional | Vincent Breitmoser | 2014-07-18 | 1 | -1/+0 |
| | | | |||||
* | | | add lib dependency, update lib | Dominik Schürmann | 2014-07-16 | 1 | -0/+1 |
|/ / | |||||
* | | test: add algorithm choice tests | Vincent Breitmoser | 2014-07-12 | 1 | -1/+1 |
| | | |||||
* | | test: make testing optional in build | Vincent Breitmoser | 2014-07-11 | 1 | -1/+1 |
| | | |||||
* | | put unit tests into external module (CAVEAT) | Vincent Breitmoser | 2014-07-09 | 1 | -0/+1 |
|/ | | | | | | | 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 |
| | |||||
* | Switch to dnsjava | mar-v-in | 2014-06-23 | 1 | -1/+1 |
| | |||||
* | Moved Keybase stuff into KeybaseLib submodule | Tim Bray | 2014-06-20 | 1 | -0/+1 |
| | |||||
* | Merge remote-tracking branch 'origin/master' into canonicalize | Vincent Breitmoser | 2014-06-13 | 1 | -0/+1 |
|\ | | | | | | | | | | | | | | | | | | | 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/+1 |
| | | |||||
* | | import-log: add SuperToast external library | Vincent Breitmoser | 2014-06-10 | 1 | -0/+1 |
|/ | |||||
* | Move API libs and API example into their own git repos | Dominik Schürmann | 2014-05-07 | 1 | -2/+2 |
| | |||||
* | Use git submodules for libs, fix compilation, remove library sourcecode | Dominik Schürmann | 2014-04-16 | 1 | -10/+10 |
| | |||||
* | Rename folder structure from OpenPGP Keychain to OpenKeychain | Dominik Schürmann | 2014-04-06 | 1 | -3/+3 |
| | |||||
* | Split api libs into OpenKeychain specific and OpenPGP Provider lib | Dominik Schürmann | 2014-03-07 | 1 | -1/+2 |
| | |||||
* | remove dublication of api library, let both proejcts depend on the same | Dominik Schürmann | 2014-02-27 | 1 | -1/+1 |
| | |||||
* | Added AppMsg library | Daniel Haß | 2014-02-20 | 1 | -0/+1 |
| | |||||
* | Restructuring for new API library | Dominik Schürmann | 2014-02-09 | 1 | -0/+1 |
| | |||||
* | Switch from ActionBarSherlock to ActionBarCompat | Dominik Schürmann | 2014-02-02 | 1 | -1/+0 |
| | |||||
* | New build files for spongy castle | Dominik Schürmann | 2014-01-27 | 1 | -0/+4 |
| | |||||
* | fix some small layout bugs, add barcode scanner lib as source lib, fix qr ↵ | Dominik Schürmann | 2014-01-14 | 1 | -1/+2 |
| | | | | code scanning issues | ||||
* | fix gradle build | Dominik Schürmann | 2014-01-10 | 1 | -1/+1 |
| | |||||
* | add AndroidBootstrap lib | Dominik Schürmann | 2014-01-09 | 1 | -0/+1 |
| | |||||
* | externalize zxing lib, fix gradle build | Dominik Schürmann | 2014-01-06 | 1 | -0/+1 |
| |