aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'certify' into certsVincent Breitmoser2014-03-1512-225/+662
|\
| * certify: preserve user id certificates when saving secret keysVincent Breitmoser2014-03-153-6/+64
| * certify: sign individual UIDsVincent Breitmoser2014-03-153-12/+31
| * certify: add some subscopes in PgpKeyOperation for readabilityVincent Breitmoser2014-03-151-112/+128
| * certify: revamp certifykeyactivityVincent Breitmoser2014-03-154-1/+186
| * certify: support PUBLIC_KEY_RING_BY_MASTER_KEY_ID_USER_ID uri (haha)Vincent Breitmoser2014-03-151-0/+36
| * certify: viewkeyuseridsadapter cosmetics and checkbox capabilityVincent Breitmoser2014-03-153-17/+116
| * certify: selectsecretkeyfragment cosmeticsVincent Breitmoser2014-03-152-6/+22
| * certify: add certify action button to viewkeymainfragmentVincent Breitmoser2014-03-152-0/+32
| * move fingerprint coloring into helperVincent Breitmoser2014-03-153-61/+64
* | Merge branch 'master' into certsVincent Breitmoser2014-03-15127-2422/+2444
|\|
| * Merge pull request #417 from uberspot/masterDominik Schürmann2014-03-144-11/+30
| |\
| | * Fix two bugs in ImportKeys screen (issue #416)uberspot2014-03-142-0/+2
| | * Make email address less restrictive and add icon to show when it's correctuberspot2014-03-142-11/+28
| |/
| * Merge pull request #415 from uberspot/masterDominik Schürmann2014-03-1312-106/+132
| |\
| | * final code style changesuberspot2014-03-1312-106/+132
| |/
| * Merge pull request #413 from uberspot/masterDominik Schürmann2014-03-1365-984/+997
| |\
| | * fix code style in /pgpuberspot2014-03-1311-491/+436
| | * final ui code style changesuberspot2014-03-1312-53/+54
| | * more code style changes in /ui and /utiluberspot2014-03-1324-323/+345
| | * more UI code style fixesuberspot2014-03-139-70/+77
| | * More code style fixes for /uiuberspot2014-03-1316-53/+91
| |/
| * Fix colors in item viewDominik Schürmann2014-03-132-2/+2
| * remove unused colorDominik Schürmann2014-03-131-1/+0
| * Improve list item view, borderless button for API < 11Dominik Schürmann2014-03-134-55/+78
| * Merge pull request #412 from uberspot/masterDominik Schürmann2014-03-1375-922/+761
| |\
| | * First code style changes in uiuberspot2014-03-1356-634/+486
| | * Fix code style in /helperuberspot2014-03-135-71/+64
| | * Fix code style in keychain/service/uberspot2014-03-1311-87/+129
| | * Optimize imports in all files, remove useless whitespace in some and fix inde...uberspot2014-03-1312-130/+82
| |/
| * Merge pull request #407 from uberspot/masterDominik Schürmann2014-03-131-15/+31
| |\
| | * add apg's change to colorizing, no more background changes neededuberspot2014-03-131-15/+31
| * | Forgot faq fileDominik Schürmann2014-03-131-0/+12
| * | Merge branch 'master' of github.com:openpgp-keychain/openpgp-keychainDominik Schürmann2014-03-131-23/+29
| |\ \
| | * \ Merge pull request #408 from gogowitczak/masterDominik Schürmann2014-03-131-23/+29
| | |\ \
| | | * | Added possibility to specify port for KeyServer.gogowitczak2014-03-131-1/+1
| | | * | Added possibility to specify port for KeyServer.gogowitczak2014-03-131-24/+30
| | | |/
| * | / Add FAQ tab to helpDominik Schürmann2014-03-132-8/+12
| |/ /
| * | Readd create key menu itemsDominik Schürmann2014-03-133-16/+61
| * | XML cleanup and bigger filename EditTextDominik Schürmann2014-03-133-161/+173
| * | Cleanup and simplificationDominik Schürmann2014-03-132-61/+24
| * | Merge pull request #403 from Valodim/masterDominik Schürmann2014-03-1327-875/+549
| |\ \ | | |/ | |/|
| | * drop unified uri in favor of generic /key_ringsVincent Breitmoser2014-03-132-15/+10
| | * Merge remote-tracking branch 'origin/master'Vincent Breitmoser2014-03-1318-51/+151
| | |\ | | |/ | |/|
| * | Merge pull request #388 from ajit766/exportkeyfixDominik Schürmann2014-03-134-16/+56
| |\ \
| | * | Export cancellable - minor changesgrait2014-03-133-6/+10
| | * | Export is cancellable nowgrait2014-03-133-16/+52
| |/ /
| * | Merge pull request #396 from bhargavgolla/Lint-error-fixDominik Schürmann2014-03-1211-17/+20
| |\ \
| | * | Removing tabBhargav Golla2014-03-101-1/+1
| | * | Removing unused stringBhargav Golla2014-03-101-1/+1
generated by cgit v1.2.3 (git 2.25.1) at 2024-10-16 14:23:45 +0000