aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* work on certification stepVincent Breitmoser2015-03-082-7/+100
* finish after linked id creationVincent Breitmoser2015-03-061-12/+1
* use final fragment superclass for twitterVincent Breitmoser2015-03-061-98/+23
* use final fragment superclass for dnsVincent Breitmoser2015-03-062-214/+19
* extract linked id create final fragment superclassVincent Breitmoser2015-03-062-221/+275
* prepare superclass extraction for final linked id creation fragmentVincent Breitmoser2015-03-065-34/+42
* first steps in ui towards confirmation of linked idsVincent Breitmoser2015-03-068-237/+410
* work on LinkedIdViewFragmentVincent Breitmoser2015-03-0512-105/+178
* make linked identity list homogeneousVincent Breitmoser2015-03-0512-112/+156
* Merge branch 'development' into linked-identitiesVincent Breitmoser2015-03-05598-1502/+1234
|\
| * Merge pull request #1101 from danielnelz/developmentDominik Schürmann2015-03-0413-70/+85
| |\
| | * #1042 replaced some int constants with enumsDaniel Nelz2015-03-0413-70/+85
| * | Rewording secret_key_deletion_confirmationDominik Schürmann2015-03-041-1/+1
| * | Show fingerprint menu item only if not revoked or expiredDominik Schürmann2015-03-041-9/+12
| * | Use material save iconDominik Schürmann2015-03-0411-1/+2
| * | Merge branch 'adithyaphilip-development' into developmentDominik Schürmann2015-03-048-2/+225
| |\ \
| | * | Merge branch 'development' of https://github.com/adithyaphilip/open-keychain ...Dominik Schürmann2015-03-048-2/+225
| |/| |
| | * | corrected code styleAdithya Abraham Philip2015-03-041-58/+75
| | * | Merge branch 'development' of https://github.com/open-keychain/open-keychain ...Adithya Abraham Philip2015-03-0217-41/+104
| | |\ \
| | * | | supports sub logs in log exportAdithya Abraham Philip2015-03-011-68/+55
| | * | | added logging, notify for log exportAdithya Abraham Philip2015-03-013-20/+66
| | * | | Merge branch 'development' of https://github.com/open-keychain/open-keychain ...Adithya Abraham Philip2015-02-284-37/+113
| | |\ \ \
| | * \ \ \ Merge branch 'development' of https://github.com/open-keychain/open-keychain ...Adithya Abraham Philip2015-02-2874-835/+1672
| | |\ \ \ \
| | * | | | | cleaned up log exportAdithya Abraham Philip2015-02-281-20/+9
| | * | | | | Merge branch 'development' of https://github.com/open-keychain/open-keychain ...Adithya Abraham Philip2015-02-2837-651/+1303
| | |\ \ \ \ \
| | * | | | | | refined log outputAdithya Abraham Philip2015-02-281-4/+71
| | * | | | | | merged dialogAdithya Abraham Philip2015-02-26835-5627/+14491
| | |\ \ \ \ \ \
| | * | | | | | | initial Log Display functionAdithya Abraham Philip2015-02-267-0/+117
| * | | | | | | | Set key signature algo from SHA512 to SHA256Dominik Schürmann2015-03-041-9/+10
| * | | | | | | | Remove help button for nowDominik Schürmann2015-03-047-16/+3
| * | | | | | | | More icon naming fixes and designDominik Schürmann2015-03-0424-56/+70
| * | | | | | | | Partially fix file namesDominik Schürmann2015-03-04222-48/+36
| * | | | | | | | Fix transifexDominik Schürmann2015-03-041-12/+3
| * | | | | | | | Simplified language: Confirm keysDominik Schürmann2015-03-0455-781/+82
| * | | | | | | | Update lib listDominik Schürmann2015-03-042-34/+10
| * | | | | | | | Get high res version of contact photoDominik Schürmann2015-03-043-6/+7
| * | | | | | | | Crop image view to centerDominik Schürmann2015-03-042-7/+6
| * | | | | | | | Full height contact pic in key viewDominik Schürmann2015-03-042-8/+8
| * | | | | | | | ContactHelper cleanupDominik Schürmann2015-03-042-34/+41
| * | | | | | | | Use master key id instead of fingerprint in sync adapter, use IS_EXPIRED inst...Dominik Schürmann2015-03-049-119/+129
| * | | | | | | | Fix status bar orangeDominik Schürmann2015-03-041-1/+1
| * | | | | | | | More simplification of delete stringsDominik Schürmann2015-03-041-1/+1
| * | | | | | | | Merge pull request #1097 from ishan1604/orange-toolbarDominik Schürmann2015-03-043-2/+33
| |\ \ \ \ \ \ \ \
| | * | | | | | | | Orange Toolbar Added Fixes #1088Ishan Khanna2015-03-045-44/+33
| | * | | | | | | | Fixes Issue#1088Ishan Khanna2015-03-042-0/+42
| | * | | | | | | | Merge remote-tracking branch 'upstream/development' into developmentIshan Khanna2015-03-041-2/+2
| | |\ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ Merge remote-tracking branch 'upstream/development' into developmentIshan Khanna2015-03-0415-65/+79
| | |\ \ \ \ \ \ \ \ \ | | | | |_|_|_|_|_|_|/ | | | |/| | | | | | |
| | * | | | | | | | | Fixed SubmodulesIshan Khanna2015-03-041-0/+2
| * | | | | | | | | | Simplify certify stringsDominik Schürmann2015-03-041-11/+2
| * | | | | | | | | | Simplify dialogs according to Material DesignDominik Schürmann2015-03-043-17/+13