aboutsummaryrefslogtreecommitdiffstats
path: root/extern
Commit message (Collapse)AuthorAgeFilesLines
...
| * Lint fixesDominik Schürmann2014-08-041-0/+0
| |
| * TokenAutoComplete: Do not abort build if lint finds errorsDominik Schürmann2014-08-041-0/+0
| |
| * Merge branch 'master' into improve-file-moremar-v-in2014-07-314-0/+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
| * \ Merge branch 'master' into improve-file-moremar-v-in2014-07-061-0/+0
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/KeychainIntentService.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/DecryptActivity.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/EncryptActivity.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/KeyListFragment.java OpenKeychain/src/main/res/layout/encrypt_content.xml
| * | | Many changes to file ... and still incompletemar-v-in2014-07-061-0/+0
| | | | | | | | | | | | | | | | | | | | - Multi file - Reworked UI
* | | | Merge branch 'master' into yubikeyDominik Schürmann2014-08-011-0/+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 'ditch-appmsg'Vincent Breitmoser2014-07-291-0/+0
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/KeyListFragment.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ViewKeyMainFragment.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/dialog/ShareQrCodeDialogFragment.java
| | * \ \ Merge branch 'master' into ditch-appmsgVincent Breitmoser2014-07-262-0/+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-0/+0
| | | |_|/ | | |/| |
| * | | | Update gradle plugin to 0.12.2Dominik Schürmann2014-07-272-0/+0
| | | | |
| * | | | Update spongycastleDominik Schürmann2014-07-271-0/+0
| | | | |
| * | | | Work on first time wizard designDominik Schürmann2014-07-271-0/+0
| | |/ / | |/| |
| * | | Merge remote-tracking branch 'origin/master'Vincent Breitmoser2014-07-261-0/+0
| |\ \ \
| | * | | Update libsDominik Schürmann2014-07-252-0/+0
| | | | |
| * | | | fixes for extractPublicKeyRing, update SpongyCastleVincent Breitmoser2014-07-261-0/+0
| |/ / /
| * | | canonicalize: fix for testsVincent Breitmoser2014-07-191-0/+0
| | | |
| * | | Add OpenPGP-Haskell test files directlyDominik Schürmann2014-07-181-0/+0
| |/ /
* | | update libDominik Schürmann2014-07-221-0/+0
| | |
* | | Add values for NFC supportDominik Schürmann2014-07-221-0/+0
| | |
* | | Reuse signature creation timestamp for synchronous signingDominik Schürmann2014-07-221-0/+0
| | |
* | | update nfc libDominik Schürmann2014-07-211-0/+0
| | |
* | | NFC Yubikey: only pass through hash of message and not whole contentDominik Schürmann2014-07-212-0/+0
| | |
* | | Update libDominik Schürmann2014-07-171-0/+0
| | |
* | | Update libsDominik Schürmann2014-07-172-0/+0
| | |
* | | FixesDominik Schürmann2014-07-171-0/+0
| | |
* | | add lib dependency, update libDominik Schürmann2014-07-161-0/+0
| | |
* | | Add nfc libDominik Schürmann2014-07-161-0/+0
|/ /
* / Update spongycastleDominik Schürmann2014-07-021-0/+0
|/
* Removed submodule AndroidBootstrapDominik Schürmann2014-06-301-0/+0
|
* Update keybase libDominik Schürmann2014-06-281-0/+0
|
* Fix supertoast submoduleDominik Schürmann2014-06-281-0/+0
|
* Update git submodules for android gradle plugin to 0.12.0Dominik Schürmann2014-06-283-0/+0
|
* Update subnodule keybase to fixed version of support libsDominik Schürmann2014-06-281-0/+0
|
* Add minidns submodulemar-v-in2014-06-231-0/+0
|
* Remove dnsjava modulemar-v-in2014-06-231-0/+0
|
* Update libDominik Schürmann2014-06-221-0/+0
|
* Committed submoduleTim Bray2014-06-211-0/+0
|
* Moved Keybase stuff into KeybaseLib submoduleTim Bray2014-06-201-0/+0
|
* generate public keyring from secret if not availableVincent Breitmoser2014-06-181-0/+0
|
* Merge remote-tracking branch 'origin/master' into canonicalizeVincent Breitmoser2014-06-1310-0/+0
|\ | | | | | | | | | | | | | | | | | | 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
| * Update buildTools to 19.1Dominik Schürmann2014-06-098-0/+0
| |
| * Add dnsjava as submodulemar-v-in2014-06-051-0/+0
| |
* | import-log: add SuperToast external libraryVincent Breitmoser2014-06-101-0/+0
|/
* spongycastle: expose pskr constructorVincent Breitmoser2014-06-021-0/+0
|
* Update html-textviewDominik Schürmann2014-05-141-0/+0
|
* Add pgpauth app to help, update html-textviewDominik Schürmann2014-05-131-0/+0
|
* Add applications section to helpDominik Schürmann2014-05-071-0/+0
|
* Update submodulesDominik Schürmann2014-05-072-0/+0
|
* Move API libs and API example into their own git reposDominik Schürmann2014-05-072-0/+0
|
* Use git submodules for libs, fix compilation, remove library sourcecodeDominik Schürmann2014-04-167-0/+0
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-05 20:00:26 +0000