aboutsummaryrefslogtreecommitdiffstats
path: root/OpenKeychain/src/main/res
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'development' into linked-identitiesVincent Breitmoser2015-03-024-9/+22
|\ | | | | | | | | Conflicts: OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/adapter/UserAttributesAdapter.java
| * Merge branch 'development' of github.com:open-keychain/open-keychain into ↵Vincent Breitmoser2015-03-022-2/+3
| |\ | | | | | | | | | development
| | * Search string simplifiedDominik Schürmann2015-03-021-2/+1
| | |
| | * Re-add black colorDominik Schürmann2015-03-021-0/+2
| | |
| * | make userattributeadapter superclass of useridsadapterVincent Breitmoser2015-03-022-7/+19
| |/
* | some fixes for compiling (still not working!)Vincent Breitmoser2015-03-023-3/+3
| |
* | NON-WORKING Merge branch 'development' into linked-identitiesVincent Breitmoser2015-03-02696-3375/+8010
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| |
| * Merge branch 'development' of github.com:open-keychain/open-keychain into ↵Dominik Schürmann2015-02-281-2/+4
| |\ | | | | | | | | | | | | | | | | | | development Conflicts: OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/MainActivity.java
| | * control flow for moving the fab up with snackbarVincent Breitmoser2015-02-281-2/+4
| | |
| * | Update from transifexDominik Schürmann2015-02-2833-236/+1010
| |/
| * Upload new keys to keyserver by defaultDominik Schürmann2015-02-281-0/+1
| |
| * padding fixes for key listDominik Schürmann2015-02-281-2/+1
| |
| * Reorder advanced key viewDominik Schürmann2015-02-272-52/+0
| |
| * Remove swipte to refresh src, fix padding in key listDominik Schürmann2015-02-271-41/+27
| |
| * Fix keyboard overlay bug on top of edittextsDominik Schürmann2015-02-279-4/+46
| |
| * show refresh key progress inlineVincent Breitmoser2015-02-273-0/+25
| |
| * Keybase header textDominik Schürmann2015-02-274-105/+127
| |
| * Better qr code resizingDominik Schürmann2015-02-275-4/+47
| |
| * Prettify qr code cleanupDominik Schürmann2015-02-271-10/+0
| |
| * Prettify qr code in advanced key viewDominik Schürmann2015-02-271-5/+27
| |
| * Uncluttering advanced key viewDominik Schürmann2015-02-272-133/+0
| |
| * Fix margins of dialog viewsDominik Schürmann2015-02-276-21/+30
| |
| * Merge keybase-proof branchDominik Schürmann2015-02-273-0/+182
| |\
| | * Merge branch 'development' into keybase-proofsDominik Schürmann2014-12-053-5/+3
| | |\
| | * | Check fingerprint match between proof & databaseTim Bray2014-11-221-0/+1
| | | |
| | * | Merge branch 'development' into keybase-proofsDominik Schürmann2014-11-214-19/+14
| | |\ \
| | * | | 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
| | | | |
| | * | | XML fragment for proof listingTim Bray2014-11-071-0/+19
| | | | |
| | * | | Moved from WebView to Spannables, some proof cleanup tooTim Bray2014-11-072-0/+153
| | | | |
| * | | | Remove old Holo design resourcesDominik Schürmann2015-02-26308-576/+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-269-28/+214
| | | | |
| * | | | Dont show verification icons in my key view, hide edit button for non-secret ↵Dominik Schürmann2015-02-253-9/+10
| | | | | | | | | | | | | | | | | | | | keys
| * | | | Invoke NFC buttonDominik Schürmann2015-02-2515-2/+10
| | | | |
| * | | | Other icon for key exchangeDominik Schürmann2015-02-2528-3/+3
| | | | |
| * | | | Design fixes for header, QR Code shared element transitionsDominik Schürmann2015-02-255-15/+27
| | | | |
| * | | | CardView and more header designDominik Schürmann2015-02-255-21/+53
| | | | |
| * | | | Use material icon for safeslingerDominik Schürmann2015-02-2512-3/+3
| | | | |
| * | | | Toolbar: qr code in header, cleanup of fragmentDominik Schürmann2015-02-2517-375/+75
| | | | |
| * | | | Bigger status icon in key viewDominik Schürmann2015-02-25110-26/+34
| | | | |
| * | | | First work on new key view toolbarDominik Schürmann2015-02-2518-31/+104
| | | | |
| * | | | Fix QR Code, design experiments for key viewDominik Schürmann2015-02-249-34/+88
| | | | |
| * | | | Remove tabs in view keyDominik Schürmann2015-02-247-13/+370
| | | | |
| * | | | New advanced key viewDominik Schürmann2015-02-235-65/+78
| | | | |
| * | | | Refactor AppsListFragmentDominik Schürmann2015-02-231-1/+0
| | | | |
| * | | | Uncluttering App Settings: Move advanced info in dialogDominik Schürmann2015-02-232-41/+5
| | | | |
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-09 06:55:29 +0000