Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Implement EXTRA_ORIGINAL_FILENAME for API | Dominik Schürmann | 2014-08-11 | 1 | -0/+0 |
| | |||||
* | Update api lib | Dominik Schürmann | 2014-08-11 | 1 | -0/+0 |
| | |||||
* | update api lib | Dominik Schürmann | 2014-08-11 | 1 | -0/+0 |
| | |||||
* | Update api lib | Dominik Schürmann | 2014-08-11 | 1 | -0/+0 |
| | |||||
* | Lint fixes | Dominik Schürmann | 2014-08-04 | 1 | -0/+0 |
| | |||||
* | TokenAutoComplete: Do not abort build if lint finds errors | Dominik Schürmann | 2014-08-04 | 1 | -0/+0 |
| | |||||
* | Merge branch 'master' into improve-file-more | mar-v-in | 2014-07-31 | 4 | -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 Breitmoser | 2014-07-29 | 1 | -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-appmsg | Vincent Breitmoser | 2014-07-26 | 2 | -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 library | Vincent Breitmoser | 2014-07-07 | 1 | -0/+0 |
| | | | | |||||
| * | | | Update gradle plugin to 0.12.2 | Dominik Schürmann | 2014-07-27 | 2 | -0/+0 |
| | | | | |||||
| * | | | Update spongycastle | Dominik Schürmann | 2014-07-27 | 1 | -0/+0 |
| | | | | |||||
| * | | | Work on first time wizard design | Dominik Schürmann | 2014-07-27 | 1 | -0/+0 |
| | |/ | |/| | |||||
| * | | Merge remote-tracking branch 'origin/master' | Vincent Breitmoser | 2014-07-26 | 1 | -0/+0 |
| |\ \ | |||||
| | * | | Update libs | Dominik Schürmann | 2014-07-25 | 2 | -0/+0 |
| | | | | |||||
| * | | | fixes for extractPublicKeyRing, update SpongyCastle | Vincent Breitmoser | 2014-07-26 | 1 | -0/+0 |
| |/ / | |||||
| * | | canonicalize: fix for tests | Vincent Breitmoser | 2014-07-19 | 1 | -0/+0 |
| | | | |||||
| * | | Add OpenPGP-Haskell test files directly | Dominik Schürmann | 2014-07-18 | 1 | -0/+0 |
| |/ | |||||
* | | Merge branch 'master' into improve-file-more | mar-v-in | 2014-07-06 | 1 | -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 spongycastle | Dominik Schürmann | 2014-07-02 | 1 | -0/+0 |
| | | |||||
* | | Many changes to file ... and still incomplete | mar-v-in | 2014-07-06 | 1 | -0/+0 |
|/ | | | | | - Multi file - Reworked UI | ||||
* | Removed submodule AndroidBootstrap | Dominik Schürmann | 2014-06-30 | 1 | -0/+0 |
| | |||||
* | Update keybase lib | Dominik Schürmann | 2014-06-28 | 1 | -0/+0 |
| | |||||
* | Fix supertoast submodule | Dominik Schürmann | 2014-06-28 | 1 | -0/+0 |
| | |||||
* | Update git submodules for android gradle plugin to 0.12.0 | Dominik Schürmann | 2014-06-28 | 3 | -0/+0 |
| | |||||
* | Update subnodule keybase to fixed version of support libs | Dominik Schürmann | 2014-06-28 | 1 | -0/+0 |
| | |||||
* | Add minidns submodule | mar-v-in | 2014-06-23 | 1 | -0/+0 |
| | |||||
* | Remove dnsjava module | mar-v-in | 2014-06-23 | 1 | -0/+0 |
| | |||||
* | Update lib | Dominik Schürmann | 2014-06-22 | 1 | -0/+0 |
| | |||||
* | Committed submodule | Tim Bray | 2014-06-21 | 1 | -0/+0 |
| | |||||
* | Moved Keybase stuff into KeybaseLib submodule | Tim Bray | 2014-06-20 | 1 | -0/+0 |
| | |||||
* | generate public keyring from secret if not available | Vincent Breitmoser | 2014-06-18 | 1 | -0/+0 |
| | |||||
* | Merge remote-tracking branch 'origin/master' into canonicalize | Vincent Breitmoser | 2014-06-13 | 10 | -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.1 | Dominik Schürmann | 2014-06-09 | 8 | -0/+0 |
| | | |||||
| * | Add dnsjava as submodule | mar-v-in | 2014-06-05 | 1 | -0/+0 |
| | | |||||
* | | import-log: add SuperToast external library | Vincent Breitmoser | 2014-06-10 | 1 | -0/+0 |
|/ | |||||
* | spongycastle: expose pskr constructor | Vincent Breitmoser | 2014-06-02 | 1 | -0/+0 |
| | |||||
* | Update html-textview | Dominik Schürmann | 2014-05-14 | 1 | -0/+0 |
| | |||||
* | Add pgpauth app to help, update html-textview | Dominik Schürmann | 2014-05-13 | 1 | -0/+0 |
| | |||||
* | Add applications section to help | Dominik Schürmann | 2014-05-07 | 1 | -0/+0 |
| | |||||
* | Update submodules | Dominik Schürmann | 2014-05-07 | 2 | -0/+0 |
| | |||||
* | Move API libs and API example into their own git repos | Dominik Schürmann | 2014-05-07 | 2 | -0/+0 |
| | |||||
* | Use git submodules for libs, fix compilation, remove library sourcecode | Dominik Schürmann | 2014-04-16 | 7 | -0/+0 |