aboutsummaryrefslogtreecommitdiffstats
path: root/OpenKeychain/src/main/res
Commit message (Collapse)AuthorAgeFilesLines
* Show keys with android contactsmar-v-in2014-06-052-3/+2
| | | | This means to sync userid + keyid into contact storage. Android will merge them to normal contacts based on primary userid.
* Merge branch 'master' into automatic-contact-discoverymar-v-in2014-06-0493-649/+1315
|\ | | | | | | | | Conflicts: OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/KeychainIntentService.java
| * 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
| | |\
| | * | 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
| * | | 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
| * | | | wrapped-key-ring: more refactoring - no more pgp imports in ↵Vincent Breitmoser2014-05-031-0/+1
| | | | | | | | | | | | | | | | | | | | KeychainIntentService!
* | | | | First version of automatic contact discovery.mar-v-in2014-06-044-0/+21
| |_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | TODO: - Configuration (much of it) - Enabled by default? - Which keys to import? Current state: All non-revoked and non-expired with matching userid - Search for keys if already known? Current state: yes, may cause traffic (configuration: only when wifi?) - Update interval: Currently Android handles it, might be good (causes automatic refresh on new contact and stuff like that) or bad (too many of refreshes)
* | | | Add Log.d for QueryFailedExceptionTim Bray2014-05-231-3/+3
| |_|/ |/| |
* | | Layout fixes for key importDominik Schürmann2014-05-199-66/+58
| | |
* | | Clarify help startDominik Schürmann2014-05-141-1/+1
| |/ |/|
* | 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
| | |
| * | ui: purplize searchtext in keylistVincent Breitmoser2014-05-071-0/+7
| | |
| * | display AppMsg warning when no encryption subkey is availableVincent Breitmoser2014-05-071-0/+1
| | |
| * | ui: slight edit icon cosmetics in keylistVincent Breitmoser2014-05-072-6/+9
| | |
| * | ui: move revocation/expiry notes above tab sliderVincent Breitmoser2014-05-072-22/+29
| | |
| * | ui: purpelize fastscroll thumbVincent Breitmoser2014-05-0715-142/+23
| | |
* | | Clarify languageDominik Schürmann2014-05-072-6/+6
|/ /
* | Clarify languageDominik Schürmann2014-05-0613-30/+30
| |
* | Some small style fixesDominik Schürmann2014-05-068-33/+46
| |
* | edit button with imageDominik Schürmann2014-05-061-2/+3
| |
* | Always use section style instead of custom classDominik Schürmann2014-05-064-12/+8
| |
* | ui: apply purple theme (twi is best color)Vincent Breitmoser2014-05-06229-26/+570
| |
* | ui: use textview buttons in decrypt verify dialogueVincent Breitmoser2014-05-063-47/+69
| |
* | ui: use textviews instead of bootstrap buttons in SignEncryptVincent Breitmoser2014-05-063-35/+42
| |
* | ui: make primary star icon slightly largerVincent Breitmoser2014-05-068-0/+0
| |
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-29 11:57:03 +0000