aboutsummaryrefslogtreecommitdiffstats
path: root/OpenKeychain/src
Commit message (Expand)AuthorAgeFilesLines
...
| | * | | | | | | | | | | | | | NON-WORKING Merge branch 'development' into linked-identitiesVincent Breitmoser2015-03-02860-9738/+15723
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | | | | small language fixVincent Breitmoser2015-01-162-15/+19
| | * | | | | | | | | | | | | | | linked id ui work dns/twitterVincent Breitmoser2015-01-165-14/+19
| | * | | | | | | | | | | | | | | dns resource is parametrized by fqdn, class and typeVincent Breitmoser2015-01-162-5/+34
| | * | | | | | | | | | | | | | | show notification if KeyListActivity is spawned with an EXTRA_RESULTVincent Breitmoser2015-01-162-1/+9
| | * | | | | | | | | | | | | | | affirmation -> linked identityVincent Breitmoser2015-01-1529-206/+178
| | * | | | | | | | | | | | | | | work on dns resource, working (dummy) verificationVincent Breitmoser2015-01-1410-79/+686
| | * | | | | | | | | | | | | | | fix ambiguous column name in advanced key infoVincent Breitmoser2015-01-141-1/+1
| | * | | | | | | | | | | | | | | small fixes to user attribute handlingVincent Breitmoser2015-01-144-3/+28
| | * | | | | | | | | | | | | | | fix log entry for addition of user attributesVincent Breitmoser2015-01-141-3/+3
| | * | | | | | | | | | | | | | | actually import user attributes (though they are not shown anywhere yet)Vincent Breitmoser2015-01-148-17/+202
| | * | | | | | | | | | | | | | | make user_ids table typed, with attribute_data supportVincent Breitmoser2015-01-139-88/+120
| | * | | | | | | | | | | | | | | certification of the first linked identity packet!Vincent Breitmoser2015-01-138-45/+189
| | * | | | | | | | | | | | | | | add support for user attributes in merge() routineVincent Breitmoser2015-01-131-2/+28
| | * | | | | | | | | | | | | | | hack to make WrappedUserAttribute serializableVincent Breitmoser2015-01-131-2/+47
| | * | | | | | | | | | | | | | | add back button to wizard fragmentsVincent Breitmoser2015-01-1312-12/+66
| | * | | | | | | | | | | | | | | some work on twitter resourceVincent Breitmoser2015-01-1312-15/+1297
| | * | | | | | | | | | | | | | | forgot to commit WrappedUserAttributeVincent Breitmoser2015-01-121-0/+47
| | * | | | | | | | | | | | | | | add dns button to linked identity selectionVincent Breitmoser2015-01-122-1/+36
| | * | | | | | | | | | | | | | | support addition of user attributesVincent Breitmoser2015-01-124-9/+61
| | * | | | | | | | | | | | | | | work on affirmations (begin rename to LinkedIdentityVincent Breitmoser2015-01-125-176/+10
| | * | | | | | | | | | | | | | | add support for user attributes (during canonicalization)Vincent Breitmoser2015-01-125-1/+366
| | * | | | | | | | | | | | | | | even more intermediate resultVincent Breitmoser2015-01-1213-271/+435
| | * | | | | | | | | | | | | | | intermediate state, nothing really working yetVincent Breitmoser2015-01-1220-0/+1570
| * | | | | | | | | | | | | | | | Make keybase an experimental featureDominik Schürmann2015-08-2812-213/+213
| * | | | | | | | | | | | | | | | Add missing scrim drawableDominik Schürmann2015-08-281-0/+8
| * | | | | | | | | | | | | | | | introduce text protection and fix color change after confirmDominik Schürmann2015-08-283-10/+38
| * | | | | | | | | | | | | | | | Remove old commentDominik Schürmann2015-08-281-1/+0
| * | | | | | | | | | | | | | | | Improve scrolling in key viewDominik Schürmann2015-08-283-5/+1361
| * | | | | | | | | | | | | | | | Dont show FAB for expired, revoked keysDominik Schürmann2015-08-282-2/+4
| * | | | | | | | | | | | | | | | Improve certify stringsDominik Schürmann2015-08-281-9/+9
| * | | | | | | | | | | | | | | | Merge branch 'master' of github.com:open-keychain/open-keychainDominik Schürmann2015-08-2810-140/+177
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'master' of github.com:open-keychain/open-keychainVincent Breitmoser2015-08-278-10/+12216
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'master' of github.com:open-keychain/open-keychainVincent Breitmoser2015-08-2725-20/+47
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | | | | | | | use nicer filenames during exportVincent Breitmoser2015-08-272-4/+22
| | * | | | | | | | | | | | | | | | | | some cleanup in FileHelper, and allow input of filename during exportVincent Breitmoser2015-08-279-139/+158
| * | | | | | | | | | | | | | | | | | | Collapsing ToolbarDominik Schürmann2015-08-283-288/+269
| | |_|/ / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | Experimental word comparisonDominik Schürmann2015-08-278-10/+12216
| | |/ / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | Fix theme settingDominik Schürmann2015-08-271-0/+2
| * | | | | | | | | | | | | | | | | Prettify settings, rename some stringsDominik Schürmann2015-08-2724-20/+45
| |/ / / / / / / / / / / / / / / /
| * | | | | | | | | | | | | | | | Use SwitchPreference more oftenDominik Schürmann2015-08-274-20/+20
| * | | | | | | | | | | | | | | | Experimental features settings reworkedDominik Schürmann2015-08-276-23/+71
| * | | | | | | | | | | | | | | | Remove dead codeDominik Schürmann2015-08-279-649/+59
| * | | | | | | | | | | | | | | | Experimental feature settingDominik Schürmann2015-08-276-9/+60
| * | | | | | | | | | | | | | | | fix msg_ip_merge_secretDominik Schürmann2015-08-261-1/+1
| * | | | | | | | | | | | | | | | Use CDATA to prevent transifex problemsDominik Schürmann2015-08-261-6/+6
| * | | | | | | | | | | | | | | | Pull from transifexDominik Schürmann2015-08-2644-4229/+965
| * | | | | | | | | | | | | | | | Pull from transifexDominik Schürmann2015-08-2552-755/+1178
| | |_|_|_|_|_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | Merge pull request #1501 from open-keychain/multi-thread-fixDominik Schürmann2015-08-241-55/+31
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | | | | fixed update all crashAdithya Abraham Philip2015-08-241-55/+31