aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Lock drawer as open in tabletsuberspot2014-03-1621-692/+863
* Fix export for new unified key list #409uberspot2014-03-159-79/+112
* 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
| * | Merge remote-tracking branch 'upstream/master' into Lint-error-fixBhargav Golla2014-03-1049-481/+1293
| |\ \
| * | | Lint changes after testingBhargav Golla2014-03-1012-19/+21
* | | | Merge pull request #404 from uberspot/masterDominik Schürmann2014-03-122-12/+60
|\ \ \ \
| * | | | change colorizing of fingerprint to use SHA1 based on apg's commit 67ffc24526uberspot2014-03-122-12/+60
* | | | | Merge pull request #405 from honnel/checkstyleDominik Schürmann2014-03-121-6/+15
|\ \ \ \ \
| * | | | | Added Windows section to CheckStyle configuration information part (and split...Daniel Hammann2014-03-121-6/+15
| * | | | | Merge branch 'master' of https://github.com/openpgp-keychain/openpgp-keychainDaniel Hammann2014-03-1244-336/+660
| |\| | | |
| * | | | | Merge branch 'master' of https://github.com/openpgp-keychain/openpgp-keychainDaniel Hammann2014-03-1148-458/+1260
| |\ \ \ \ \
* | \ \ \ \ \ Merge pull request #406 from Emantor/tests_and_travisDominik Schürmann2014-03-121-1/+1
|\ \ \ \ \ \ \ | |_|_|/ / / / |/| | | | | |
generated by cgit v1.2.3 (git 2.25.1) at 2025-02-15 03:40:01 +0000