Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'development' into linked-identities | Vincent Breitmoser | 2015-04-24 | 1 | -1/+1 |
|\ | | | | | | | | | | | | | | | | | | | | | Conflicts: Graphics/update-drawables.sh OpenKeychain-Test/src/test/java/org/sufficientlysecure/keychain/operations/CertifyOperationTest.java OpenKeychain/build.gradle OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/CertifyActionsParcel.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/PassphraseDialogActivity.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ViewKeyActivity.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ViewKeyFragment.java | ||||
| * | Contribution info | Dominik Schürmann | 2015-04-14 | 1 | -1/+1 |
| | | |||||
| * | Contribution info | Dominik Schürmann | 2015-04-14 | 1 | -1/+1 |
| | | |||||
* | | Merge branch 'development' into linked-identities | Vincent Breitmoser | 2015-04-09 | 1 | -2/+2 |
|\| | | | | | | | | | | | | | Conflicts: OpenKeychain/build.gradle OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/KeyListFragment.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ViewKeyActivity.java | ||||
| * | Pull from transifex | Dominik Schürmann | 2015-03-23 | 1 | -1/+1 |
| | | |||||
| * | Update readme for libs link | Dominik Schürmann | 2015-03-23 | 1 | -1/+1 |
| | | |||||
* | | Merge branch 'development' into linked-identities | Vincent Breitmoser | 2015-03-24 | 1 | -28/+3 |
|\| | | | | | | | | | Conflicts: OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ViewKeyActivity.java | ||||
| * | Remove old info from readme | Dominik Schürmann | 2015-03-16 | 1 | -2/+0 |
| | | |||||
| * | Remove old info from readme | Dominik Schürmann | 2015-03-16 | 1 | -28/+5 |
| | | |||||
* | | give short branch description in readme | Vincent Breitmoser | 2015-03-16 | 1 | -0/+6 |
| | | |||||
* | | Merge branch 'development' into linked-identities | Vincent Breitmoser | 2015-03-05 | 1 | -27/+1 |
|\| | | | | | | | | | | | Conflicts: OpenKeychain/src/main/java/org/sufficientlysecure/keychain/operations/results/OperationResult.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ViewKeyFragment.java | ||||
| * | Update lib list | Dominik Schürmann | 2015-03-04 | 1 | -27/+1 |
| | | |||||
* | | Merge branch 'development' into linked-identities | Vincent Breitmoser | 2015-03-02 | 1 | -19/+36 |
|\| | | | | | | | | | Conflicts: OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/adapter/UserAttributesAdapter.java | ||||
| * | README: mac os x workaround | Dominik Schürmann | 2015-03-02 | 1 | -0/+4 |
| | | |||||
| * | Use gradle witness | Dominik Schürmann | 2015-03-02 | 1 | -1/+1 |
| | | |||||
| * | Update readme for build system | Dominik Schürmann | 2015-03-02 | 1 | -7/+5 |
| | | |||||
| * | Use SDK and build tools versions from root project | Dominik Schürmann | 2015-03-02 | 1 | -12/+27 |
| | | |||||
* | | NON-WORKING Merge branch 'development' into linked-identities | Vincent Breitmoser | 2015-03-02 | 1 | -0/+4 |
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/UncachedKeyRing.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/UncachedPublicKey.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/WrappedUserAttribute.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/provider/KeychainDatabase.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/provider/KeychainProvider.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/provider/ProviderHelper.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/KeychainIntentService.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/SaveKeyringParcel.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/KeyListActivity.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ViewKeyMainFragment.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/adapter/UserAttributesAdapter.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/util/ContactHelper.java OpenKeychain/src/main/res/layout/view_key_main_fragment.xml OpenKeychain/src/main/res/values/strings.xml extern/spongycastle | ||||
| * | Style tabs, add missing drawables | Dominik Schürmann | 2015-01-15 | 1 | -0/+4 |
| | | |||||
* | | add dns button to linked identity selection | Vincent Breitmoser | 2015-01-12 | 1 | -0/+3 |
|/ | |||||
* | Remove necessity to prepare tests via shell script | Dominik Schürmann | 2014-12-28 | 1 | -4/+3 |
| | |||||
* | Travis is now stable | Dominik Schürmann | 2014-08-20 | 1 | -2/+0 |
| | |||||
* | Bouncy Castle link | Dominik Schürmann | 2014-08-19 | 1 | -0/+1 |
| | |||||
* | Info about travis test failings | Dominik Schürmann | 2014-08-06 | 1 | -0/+2 |
| | |||||
* | ModernPGP infos | Dominik Schürmann | 2014-08-06 | 1 | -4/+3 |
| | |||||
* | Gradle troubleshooting info | Dominik Schürmann | 2014-08-04 | 1 | -0/+4 |
| | |||||
* | Merge branch 'master' into ditch-appmsg | Vincent Breitmoser | 2014-07-26 | 1 | -6/+8 |
|\ | | | | | | | | | | | Conflicts: OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/EditKeyActivityOld.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/KeyListActivity.java | ||||
| * | Update README.md | Dominik Schürmann | 2014-07-19 | 1 | -2/+2 |
| | | |||||
| * | Update README.md | Dominik Schürmann | 2014-07-19 | 1 | -4/+1 |
| | | |||||
| * | Update README | Dominik Schürmann | 2014-07-19 | 1 | -4/+7 |
| | | |||||
| * | Update README with build instructions for build | Dominik Schürmann | 2014-07-15 | 1 | -2/+4 |
| | | |||||
* | | get rid of AppMsg library | Vincent Breitmoser | 2014-07-07 | 1 | -4/+0 |
|/ | |||||
* | Moved Keybase stuff into KeybaseLib submodule | Tim Bray | 2014-06-20 | 1 | -1/+1 |
| | |||||
* | Redesign Import, still some todos and regression bugs | Dominik Schürmann | 2014-06-18 | 1 | -1/+4 |
| | |||||
* | Update example code instructions | Dominik Schürmann | 2014-06-09 | 1 | -2/+2 |
| | |||||
* | Update README for build tools | Dominik Schürmann | 2014-06-09 | 1 | -1/+1 |
| | |||||
* | Add color theme notice to README | Dominik Schürmann | 2014-05-06 | 1 | -1/+2 |
| | |||||
* | Speed up build: Upgrade to Gradle Android Plugin 0.10.0, Disable Lint | Dominik Schürmann | 2014-05-02 | 1 | -0/+5 |
| | |||||
* | Update README | Dominik Schürmann | 2014-04-19 | 1 | -10/+8 |
| | |||||
* | Use git submodules for libs, fix compilation, remove library sourcecode | Dominik Schürmann | 2014-04-16 | 1 | -5/+6 |
| | |||||
* | License clarification in README | Dominik Schürmann | 2014-04-06 | 1 | -2/+3 |
| | |||||
* | Update README | Dominik Schürmann | 2014-04-06 | 1 | -1/+1 |
| | |||||
* | Update travis link | Dominik Schürmann | 2014-04-06 | 1 | -1/+1 |
| | |||||
* | Update README | Dominik Schürmann | 2014-04-06 | 1 | -10/+10 |
| | |||||
* | clarify readme | Dominik Schürmann | 2014-04-03 | 1 | -1/+1 |
| | |||||
* | Coding style | Dominik Schürmann | 2014-03-26 | 1 | -8/+2 |
| | |||||
* | remove old icon entry | Dominik Schürmann | 2014-03-26 | 1 | -4/+0 |
| | |||||
* | Revert "Update README.md, icon set not used anymore" | Dominik Schürmann | 2014-03-26 | 1 | -30/+34 |
| | | | | This reverts commit 9d4582f9689f53589bbf7cc3e224f9fd061f1d51. | ||||
* | Update README.md, icon set not used anymore | Thialfihar | 2014-03-23 | 1 | -34/+30 |
| | |||||
* | Added Windows section to CheckStyle configuration information part (and ↵ | Daniel Hammann | 2014-03-12 | 1 | -6/+15 |
| | | | | splitted Linux and MacOSX up). |