aboutsummaryrefslogtreecommitdiffstats
path: root/OpenKeychain/src/main/res
Commit message (Collapse)AuthorAgeFilesLines
...
| * | | | Hide subkeys, certs tabs in key view, checkable menu item to show/hide themDominik Schürmann2014-06-062-0/+7
| | |/ / | |/| |
* | | | canonicalize: require primary key binding certificates for signing subkeysVincent Breitmoser2014-06-121-2/+5
| | | |
* | | | canonicalize: simplify import with info from canonicalizationVincent Breitmoser2014-06-121-4/+0
| | | |
* | | | canonicalize: filter out future and local certificatesVincent Breitmoser2014-06-121-6/+13
| | | |
* | | | import-log: more minor improvementsVincent Breitmoser2014-06-121-8/+6
| | | |
* | | | import: use wrapped keyring instead of uncached keyring for trustVincent Breitmoser2014-06-121-1/+1
| | | |
* | | | import-log: minor improvementsVincent Breitmoser2014-06-121-1/+3
| | | |
* | | | canonicalize: more stuffVincent Breitmoser2014-06-121-7/+10
| | | |
* | | | canonicalize: implementation, first draftVincent Breitmoser2014-06-121-1/+20
| | | |
* | | | import-log: better way to check self trust, and fix log level filteringVincent Breitmoser2014-06-121-1/+0
| | | |
* | | | import-log: work on log fragment uiVincent Breitmoser2014-06-102-3/+11
| | | |
* | | | import-log: switch to flags instead of statuses for result intVincent Breitmoser2014-06-1011-70/+72
| | | |
* | | | import-log: more interface workVincent Breitmoser2014-06-101-10/+23
| | | |
* | | | import-log: some cosmeticsVincent Breitmoser2014-06-105-23/+26
| | | |
* | | | import-log: add LogDisplay activityVincent Breitmoser2014-06-104-17/+91
| | | |
* | | | import-log: add OperationResults, use it in ImportKeys operationVincent Breitmoser2014-06-101-3/+9
| |_|/ |/| |
* | | import-log: better stripped key loggingVincent Breitmoser2014-06-061-1/+2
| | |
* | | import-log: add import log string resourcesVincent Breitmoser2014-06-061-0/+38
|/ /
* | Merge remote-tracking branch 'origin/master' into edit-key-rewriteVincent Breitmoser2014-06-0293-652/+1317
|\ \
| * | Merge branch 'master' of github.com:open-keychain/open-keychainDominik Schürmann2014-05-311-3/+3
| |\|
| | * Add Log.d for QueryFailedExceptionTim Bray2014-05-231-3/+3
| | |
| * | Pull from transifexDominik Schürmann2014-05-3192-649/+1314
| |/
* | Merge remote-tracking branch 'origin/master' into wrapped-key-ringVincent Breitmoser2014-05-2110-67/+59
|\| | | | | | | | | | | Conflicts: OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/PgpImportExport.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/KeychainIntentService.java
| * Layout fixes for key importDominik Schürmann2014-05-199-66/+58
| |
| * Clarify help startDominik Schürmann2014-05-141-1/+1
| |
* | Merge remote-tracking branch 'origin/master' into wrapped-key-ringVincent Breitmoser2014-05-14366-941/+2107
|\| | | | | | | | | | | | | | | | | Conflicts: OpenKeychain/src/main/java/org/sufficientlysecure/keychain/provider/ProviderHelper.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/KeychainIntentService.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/CertifyKeyActivity.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ViewCertActivity.java OpenKeychain/src/main/res/values/strings.xml
| * Add pgpauth app to help, update html-textviewDominik Schürmann2014-05-133-27/+4
| |
| * Add Tim Bray to aboutDominik Schürmann2014-05-091-0/+1
| |
| * Translations from transifexDominik Schürmann2014-05-0819-3/+141
| |
| * Changelog 2.7Dominik Schürmann2014-05-081-0/+9
| |
| * Translations from transifexDominik Schürmann2014-05-084-8/+12
| |
| * Use flat buttons where appropriateDominik Schürmann2014-05-0812-26/+67
| |
| * use LoaderFragment in ViewKey tabsVincent Breitmoser2014-05-083-9/+3
| | | | | | | | Closes #616
| * extract generic LoaderFragment superclass from KeyListVincent Breitmoser2014-05-082-83/+93
| |
| * Update from transifexDominik Schürmann2014-05-0827-14/+202
| |
| * Add applications section to helpDominik Schürmann2014-05-075-20/+6
| |
| * Start app menu item for registered appsDominik Schürmann2014-05-076-0/+7
| |
| * Better handling of actionbars backDominik Schürmann2014-05-071-3/+3
| |
| * Design fixes for certification activityDominik Schürmann2014-05-073-11/+28
| |
| * Alignment in certify activityDominik Schürmann2014-05-071-0/+1
| |
| * Change drawer nav icon back to grayDominik Schürmann2014-05-078-0/+0
| |
| * Translations from transifexDominik Schürmann2014-05-071-5/+6
| |
| * Use paste icon, clarify language once againDominik Schürmann2014-05-078-7/+8
| |
| * Pull translations from transifexDominik Schürmann2014-05-076-7/+3
| |
| * Clarify languageDominik Schürmann2014-05-072-3/+4
| |
| * Pull translations from transifexDominik Schürmann2014-05-0717-102/+151
| |
| * Merge branch 'master' of github.com:open-keychain/open-keychainDominik Schürmann2014-05-0722-171/+78
| |\
| | * ui: apply theme to tab buttonsVincent Breitmoser2014-05-071-0/+2
| | |
| | * ui: use SlidingTabLayout in help activityVincent Breitmoser2014-05-071-0/+5
| | |
| | * ui: primary certification icon was a pixel or two offVincent Breitmoser2014-05-071-2/+3
| | |