aboutsummaryrefslogtreecommitdiffstats
path: root/settings.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
* Fix testsDominik Schürmann2014-09-131-1/+1
|
* Cleanup testsDominik Schürmann2014-09-131-2/+1
|
* deactivate screenshots in new PassphraseDialogActivityDominik Schürmann2014-09-131-0/+1
|
* Revert "Fix test"Dominik Schürmann2014-09-081-1/+0
| | | | This reverts commit f392d95ac34361ac9b38f9f39baf57500717e665.
* Fix testDominik Schürmann2014-09-081-0/+1
|
* Integrate safeslinger shareDominik Schürmann2014-09-041-1/+1
|
* Add safeslinger to buildDominik Schürmann2014-09-041-0/+1
|
* Merge branch 'master' into yubikeyDominik Schürmann2014-08-061-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-moremar-v-in2014-07-311-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 gradlemar-v-in2014-07-151-0/+1
| | |
* | | 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
| * | get rid of AppMsg libraryVincent Breitmoser2014-07-071-1/+0
| |/
* | Merge branch 'master' into yubikeyDominik Schürmann2014-07-211-2/+1
|\ \
| * | work on test prepare script, make the whole thing optionalVincent Breitmoser2014-07-181-1/+0
| | |
* | | add lib dependency, update libDominik Schürmann2014-07-161-0/+1
|/ /
* | test: add algorithm choice testsVincent Breitmoser2014-07-121-1/+1
| |
* | test: make testing optional in buildVincent Breitmoser2014-07-111-1/+1
| |
* | put unit tests into external module (CAVEAT)Vincent Breitmoser2014-07-091-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 #597Daniel Albert2014-06-301-1/+0
|
* Switch to dnsjavamar-v-in2014-06-231-1/+1
|
* Moved Keybase stuff into KeybaseLib submoduleTim Bray2014-06-201-0/+1
|
* Merge remote-tracking branch 'origin/master' into canonicalizeVincent Breitmoser2014-06-131-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 submodulemar-v-in2014-06-051-0/+1
| |
* | import-log: add SuperToast external libraryVincent Breitmoser2014-06-101-0/+1
|/
* Move API libs and API example into their own git reposDominik Schürmann2014-05-071-2/+2
|
* Use git submodules for libs, fix compilation, remove library sourcecodeDominik Schürmann2014-04-161-10/+10
|
* Rename folder structure from OpenPGP Keychain to OpenKeychainDominik Schürmann2014-04-061-3/+3
|
* Split api libs into OpenKeychain specific and OpenPGP Provider libDominik Schürmann2014-03-071-1/+2
|
* remove dublication of api library, let both proejcts depend on the sameDominik Schürmann2014-02-271-1/+1
|
* Added AppMsg libraryDaniel Haß2014-02-201-0/+1
|
* Restructuring for new API libraryDominik Schürmann2014-02-091-0/+1
|
* Switch from ActionBarSherlock to ActionBarCompatDominik Schürmann2014-02-021-1/+0
|
* New build files for spongy castleDominik Schürmann2014-01-271-0/+4
|
* fix some small layout bugs, add barcode scanner lib as source lib, fix qr ↵Dominik Schürmann2014-01-141-1/+2
| | | | code scanning issues
* fix gradle buildDominik Schürmann2014-01-101-1/+1
|
* add AndroidBootstrap libDominik Schürmann2014-01-091-0/+1
|
* externalize zxing lib, fix gradle buildDominik Schürmann2014-01-061-0/+1
|
* New list with sticky list headers libraryDominik Schürmann2014-01-021-1/+2
|
* Simple new list implementations, remove library, use simple adapter with ↵Dominik Schürmann2014-01-011-2/+1
| | | | headings
* fix gradle buildDominik Schürmann2013-12-301-1/+2
|
* update gradle, description,...Dominik Schürmann2013-09-091-0/+2
|
* fix gradle buildFelix Bechstein2013-08-151-1/+1
|
* move ActionBarSherlock lib, add gradle build filesDominik Schürmann2013-05-251-0/+1
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-12 18:14:35 +0000