aboutsummaryrefslogtreecommitdiffstats
path: root/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui
Commit message (Expand)AuthorAgeFilesLines
* do a TON of UI workVincent Breitmoser2015-03-0511-95/+215
* work more on separation of linked identities and resources, initial ui workVincent Breitmoser2015-03-0411-30/+213
* remove unused bits from projectionVincent Breitmoser2015-03-021-15/+1
* add linked it to view key context menuVincent Breitmoser2015-03-022-0/+19
* Merge branch 'development' into linked-identitiesVincent Breitmoser2015-03-025-258/+303
|\
| * forgot to rename a methodVincent Breitmoser2015-03-022-4/+2
| * some cleanup in ViewKey*Vincent Breitmoser2015-03-022-18/+20
| * don't reload qr code for identical fingerprintVincent Breitmoser2015-03-021-1/+5
| * make userattributeadapter superclass of useridsadapterVincent Breitmoser2015-03-024-115/+143
* | some fixes for compiling (still not working!)Vincent Breitmoser2015-03-024-25/+10
* | NON-WORKING Merge branch 'development' into linked-identitiesVincent Breitmoser2015-03-0290-3255/+3995
|\|
| * fix a couple lint errorsVincent Breitmoser2015-02-282-4/+5
| * some changes to qr scan logicVincent Breitmoser2015-02-284-37/+113
| * pass through messenger to certify service from ViewKeyActivityVincent Breitmoser2015-02-284-49/+87
| * fab support for all notify typesVincent Breitmoser2015-02-281-23/+29
| * small Notify cleanupVincent Breitmoser2015-02-281-24/+2
| * clean up warnings in KeyListFragmentVincent Breitmoser2015-02-281-32/+10
| * collapse fab on action selectedVincent Breitmoser2015-02-281-0/+3
| * animate FAB to move up and down when a snackbar appearsVincent Breitmoser2015-02-281-11/+10
| * Merge branch 'development' of github.com:open-keychain/open-keychain into dev...Dominik Schürmann2015-02-283-4/+85
| |\
| | * control flow for moving the fab up with snackbarVincent Breitmoser2015-02-283-5/+85
| * | Update from transifexDominik Schürmann2015-02-281-2/+0
| |/
| * Simplify MainActivityDominik Schürmann2015-02-282-52/+23
| * Merge branch 'development' of github.com:open-keychain/open-keychain into dev...Dominik Schürmann2015-02-272-5/+32
| |\
| | * Merge branch 'development' of github.com:open-keychain/open-keychain into dev...Vincent Breitmoser2015-02-274-172/+9
| | |\
| | * | slightly longer color fade durationVincent Breitmoser2015-02-271-3/+3
| | * | transition status color in key viewVincent Breitmoser2015-02-271-3/+30
| | * | hand through result in CertifyFingerprintActivityVincent Breitmoser2015-02-271-2/+2
| * | | Reorder advanced key viewDominik Schürmann2015-02-272-59/+7
| | |/ | |/|
| * | Enable multi line snackbar optionDominik Schürmann2015-02-271-1/+5
| * | Remove swipte to refresh src, fix padding in key listDominik Schürmann2015-02-272-167/+0
| * | Merge branch 'development' of github.com:open-keychain/open-keychain into dev...Dominik Schürmann2015-02-271-7/+125
| |\|
| | * show refresh key progress inlineVincent Breitmoser2015-02-271-7/+125
| * | Fix status images in user id adapterDominik Schürmann2015-02-271-4/+4
| |/
| * Keybase header textDominik Schürmann2015-02-271-2/+2
| * go to directly to certify screen after nfc importVincent Breitmoser2015-02-274-85/+70
| * Prettify qr code in advanced key viewDominik Schürmann2015-02-271-7/+23
| * Uncluttering advanced key viewDominik Schürmann2015-02-273-250/+0
| * Simplify delete key dialogDominik Schürmann2015-02-272-4/+9
| * Remove unused BadImportKeyDialogFragmentDominik Schürmann2015-02-271-67/+0
| * Merge keybase-proof branchDominik Schürmann2015-02-273-1/+482
| |\
| | * Dont accept signatures by expired or revoked subkeysDominik Schürmann2014-11-221-1/+1
| | * Prevent multiple cloud-trust-search launches. Handle DNS query failure grace...Tim Bray2014-11-191-0/+1
| | * In the ImportKeysList display, arrange for Keybase UserIDs to sort below the ...Tim Bray2014-11-182-3/+20
| | * All keybase proofs now in placeTim Bray2014-11-111-39/+51
| | * Fix a no-result corner case, and make verifications clickableTim Bray2014-11-071-1/+2
| | * Moved from WebView to Spannables, some proof cleanup tooTim Bray2014-11-072-0/+449
| * | Remove old Holo design resourcesDominik Schürmann2015-02-261-3/+0
| * | Merge branch 'development' of github.com:open-keychain/open-keychain into dev...Dominik Schürmann2015-02-261-4/+5
| |\ \
| | * | pre-select certification key if only one is availableVincent Breitmoser2015-02-261-4/+5