aboutsummaryrefslogtreecommitdiffstats
path: root/OpenKeychain/src/main/java/org
Commit message (Expand)AuthorAgeFilesLines
...
| * | | | | | | | | | | | add linked it to view key context menuVincent Breitmoser2015-03-022-0/+19
| * | | | | | | | | | | | Merge branch 'development' into linked-identitiesVincent Breitmoser2015-03-027-279/+323
| |\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | some fixes for compiling (still not working!)Vincent Breitmoser2015-03-024-25/+10
| * | | | | | | | | | | | | NON-WORKING Merge branch 'development' into linked-identitiesVincent Breitmoser2015-03-02160-5274/+7662
| |\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | small language fixVincent Breitmoser2015-01-161-13/+17
| * | | | | | | | | | | | | | linked id ui work dns/twitterVincent Breitmoser2015-01-163-9/+16
| * | | | | | | | | | | | | | 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-1519-175/+147
| * | | | | | | | | | | | | | work on dns resource, working (dummy) verificationVincent Breitmoser2015-01-146-66/+454
| * | | | | | | | | | | | | | fix ambiguous column name in advanced key infoVincent Breitmoser2015-01-141-1/+1
| * | | | | | | | | | | | | | small fixes to user attribute handlingVincent Breitmoser2015-01-143-3/+27
| * | | | | | | | | | | | | | 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-147-17/+185
| * | | | | | | | | | | | | | make user_ids table typed, with attribute_data supportVincent Breitmoser2015-01-139-88/+120
| * | | | | | | | | | | | | | certification of the first linked identity packet!Vincent Breitmoser2015-01-137-45/+188
| * | | | | | | | | | | | | | 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-136-0/+42
| * | | | | | | | | | | | | | some work on twitter resourceVincent Breitmoser2015-01-136-1/+670
| * | | | | | | | | | | | | | forgot to commit WrappedUserAttributeVincent Breitmoser2015-01-121-0/+47
| * | | | | | | | | | | | | | support addition of user attributesVincent Breitmoser2015-01-123-8/+57
| * | | | | | | | | | | | | | work on affirmations (begin rename to LinkedIdentityVincent Breitmoser2015-01-125-176/+10
| * | | | | | | | | | | | | | add support for user attributes (during canonicalization)Vincent Breitmoser2015-01-124-0/+350
| * | | | | | | | | | | | | | even more intermediate resultVincent Breitmoser2015-01-1211-266/+403
| * | | | | | | | | | | | | | intermediate state, nothing really working yetVincent Breitmoser2015-01-1212-0/+1113
* | | | | | | | | | | | | | | Make keybase an experimental featureDominik Schürmann2015-08-286-97/+113
* | | | | | | | | | | | | | | introduce text protection and fix color change after confirmDominik Schürmann2015-08-281-1/+10
* | | | | | | | | | | | | | | 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-274-9/+174
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'master' of github.com:open-keychain/open-keychainVincent Breitmoser2015-08-271-0/+2
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | 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-281-35/+32
| |_|/ / / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | Experimental word comparisonDominik Schürmann2015-08-274-9/+174
| |/ / / / / / / / / / / / / / / |/| | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | Fix theme settingDominik Schürmann2015-08-271-0/+2
|/ / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | Use SwitchPreference more oftenDominik Schürmann2015-08-271-14/+14
* | | | | | | | | | | | | | | Experimental features settings reworkedDominik Schürmann2015-08-273-18/+42
* | | | | | | | | | | | | | | Remove dead codeDominik Schürmann2015-08-277-631/+42
* | | | | | | | | | | | | | | Experimental feature settingDominik Schürmann2015-08-273-7/+51
| |_|_|_|_|_|_|_|_|_|_|_|_|/ |/| | | | | | | | | | | | |
* | | | | | | | | | | | | | 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
* | | | | | | | | | | | | | | API: Fix get sign key, related to OpenPgpKeyPreference bugsDominik Schürmann2015-08-242-30/+37
|/ / / / / / / / / / / / / /
* | | | | | | | | | | | | | Merge branch 'master' of github.com:open-keychain/open-keychainDominik Schürmann2015-08-243-1/+9
|\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | trigger indexing of file after operation (#1498)Vincent Breitmoser2015-08-221-1/+6
| * | | | | | | | | | | | | | mention filename to export to in logVincent Breitmoser2015-08-222-0/+3
* | | | | | | | | | | | | | | Move proxy pref values out of stringsDominik Schürmann2015-08-242-7/+15
|/ / / / / / / / / / / / / /
* | | | | | | | | | | | | | introduced constants for keyserver sync, fixed sync issueAdithya Abraham Philip2015-08-2011-67/+77
* | | | | | | | | | | | | | added on/off summariesAdithya Abraham Philip2015-08-201-1/+26
* | | | | | | | | | | | | | added sync preferencesAdithya Abraham Philip2015-08-203-3/+74