aboutsummaryrefslogtreecommitdiffstats
path: root/OpenKeychain/src/main/res/values
Commit message (Collapse)AuthorAgeFilesLines
* add linked it to view key context menuVincent Breitmoser2015-03-021-1/+2
|
* Merge branch 'development' into linked-identitiesVincent Breitmoser2015-03-022-2/+3
|\ | | | | | | | | Conflicts: OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/adapter/UserAttributesAdapter.java
| * Search string simplifiedDominik Schürmann2015-03-021-2/+1
| |
| * Re-add black colorDominik Schürmann2015-03-021-0/+2
| |
* | NON-WORKING Merge branch 'development' into linked-identitiesVincent Breitmoser2015-03-026-71/+275
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * Strings: File sizeDominik Schürmann2015-02-281-2/+2
| |
| * Fix strings based on transifex reportsDominik Schürmann2015-02-281-13/+13
| |
| * Keybase header textDominik Schürmann2015-02-271-0/+1
| |
| * Merge keybase-proof branchDominik Schürmann2015-02-271-0/+58
| |\
| | * Check fingerprint match between proof & databaseTim Bray2014-11-221-0/+1
| | |
| | * Merge branch 'development' into keybase-proofsDominik Schürmann2014-11-211-4/+5
| | |\
| | * | Prevent multiple cloud-trust-search launches. Handle DNS query failure ↵Tim Bray2014-11-191-0/+1
| | | | | | | | | | | | | | | | gracefully. Fixes #1007 & #1008.
| | * | In the ImportKeysList display, arrange for Keybase UserIDs to sort below the ↵Tim Bray2014-11-181-0/+1
| | | | | | | | | | | | | | | | rest. Also mention Keybase stuff other than Twitter/GitHub/Website
| | * | All keybase proofs now in placeTim Bray2014-11-111-0/+7
| | | |
| | * | Moved from WebView to Spannables, some proof cleanup tooTim Bray2014-11-071-0/+48
| | | |
| * | | Remove old Holo design resourcesDominik Schürmann2015-02-264-87/+0
| | | |
| * | | Hopefully fixes drop down icon for spinners on Android lower 5Dominik Schürmann2015-02-261-19/+0
| | | |
| * | | Fingerprint verification, design fixes for qr code cardDominik Schürmann2015-02-261-0/+5
| | | |
| * | | Dont show verification icons in my key view, hide edit button for non-secret ↵Dominik Schürmann2015-02-251-1/+3
| | | | | | | | | | | | | | | | keys
| * | | Design fixes for header, QR Code shared element transitionsDominik Schürmann2015-02-251-1/+1
| | | |
| * | | CardView and more header designDominik Schürmann2015-02-252-0/+11
| | | |
| * | | First work on new key view toolbarDominik Schürmann2015-02-253-2/+15
| | | |
| * | | Refactor AppsListFragmentDominik Schürmann2015-02-231-1/+0
| | | |
| * | | Update tab lib and fix colors of tabsDominik Schürmann2015-02-231-0/+5
| | | |
| * | | Fix multi select and more colorsDominik Schürmann2015-02-223-6/+8
| | | |
| * | | Color for holoDominik Schürmann2015-02-221-1/+1
| | | |
| * | | Merge branch 'development' of github.com:open-keychain/open-keychain into ↵Dominik Schürmann2015-02-221-0/+1
| |\ \ \ | | | | | | | | | | | | | | | development
| | * \ \ Merge pull request #1047 from steelman/dev-stringsDominik Schürmann2015-02-221-0/+1
| | |\ \ \ | | | | | | | | | | | | Some Polish translated strings and some tiny cleanups
| | | * | | move a string in the safe slinger activity to resourcesŁukasz Stelmach2015-02-211-0/+1
| | | | | |
| * | | | | Once again: Colors and header imageDominik Schürmann2015-02-222-24/+18
| |/ / / /
| * / / / Status bar height fixDominik Schürmann2015-02-212-2/+3
| |/ / /
| * | | determine correct filesize during decryption from LiteralData packetVincent Breitmoser2015-02-171-0/+1
| | | |
| * | | Add FAB to key listDominik Schürmann2015-02-032-0/+15
| | | |
| * | | Move encrypt decrypt operations in own starter activityDominik Schürmann2015-02-031-4/+6
| | | |
| * | | More toolbar fixesDominik Schürmann2015-02-031-0/+2
| | | |
| * | | Toolbar fixes, Toolbar under status bar on LollipopDominik Schürmann2015-02-033-6/+8
| | | |
| * | | Floating Action Button added in app settingsDominik Schürmann2015-02-031-0/+2
| | | |
| * | | rewrite PgpSignEncrypt data flowVincent Breitmoser2015-02-011-23/+37
| | | | | | | | | | | | | | | | | | | | | | | | | | | | - introduce high-level SignEncryptOperation for uri to uri signing/encryption - use SignEncryptParcel for high-level operation parameters - use PgpSignEncryptInput plus streams for low-level operation parameters - get rid of all sign/encrypt logic in KeychainIntentService
| * | | Merge remote-tracking branch 'origin/development' into developmentVincent Breitmoser2015-01-314-8/+10
| |\ \ \
| | * | | Saving of allowed keysDominik Schürmann2015-01-291-0/+1
| | | | |
| | * | | Header image tryoutDominik Schürmann2015-01-292-3/+2
| | | | |
| | * | | Remove files related to old nav drawerDominik Schürmann2015-01-291-2/+0
| | | | |
| | * | | White popup themeDominik Schürmann2015-01-291-3/+7
| | | | |
| * | | | prevent recursive consolidateVincent Breitmoser2015-01-311-0/+1
| |/ / /
| * | | Merge remote-tracking branch 'origin/t/snackbar' into developmentDominik Schürmann2015-01-291-1/+1
| |\ \ \ | | | | | | | | | | | | | | | | | | | | Conflicts: OpenKeychain/build.gradle
| | * | | use Notify helper everywhere, replace supertoasts with snackbar libraryVincent Breitmoser2015-01-191-1/+1
| | | | |
| * | | | Merge branch 'development' into detached-sigs-apiDominik Schürmann2015-01-271-0/+2
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: OpenKeychain/src/main/java/org/sufficientlysecure/keychain/remote/OpenPgpService.java
| | * \ \ \ Merge branch 'development' of github.com:open-keychain/open-keychain into ↵Dominik Schürmann2015-01-271-0/+2
| | |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | development
| | | * | | | backend support for charset in ascii-armored streamsVincent Breitmoser2015-01-271-0/+1
| | | | | | |
| | | * | | | move last parts of import logic from kis into operationVincent Breitmoser2015-01-261-0/+1
| | | | | | |
generated by cgit v1.2.3 (git 2.25.1) at 2024-10-02 01:24:05 +0000