aboutsummaryrefslogtreecommitdiffstats
path: root/OpenKeychain/build.gradle
Commit message (Collapse)AuthorAgeFilesLines
...
* Update zxing-android-embedded with new custom activityDominik Schürmann2015-10-261-19/+18
|
* Version 3.6.1Dominik Schürmann2015-10-261-2/+2
|
* Commit Github tokensDominik Schürmann2015-10-261-15/+6
|
* Version 3.6, Changelog 3.6Dominik Schürmann2015-10-221-2/+2
|
* Use Github OAuth ID and secret from propertiesDominik Schürmann2015-10-211-4/+17
|
* fix jacoco coverageVincent Breitmoser2015-10-081-6/+5
|
* Fix deps verificationDominik Schürmann2015-09-211-1/+1
|
* Use more modular Keybase lib with OkHttp wrapperDominik Schürmann2015-09-211-15/+23
|
* multidecrypt: use bottom sheet for longclick optionsVincent Breitmoser2015-09-161-0/+1
|
* mime: create more general InputDataOperation, which for now and does basic ↵Vincent Breitmoser2015-09-151-0/+1
| | | | mime parsing
* Merge branch 'master' into mime4jVincent Breitmoser2015-09-141-6/+16
|\ | | | | | | | | | | | | | | Conflicts: OpenKeychain/build.gradle OpenKeychain/src/main/java/org/sufficientlysecure/keychain/operations/results/OperationResult.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/DecryptListFragment.java OpenKeychain/src/main/res/values/strings.xml
| * linked: fix client secret paste errorVincent Breitmoser2015-09-101-1/+1
| |
| * linked: move github client id and secret into build varsVincent Breitmoser2015-09-101-0/+4
| |
| * enable incremental and jumboMode for dexing, speeds up process considerablyVincent Breitmoser2015-09-101-0/+2
| |
| * Merge branch 'linked-identities' (and fix OperationHelper ids)Vincent Breitmoser2015-08-291-1/+4
| |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge Linked Identities. Also includes an important fix for OperationHelper ids, which had an error in the bit mask logic. Conflicts: Graphics/update-drawables.sh OpenKeychain/build.gradle OpenKeychain/src/main/java/org/sufficientlysecure/keychain/operations/results/OperationResult.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/CertifyActionsParcel.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/KeychainIntentService.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/CreateYubiKeyImportFragment.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/KeyListFragment.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ViewKeyActivity.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/adapter/KeyAdapter.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/widget/CertifyKeySpinner.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/widget/KeySpinner.java OpenKeychain/src/main/res/anim/fade_in.xml OpenKeychain/src/main/res/anim/fade_out.xml OpenKeychain/src/main/res/layout/decrypt_text_fragment.xml OpenKeychain/src/main/res/layout/encrypt_decrypt_overview_fragment.xml OpenKeychain/src/main/res/layout/view_key_fragment.xml OpenKeychain/src/main/res/menu/key_view.xml OpenKeychain/src/main/res/values/strings.xml OpenKeychain/src/test/java/org/sufficientlysecure/keychain/operations/CertifyOperationTest.java README.md
| | * Merge tag 'v3.2.1' into linked-identitiesVincent Breitmoser2015-05-111-10/+36
| | |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Version 3.2.1 Conflicts: OpenKeychain/build.gradle OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/DecryptFragment.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/adapter/KeyAdapter.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/adapter/SelectKeyCursorAdapter.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/widget/EncryptKeyCompletionView.java OpenKeychain/src/main/res/layout/decrypt_text_fragment.xml OpenKeychain/src/main/res/values/strings.xml
| | * | linked-ids: add certificate pinning, pin twitter api certVincent Breitmoser2015-05-091-0/+1
| | | |
| | * | Merge remote-tracking branch 'origin/development' into linked-identitiesVincent Breitmoser2015-04-261-12/+19
| | |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/DecryptFragment.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/DecryptTextFragment.java OpenKeychain/src/main/res/menu/decrypt_menu.xml
| | * \ \ Merge branch 'development' into linked-identitiesVincent Breitmoser2015-04-241-10/+10
| | |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| | * \ \ \ Merge branch 'development' into linked-identitiesVincent Breitmoser2015-04-091-42/+44
| | |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: OpenKeychain/build.gradle OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/KeyListFragment.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ViewKeyActivity.java
| | * \ \ \ \ Merge branch 'development' into linked-identitiesVincent Breitmoser2015-03-241-2/+2
| | |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ViewKeyActivity.java
| | * | | | | | rearrange linked id layouts, add CertListWidgetVincent Breitmoser2015-03-091-0/+1
| | | | | | | |
| * | | | | | | improved orbot notify, added periodic syncAdithya Abraham Philip2015-08-201-0/+4
| | | | | | | |
| * | | | | | | Version 3.5.1Dominik Schürmann2015-08-181-2/+2
| | | | | | | |
| * | | | | | | Version 3.5Dominik Schürmann2015-08-171-2/+2
| | | | | | | |
* | | | | | | | WIP mime parsingDominik Schürmann2015-08-171-1/+9
|/ / / / / / /
* | | | | | | Update dependenciesDominik Schürmann2015-08-101-23/+22
| | | | | | |
* | | | | | | Improve comments and reasons in PgpConstants, simple checks for insecure ↵Dominik Schürmann2015-08-101-9/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | asymmetric keys
* | | | | | | use snackbar from repository (again), and update to 2.11.0Vincent Breitmoser2015-08-071-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This release merged our pull requests for round corners on tablet for top line, and nicer dismiss-on-swipe animation. https://github.com/nispok/snackbar/pull/134 https://github.com/nispok/snackbar/pull/135
* | | | | | | Update libsDominik Schürmann2015-08-031-14/+16
| | | | | | |
* | | | | | | Upgrade MaterialDrawer to 3.0.9Thialfihar2015-07-211-9/+9
| | | | | | |
* | | | | | | update safeslinger lib (closes #1434)Vincent Breitmoser2015-07-151-1/+1
| | | | | | |
* | | | | | | fix verification of android support lib (broken in b59be903)Vincent Breitmoser2015-07-141-1/+1
| | | | | | |
* | | | | | | Revert "Use snackbar lib from maven repo"Vincent Breitmoser2015-07-141-12/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit bfc57aefa5d9fd435e93589ea8a37c9747cb7814. Conflicts: OpenKeychain/build.gradle settings.gradle
* | | | | | | Version 3.4.1Dominik Schürmann2015-07-091-2/+2
| | | | | | |
* | | | | | | Update robolectric, Workaround still neededDominik Schürmann2015-07-091-2/+2
| | | | | | |
* | | | | | | Version 3.4Dominik Schürmann2015-07-061-2/+2
| | | | | | |
* | | | | | | Merge branch 'master' of github.com:open-keychain/open-keychainDominik Schürmann2015-07-061-0/+1
|\ \ \ \ \ \ \
| * | | | | | | removed NetCipher submodule, copied classesAdithya Abraham Philip2015-07-031-3/+0
| | | | | | | |
| * | | | | | | added proxy support, silent right nowAdithya Abraham Philip2015-07-031-1/+2
| | | | | | | |
| * | | | | | | added NetCipher as submoduleAdithya Abraham Philip2015-07-031-0/+3
| | | | | | | |
* | | | | | | | Exclude more files to satisfy proguardDominik Schürmann2015-07-061-0/+3
|/ / / / / / /
* | | | | | | reworked keyserver preferences with recyclerviewAdithya Abraham Philip2015-07-021-12/+11
| | | | | | |
* | | | | | | Version 3.3Dominik Schürmann2015-06-301-2/+2
| | | | | | |
* | | | | | | Update support libsDominik Schürmann2015-06-291-6/+8
| | | | | | |
* | | | | | | instrument: update symmetric testsVincent Breitmoser2015-06-201-0/+1
| | | | | | |
* | | | | | | use regular runner for most casesVincent Breitmoser2015-06-171-1/+7
| | | | | | |
* | | | | | | workaround for coverage bug (for now!)Vincent Breitmoser2015-06-171-2/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | see android bug report https://code.google.com/p/android/issues/detail?id=170607
* | | | | | | stash away stuffVincent Breitmoser2015-06-171-0/+2
| | | | | | |
* | | | | | | update instrumentation test to JUnit4Vincent Breitmoser2015-06-171-2/+1
| | | | | | |
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-17 11:25:56 +0000