aboutsummaryrefslogtreecommitdiffstats
path: root/extern
Commit message (Collapse)AuthorAgeFilesLines
* Fixing build with Spongy Castle 1.51Dominik Schürmann2014-08-211-0/+0
|
* Update spongy castle, not building...Dominik Schürmann2014-08-211-0/+0
|
* Update keybase libDominik Schürmann2014-08-201-0/+0
|
* Fix sticky list headers lib, fix travisDominik Schürmann2014-08-141-0/+0
|
* Update sticky list headersDominik Schürmann2014-08-141-0/+0
|
* Dont write version header by defaultDominik Schürmann2014-08-141-0/+0
|
* update api libDominik Schürmann2014-08-121-0/+0
|
* Fix API version support, update api libDominik Schürmann2014-08-121-0/+0
|
* Implement EXTRA_ORIGINAL_FILENAME for APIDominik Schürmann2014-08-111-0/+0
|
* Update api libDominik Schürmann2014-08-111-0/+0
|
* update api libDominik Schürmann2014-08-111-0/+0
|
* Update api libDominik Schürmann2014-08-111-0/+0
|
* 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 '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
| |/
* | 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
| * Update spongycastleDominik Schürmann2014-07-021-0/+0
| |
* | Many changes to file ... and still incompletemar-v-in2014-07-061-0/+0
|/ | | | | - Multi file - Reworked UI
* 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
|
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-03 05:19:45 +0000