aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* wrapped-key-ring: split up CachedKeyRing and WrappedKeyRingVincent Breitmoser2014-05-2123-211/+370
|
* Merge remote-tracking branch 'origin/master' into wrapped-key-ringVincent Breitmoser2014-05-14505-5887/+4675
|\ | | | | | | | | | | | | | | | | 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
| * Update html-textviewDominik Schürmann2014-05-141-0/+0
| |
| * Merge branch 'master' of github.com:open-keychain/open-keychainDominik Schürmann2014-05-132-5/+6
| |\
| | * Merge pull request #623 from danielhass/appmsgDominik Schürmann2014-05-122-5/+6
| | |\ | | | | | | | | Further Toast replacements
| | | * Removed unused Toast importDaniel Haß2014-05-111-1/+0
| | | |
| | | * Toast replacementDaniel Haß2014-05-111-2/+4
| | | |
| | | * Fixed wrong AppMsg-StyleDaniel Haß2014-05-111-2/+2
| | |/
| * / Add pgpauth app to help, update html-textviewDominik Schürmann2014-05-134-27/+4
| |/
| * Add Tim Bray to aboutDominik Schürmann2014-05-091-0/+1
| |
| * Version 2.7Dominik Schürmann2014-05-081-2/+2
| |
| * Translations from transifexDominik Schürmann2014-05-0819-3/+141
| |
| * Changelog 2.7Dominik Schürmann2014-05-082-0/+16
| |
| * Merge branch 'master' of github.com:open-keychain/open-keychainDominik Schürmann2014-05-0812-28/+63
| |\
| | * ui: purplize dialog headers (huge hack inside)Vincent Breitmoser2014-05-0812-28/+63
| | |
| * | Translations from transifexDominik Schürmann2014-05-084-8/+12
| |/
| * proper null checks and closing of cursors everywhereVincent Breitmoser2014-05-086-148/+189
| |
| * use longsparsearrays instead of hashmaps in that one placeVincent Breitmoser2014-05-081-16/+19
| |
| * Merge branch 'master' of github.com:open-keychain/open-keychainDominik Schürmann2014-05-083-5/+1
| |\
| | * use setEncryptToSigner for asymmetric encryptionVincent Breitmoser2014-05-083-5/+1
| | | | | | | | | | | | (tested and works, closes #569)
| * | Use flat buttons where appropriateDominik Schürmann2014-05-0815-40/+77
| |/
| * Merge pull request #619 from Valodim/loader-fragmentDominik Schürmann2014-05-0811-197/+216
| |\ | | | | | | Introduce LoaderFragment
| | * use LoaderFragment in ViewKey tabsVincent Breitmoser2014-05-087-53/+35
| | | | | | | | | | | | Closes #616
| | * extract generic LoaderFragment superclass from KeyListVincent Breitmoser2014-05-084-144/+181
| |/
| * Update from transifexDominik Schürmann2014-05-0827-14/+202
| |
| * Don't allow certification using keys where primary subkey is strippedVincent Breitmoser2014-05-071-4/+7
| | | | | | | | Closes #596
| * Add applications section to helpDominik Schürmann2014-05-0710-25/+11
| |
| * Update submodulesDominik Schürmann2014-05-072-0/+0
| |
| * Move API libs and API example into their own git reposDominik Schürmann2014-05-0762-3892/+12
| |
| * Remove code for sharing whole key via qr codeDominik Schürmann2014-05-072-129/+16
| |
| * Start app menu item for registered appsDominik Schürmann2014-05-077-4/+31
| |
| * GET_KEY: also return PendingIntent to key viewDominik Schürmann2014-05-072-2/+11
| |
| * Better handling of actionbars backDominik Schürmann2014-05-078-51/+65
| |
| * Design fixes for certification activityDominik Schürmann2014-05-074-55/+71
| |
| * 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-0727-223/+180
| |\
| | * ui: apply theme to tab buttonsVincent Breitmoser2014-05-071-0/+2
| | |
| | * ui: use SlidingTabLayout in help activityVincent Breitmoser2014-05-072-20/+35
| | |
| | * ui: primary certification icon was a pixel or two offVincent Breitmoser2014-05-071-2/+3
| | |
| | * small fix for 6aafb3, forgot to commit this lineVincent Breitmoser2014-05-071-0/+1
| | |
| | * ui: purplize searchtext in keylistVincent Breitmoser2014-05-072-0/+10
| | |
| | * display AppMsg warning when no encryption subkey is availableVincent Breitmoser2014-05-072-0/+13
| | |
| | * ui: slight edit icon cosmetics in keylistVincent Breitmoser2014-05-073-6/+13
| | |
| | * ui: move revocation/expiry notes above tab sliderVincent Breitmoser2014-05-074-54/+61
| | |
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-30 13:27:15 +0000