aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* work more on separation of linked identities and resources, initial ui workVincent Breitmoser2015-03-0421-227/+438
* remove unused bits from projectionVincent Breitmoser2015-03-021-15/+1
* nonce is 4 bytesVincent Breitmoser2015-03-021-9/+9
* add linked it to view key context menuVincent Breitmoser2015-03-024-1/+26
* Merge branch 'development' into linked-identitiesVincent Breitmoser2015-03-0225-320/+426
|\
| * forgot to rename a methodVincent Breitmoser2015-03-022-4/+2
| * Merge branch 'development' of github.com:open-keychain/open-keychain into dev...Vincent Breitmoser2015-03-021-0/+4
| |\
| | * README: mac os x workaroundDominik Schürmann2015-03-021-0/+4
| * | some cleanup in ViewKey*Vincent Breitmoser2015-03-022-18/+20
| * | Merge branch 'development' of github.com:open-keychain/open-keychain into dev...Vincent Breitmoser2015-03-0217-41/+100
| |\|
| | * Search string simplifiedDominik Schürmann2015-03-021-2/+1
| | * Use gradle witnessDominik Schürmann2015-03-024-2/+37
| | * Update readme for build systemDominik Schürmann2015-03-021-7/+5
| | * Re-add black colorDominik Schürmann2015-03-021-0/+2
| | * Remove supertoast dependencyDominik Schürmann2015-03-021-1/+0
| | * Removed unused submodulesDominik Schürmann2015-03-024-9/+0
| | * Use SDK and build tools versions from root projectDominik Schürmann2015-03-0210-14/+36
| | * Revert "Gradle hack to always use same build tools in subprojects"Dominik Schürmann2015-03-022-32/+1
| | * Gradle hack to always use same build tools in subprojectsDominik Schürmann2015-03-022-1/+32
| | * Use index constants in ContactHelperDominik Schürmann2015-03-021-7/+20
| * | don't reload qr code for identical fingerprintVincent Breitmoser2015-03-021-1/+5
| * | make userattributeadapter superclass of useridsadapterVincent Breitmoser2015-03-026-122/+162
* | | some fixes for compiling (still not working!)Vincent Breitmoser2015-03-027-28/+13
* | | NON-WORKING Merge branch 'development' into linked-identitiesVincent Breitmoser2015-03-021200-13898/+27589
|\| |
| * | 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
| * Strings: File sizeDominik Schürmann2015-02-281-2/+2
| * Fix strings based on transifex reportsDominik Schürmann2015-02-281-13/+13
| * forgot to commit FabContainerVincent Breitmoser2015-02-281-0/+8
| * Merge branch 'development' of github.com:open-keychain/open-keychain into dev...Dominik Schürmann2015-02-284-6/+89
| |\
| | * control flow for moving the fab up with snackbarVincent Breitmoser2015-02-284-7/+89
| * | Update from transifexDominik Schürmann2015-02-2834-238/+1010
| |/
| * Simplify MainActivityDominik Schürmann2015-02-282-52/+23
| * Upload new keys to keyserver by defaultDominik Schürmann2015-02-281-0/+1
| * padding fixes for key listDominik Schürmann2015-02-281-2/+1
| * 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-2715-211/+76
| | |\
| | * | 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-274-111/+7
| | |/ | |/|
| * | Enable multi line snackbar optionDominik Schürmann2015-02-272-2/+6
| * | Remove swipte to refresh src, fix padding in key listDominik Schürmann2015-02-273-208/+27
| * | Fix keyboard overlay bug on top of edittextsDominik Schürmann2015-02-2710-5/+47
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-18 13:09:43 +0000