aboutsummaryrefslogtreecommitdiffstats
path: root/OpenKeychain/build.gradle
Commit message (Collapse)AuthorAgeFilesLines
* Merge openpgp-card lib into OpenKeychain, it was already depending on OK, no ↵Dominik Schürmann2014-09-241-1/+0
| | | | need to separate
* Add safeslinger to buildDominik Schürmann2014-09-041-3/+4
|
* Merge branch 'master' into yubikeyDominik Schürmann2014-08-061-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 resourcesDominik Schürmann2014-08-041-1/+1
| |
| * Merge branch 'master' into improve-file-moremar-v-in2014-07-311-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 incompletemar-v-in2014-07-061-1/+1
| | | | | | | | | | | | | | | - Multi file - Reworked UI
* | | Merge branch 'master' into yubikeyDominik Schürmann2014-08-011-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-appmsgVincent Breitmoser2014-07-261-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 libraryVincent Breitmoser2014-07-071-1/+0
| | |/ | |/|
* | | Merge branch 'master' into yubikeyDominik Schürmann2014-07-211-1/+0
|\ \ \ | | |/ | |/|
| * | forgot to move test classpath out of root projectVincent Breitmoser2014-07-211-1/+0
| | |
* | | add lib dependency, update libDominik Schürmann2014-07-161-1/+1
|/ /
* | travis: get rid of lintVincent Breitmoser2014-07-111-1/+1
| |
* | put unit tests into external module (CAVEAT)Vincent Breitmoser2014-07-091-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 #597Daniel Albert2014-06-301-1/+0
|
* Merge pull request #686 from mar-v-in/minidnsVincent2014-06-231-1/+1
|\ | | | | Use minidns instead of dnsjava
| * Switch to dnsjavamar-v-in2014-06-231-1/+1
| |
* | Disable pre-dexing, causes exceptions on some systemsDominik Schürmann2014-06-231-1/+5
|/
* Merge pull request #672 from artbristol/functional-testingDominik Schürmann2014-06-211-15/+1
|\ | | | | VERY basic test for save keyring
| * VERY basic test for save keyringArt O Cathain2014-06-211-15/+1
| |
* | Moved Keybase stuff into KeybaseLib submoduleTim Bray2014-06-201-0/+1
|/
* revert to previous min versionArt O Cathain2014-06-191-1/+1
|
* Start on Robolectric integration testArt O Cathain2014-06-161-30/+23
|
* Later version of Junit prevents 'Multiple dex files define ↵Art O Cathain2014-06-141-1/+1
| | | | Lorg/hamcrest/Description' error
* Merge remote-tracking branch 'origin/master' into canonicalizeVincent Breitmoser2014-06-131-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.12Dominik Schürmann2014-06-091-4/+4
| |
| * Update buildTools to 19.1Dominik Schürmann2014-06-091-1/+1
| |
| * Add dnsjava as submodulemar-v-in2014-06-051-1/+1
| |
| * Merge branch 'master' into automatic-contact-discoverymar-v-in2014-06-041-36/+25
| |\ | | | | | | | | | | | | Conflicts: OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/KeychainIntentService.java
| * | Add ability to resolve HkpKeyserver from _hkp._tcp SRV recordmar-v-in2014-05-271-0/+1
| | |
* | | import-log: add SuperToast external libraryVincent Breitmoser2014-06-101-0/+3
| |/ |/|
* | Use fixed gradle versionsDominik Schürmann2014-06-041-1/+1
| |
* | Use fixed gradle versionsDominik Schürmann2014-06-041-2/+4
| |
* | update unit test support in build filesVincent Breitmoser2014-05-271-36/+23
|/
* Move API libs and API example into their own git reposDominik Schürmann2014-05-071-4/+4
|
* Speed up build: Upgrade to Gradle Android Plugin 0.10.0, Disable LintDominik Schürmann2014-05-021-1/+12
|
* Update maven libs and use fixed versionDominik Schürmann2014-04-181-5/+5
|
* Remove unused strings, fix some lint errors, fix some language confusionsDominik Schürmann2014-04-181-0/+1
|
* Use git submodules for libs, fix compilation, remove library sourcecodeDominik Schürmann2014-04-161-20/+20
|
* Fixed gradle localTest bug on Windows.gogowitczak2014-04-061-13/+13
|
* Comment out localTest due to bug on windowsDominik Schürmann2014-04-061-13/+13
|
* Rename folder structure from OpenPGP Keychain to OpenKeychainDominik Schürmann2014-04-061-0/+105
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-16 04:27:16 +0000