aboutsummaryrefslogtreecommitdiffstats
path: root/.gitmodules
Commit message (Collapse)AuthorAgeFilesLines
* Removed submodule openpgp-card-nfc-libDominik Schürmann2014-09-241-3/+0
|
* Add safeslinger submoduleDominik Schürmann2014-09-041-1/+4
|
* Merge branch 'master' into yubikeyDominik Schürmann2014-08-061-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-moremar-v-in2014-07-311-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 incompletemar-v-in2014-07-061-0/+3
| | | | | | | | | | | | | | | - Multi file - Reworked UI
* | | Merge branch 'master' into yubikeyDominik Schürmann2014-08-011-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-appmsgVincent Breitmoser2014-07-261-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 libraryVincent Breitmoser2014-07-071-3/+0
| | |/ | |/|
* | | Merge branch 'master' into yubikeyDominik Schürmann2014-07-181-4/+1
|\ \ \ | | |/ | |/| | | | | | | Conflicts: .gitmodules
| * | Removed OpenPGP-haskell submoduleDominik Schürmann2014-07-181-4/+1
| | |
* | | Add nfc libDominik Schürmann2014-07-161-0/+3
|/ /
* / put unit tests into external module (CAVEAT)Vincent Breitmoser2014-07-091-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 AndroidBootstrapDominik Schürmann2014-06-301-3/+0
|
* Change keybase submodule to our forkDominik Schürmann2014-06-281-1/+1
|
* Merge submodulesDominik Schürmann2014-06-241-0/+3
|\
| * https for submodulesArt O Cathain2014-06-231-1/+1
| |
| * add OpenPGP-Haskell to test collateralArt O Cathain2014-06-231-0/+3
| |
* | Add minidns submodulemar-v-in2014-06-231-0/+3
| |
* | Remove dnsjava modulemar-v-in2014-06-231-3/+0
|/
* Moved Keybase stuff into KeybaseLib submoduleTim Bray2014-06-201-0/+3
|
* Merge remote-tracking branch 'origin/master' into canonicalizeVincent Breitmoser2014-06-131-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 submodulemar-v-in2014-06-051-0/+3
| |
* | import-log: add SuperToast external libraryVincent Breitmoser2014-06-101-0/+3
|/
* Move API libs and API example into their own git reposDominik Schürmann2014-05-071-0/+6
|
* Use git submodules for libs, fix compilation, remove library sourcecodeDominik Schürmann2014-04-161-0/+21
generated by cgit v1.2.3 (git 2.25.1) at 2024-12-29 12:54:42 +0000