aboutsummaryrefslogtreecommitdiffstats
path: root/OpenKeychain
Commit message (Expand)AuthorAgeFilesLines
...
* | Merge branch 'development' of github.com:open-keychain/open-keychain into dev...Dominik Schürmann2014-10-086-30/+19
|\ \
| * | remove ui hack, use padding instead of marginVincent Breitmoser2014-10-082-14/+3
| * | slightly change text in certify dialogVincent Breitmoser2014-10-081-1/+1
| * | use "Key ID" for beautifyVincent Breitmoser2014-10-081-1/+1
| * | automatically extend single compound entry logsVincent Breitmoser2014-10-082-14/+14
* | | New decryption screen UI with modernPGP iconsDominik Schürmann2014-10-0831-233/+382
|/ /
* | Filter key list by certified keysDominik Schürmann2014-10-084-4/+81
* | Move utf8 check for user id upwardsDominik Schürmann2014-10-071-4/+5
* | Fix MSG_MF_UID_PRIMARY logDominik Schürmann2014-10-072-2/+2
* | Remove monospace from encrypt itemDominik Schürmann2014-10-071-1/+0
* | Cleanup and fix decrypt activityDominik Schürmann2014-10-071-20/+32
* | Certify designDominik Schürmann2014-10-071-1/+1
* | Certify designDominik Schürmann2014-10-074-109/+120
* | forgot layout piece for 096f6e436Vincent Breitmoser2014-10-061-3/+5
* | get rid of some old code in LogDisplayFragmentVincent Breitmoser2014-10-061-70/+4
* | certify: checkbox fake click area tidbitVincent Breitmoser2014-10-061-0/+10
* | 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-0514-81/+59
|\ \
| * | UI stuffDominik Schürmann2014-10-0514-81/+59
* | | 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...Vincent Breitmoser2014-10-0413-206/+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
| | |/ | |/|