aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* 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
|/| | | | | | | | | | | | | into adithyaphilip-development Conflicts: OpenKeychain/src/main/res/values/strings.xml
| * 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
| |\ | | | | | | | | | into development
| * | 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
| |\ \ | | | | | | | | | | | | into development
| * \ \ Merge branch 'development' of https://github.com/open-keychain/open-keychain ↵Adithya Abraham Philip2015-02-2874-835/+1672
| |\ \ \ | | | | | | | | | | | | | | | into development
| * | | | 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
| |\ \ \ \ | | | | | | | | | | | | | | | | | | into development
| * | | | | 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 ↵Dominik Schürmann2015-03-049-119/+129
| | | | | | | | | | | | | | | | | | | | | | | | | | | | instead of EXPIRY where possible
* | | | | | | 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 for certify and fingerprint activity added
| * | | | | | | 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
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: .gitmodules
| * \ \ \ \ \ \ \ 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
| | | | | | | | | |
* | | | | | | | | | Merge pull request #1080 from indrora/avoid-large-log-parcelsVincent2015-03-041-6/+63
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | Fix root cause of #1077
| * | | | | | | | | | Cleanup for styleMorgan Gangwere2015-03-031-13/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Some nitpicks were had. Also, change the null UUID to a constant.
| * | | | | | | | | | Fix root cause of #1077Morgan Gangwere2015-03-031-6/+70
| |/ / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When importing lots of keys, lots of messages about the status of keys is generated, including some debug slime and general fluff that isn't really needed a lot of the time. As a result, a serious bug can come along after key imports or certain operations which cause a log to become parceled. This commit implements a pool to "dehydrate" logs into: they are placed into the pool (a ConcurrentHashMap) and a UUID assigned to them, which is parceled along. When the OperationResult is un-parceled, it reads in the appropriate UUID bits and rehydrates the appropriate log. In order to avoid any memory leaks, the log pool removes a reference to the log itself, allowing the log to die a natural death at the hands of the GC..
* | | | | | | | | | Merge branch 'vectorijk-development' into developmentDominik Schürmann2015-03-03249-44/+71
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Merge branch 'development' of https://github.com/vectorijk/open-keychain ↵Dominik Schürmann2015-03-03249-44/+71
|/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into vectorijk-development
| * | | | | | | | | | if needed change name options.templ.jsonjiangkai2015-03-032-1/+4
| | | | | | | | | | |
| * | | | | | | | | | icon name changes in UI filesjiangkai2015-03-032-2/+2
| | | | | | | | | | |
| * | | | | | | | | | delete holo iconsjiangkai2015-03-0395-0/+0
| | | | | | | | | | |
| * | | | | | | | | | change icon name in layout filesjiangkai2015-03-0324-40/+40
| | | | | | | | | | |
| * | | | | | | | | | download new material design iconsjiangkai2015-03-03125-0/+0
| | | | | | | | | | |
| * | | | | | | | | | get more material icon scriptjiangkai2015-03-031-1/+25
| | | | | | | | | | |
* | | | | | | | | | | Show name only in passphrase dialogDominik Schürmann2015-03-032-1/+25
| | | | | | | | | | |
* | | | | | | | | | | Merge branch 'development' of github.com:open-keychain/open-keychain into ↵Dominik Schürmann2015-03-031-1/+3
|\ \ \ \ \ \ \ \ \ \ \ | | |_|_|/ / / / / / / | |/| | | | | | | | | | | | | | | | | | | | development
| * | | | | | | | | | Merge pull request #1089 from ishan1604/submodulesfixDominik Schürmann2015-03-031-1/+3
| |\ \ \ \ \ \ \ \ \ \ | | |_|_|/ / / / / / / | |/| | | | | | | | | Submodulesfix
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-28 00:00:11 +0000