aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
...
* | move "synchronize" checkbox to bottom section as wellVincent Breitmoser2014-10-061-17/+14
* | multicertify: move key spinner to the bottomVincent Breitmoser2014-10-064-45/+33
* | Fix app nameDominik Schürmann2014-10-052-1/+3
* | Merge branch 'jacobshack-certify' of github.com:open-keychain/open-keychain i...Vincent Breitmoser2014-10-0516-82/+208
|\ \
| * | UI stuffDominik Schürmann2014-10-0516-82/+208
* | | use sub results in importVincent Breitmoser2014-10-052-3/+14
* | | add support for second line in log viewVincent Breitmoser2014-10-054-34/+113
* | | add support for hierarchical log entriesVincent Breitmoser2014-10-053-10/+103
|/ /
* | use status icons in public key selectionDominik Schürmann2014-10-058-129/+45
* | Add cloud iconDominik Schürmann2014-10-055-0/+1
* | Merge branch 'jacobshack-certify' of github.com:open-keychain/open-keychain i...Vincent Breitmoser2014-10-054-56/+63
|\ \
| * | Give result down to listDominik Schürmann2014-10-052-50/+58
| * | Make bit size optionalDominik Schürmann2014-10-053-6/+5
* | | even more layout neatificationVincent Breitmoser2014-10-052-17/+35
|/ /
* | Merge branch 'jacobshack-certify' of github.com:open-keychain/open-keychain i...Vincent Breitmoser2014-10-056-11/+40
|\ \
| * | preselect certify keyDominik Schürmann2014-10-056-14/+35
| * | Display result in multi certifyDominik Schürmann2014-10-043-1/+9
* | | more layout neatificationVincent Breitmoser2014-10-053-4/+22
* | | slight layout changes to keyspinner_itemVincent Breitmoser2014-10-053-7/+6
|/ /
* | Merge branch 'jacobshack-certify' of github.com:open-keychain/open-keychain i...Vincent Breitmoser2014-10-043-137/+141
|\ \
| * | use new multi certify, layout fixesDominik Schürmann2014-10-043-137/+141
* | | merge key ids in getSelectedCertifyActionsVincent Breitmoser2014-10-042-24/+28
|/ /
* | Merge branch 'jacobshack-certify' of github.com:open-keychain/open-keychain i...Dominik Schürmann2014-10-041-6/+0
|\ \
| * \ Merge branch 'jacobshack-certify' of github.com:open-keychain/open-keychain i...Vincent Breitmoser2014-10-0413-206/+378
| |\ \
* | \ \ Merge branch 'jacobshack-certify' of github.com:open-keychain/open-keychain i...Vincent Breitmoser2014-10-0412-200/+378
|\ \ \ \ | |/ / / |/| / / | |/ /
| * | add dividerDominik Schürmann2014-10-042-3/+7
| * | qr code download, cleanupDominik Schürmann2014-10-042-117/+63
| * | Workings on new parcel for key downloadsDominik Schürmann2014-10-048-86/+212
| * | Pass imported master key ids via result parcelDominik Schürmann2014-10-045-51/+87
| * | Fixing import, start qr code stuffDominik Schürmann2014-10-041-50/+116
* | | implement preliminary MultiCertifyActivity (most heavy lifting is done)Vincent Breitmoser2014-10-0410-9/+822
* | | certify: get rid of fingerprint checkVincent Breitmoser2014-10-045-16/+6
|/ /
* | Merge branch 'jacobshack-certify' of github.com:open-keychain/open-keychain i...Vincent Breitmoser2014-10-0412-42/+751
|\ \
| * \ Merge branch 'jacobshack-certify' of github.com:open-keychain/open-keychain i...Dominik Schürmann2014-10-0410-289/+653
| |\ \
| * | | Import code, fix collision of key spinner with other loadersDominik Schürmann2014-10-047-46/+321
| * | | New add keys activityDominik Schürmann2014-10-048-13/+447
| | |/ | |/|
* | | improve CertifyResult, add custom notifyVincent Breitmoser2014-10-0415-26/+140
| |/ |/|
* | redesign certify action to work with parcel input and resultVincent Breitmoser2014-10-0410-43/+389
* | keychainintentservice: rearrange actions in alphabetical orderVincent Breitmoser2014-10-041-263/+281
|/
* add unit test for duplicate user ids (fix later!!)Vincent Breitmoser2014-10-041-9/+39
* canonicalize: compare user ids as string rather than bytesVincent Breitmoser2014-10-041-3/+3
* Merge branch 'master' of github.com:open-keychain/open-keychainVincent Breitmoser2014-10-0337-72/+169
|\
| * Make app_name translatableDominik Schürmann2014-10-032-6/+2
| * Version 3.0.1Dominik Schürmann2014-10-031-2/+2
| * Fix string referenceDominik Schürmann2014-10-031-1/+1
| * Pull from transifexDominik Schürmann2014-10-0331-63/+154
| * ChangelogDominik Schürmann2014-10-032-0/+10
* | fix nullpointer on button push while data is still loadingVincent Breitmoser2014-10-031-0/+3
|/
* Null check for getSelectedEntriesDominik Schürmann2014-10-031-1/+7
* one more fix for getting the right subkey in api signingVincent Breitmoser2014-10-031-19/+19