aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* more linked id ui fine tuningVincent Breitmoser2015-03-2621-958/+10
|
* some linked id ui fine tuningVincent Breitmoser2015-03-2644-154/+1116
|
* secret/public distinction in LinkedIdViewVincent Breitmoser2015-03-247-25/+27
|
* work on cookie scanning during creationVincent Breitmoser2015-03-2412-153/+157
|
* Merge branch 'development' into linked-identitiesVincent Breitmoser2015-03-24136-1273/+1900
|\ | | | | | | | | Conflicts: OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ViewKeyActivity.java
| * use top line in snackbar for status indicationVincent Breitmoser2015-03-225-16/+29
| |
| * Merge branch 'manojkhannakm-development' into developmentDominik Schürmann2015-03-2126-203/+184
| |\
| | * Merge branch 'development' of https://github.com/manojkhannakm/open-keychain ↵Dominik Schürmann2015-03-2126-203/+184
| |/| | | | | | | | | | into manojkhannakm-development
| | * Added docs for Notify classManoj Khanna2015-03-201-0/+10
| | |
| | * Fixed Snackbar behind keyboard on ImportKeysActivityManoj Khanna2015-03-202-9/+24
| | |
| | * Reworked Notify classManoj Khanna2015-03-2025-197/+153
| | |
| * | Add TODO to remote APIDominik Schürmann2015-03-211-0/+2
| |/
| * Merge branch 'development' of github.com:open-keychain/open-keychain into ↵Dominik Schürmann2015-03-201-2/+17
| |\ | | | | | | | | | development
| | * Merge pull request #1163 from kentnek/dev-list-footerDominik Schürmann2015-03-201-2/+17
| | |\ | | | | | | | | Added a blank footer view to the list of keys
| | | * - Added footer so that the Floating Action Button won't block the last few ↵Kent2015-03-201-2/+17
| | | | | | | | | | | | | | | | items' content
| * | | Update api libDominik Schürmann2015-03-201-0/+0
| |/ /
| * | Update OpenPGP API libDominik Schürmann2015-03-201-0/+0
| | |
| * | Fix API RESULT_TYPEDominik Schürmann2015-03-202-3/+6
| | |
| * | Fix PASSPHRASE handling in APIDominik Schürmann2015-03-202-2/+18
| | |
| * | Merge pull request #1164 from kentnek/dev-nfc-advanced-viewDominik Schürmann2015-03-209-158/+275
| |\ \ | | |/ | |/| Implemented #1071: Invoke NFC in Advanced View
| | * Updated GNU headerKent2015-03-201-1/+2
| | |
| | * Removed create and added GPLv3 headerKent2015-03-201-4/+17
| | |
| | * Implemented #1162: Invoke NFC in Advanced ViewKent2015-03-209-158/+261
| |/ | | | | | | | | | | | | - Extracted NFC code from ViewKeyActivity to NfcHelper to share code between classes - Changed the private anonymous Handler for NFC into a static private subclass, that uses WeakReference to avoid memory leaks - Added resources needed (retrieved from Graphics) for the NFC button inside ViewKeyAdvShareFragment. - Fixed the ripple boundary of the Share With... button to prevent it from bleeding to other buttons on the right (UX improvement)
| * Remove on click on iconDominik Schürmann2015-03-191-0/+2
| |
| * Merge branch 'development' of github.com:open-keychain/open-keychain into ↵Dominik Schürmann2015-03-193-60/+81
| |\ | | | | | | | | | development
| | * Merge pull request #1158 from manojkhannakm/developmentDominik Schürmann2015-03-193-60/+81
| | |\ | | | | | | | | Fixed a crash on ViewKeyActivity and Issue #1114
| | | * Fix for Issue #1114Manoj Khanna2015-03-191-5/+30
| | | | | | | | | | | | | | | | Displays the snackbar above the keyboard on all activities.
| | | * Fixed a crash on ViewKeyActivityManoj Khanna2015-03-192-55/+51
| | |/ | | | | | | | | | | | | This occurs when deleting a key with a stripped master key from the ViewKeyActivity.
| * / Manage my keys wizardDominik Schürmann2015-03-1935-430/+455
| |/
| * Improve Passphrase class with finalize()Dominik Schürmann2015-03-191-6/+34
| |
| * Fix headerDominik Schürmann2015-03-191-1/+2
| |
| * Fix tests for Passphrase classDominik Schürmann2015-03-1910-45/+71
| |
| * Merge branch 'development' of github.com:open-keychain/open-keychain into ↵Dominik Schürmann2015-03-192-17/+27
| |\ | | | | | | | | | development
| | * Merge pull request #1160 from jellysheep/cloudsearch-show-main-emailDominik Schürmann2015-03-181-1/+14
| | |\ | | | | | | | | Show HKP server results first in key cloud search. Fixes #1066
| | | * Added comments for server result sorting in key searchMax Mertens2015-03-181-0/+6
| | | |
| | | * Show HKP server results first in key cloud search. Fixes #1066Max Mertens2015-03-181-1/+8
| | |/
| | * Merge pull request #1155 from adithyaphilip/developmentDominik Schürmann2015-03-171-16/+13
| | |\ | | | | | | | | Removed JellyBean restriction on Contact Sync
| | | * contacts work on all supported api levelsAdithya Abraham Philip2015-03-171-16/+13
| | |/
| * / New Passphrase class for safer passphrase handling in memoryDominik Schürmann2015-03-1934-140/+307
| |/
| * Manifest cleanupDominik Schürmann2015-03-171-9/+12
| |
| * Merge branch 'development' of github.com:open-keychain/open-keychain into ↵Dominik Schürmann2015-03-171-6/+2
| |\ | | | | | | | | | development
| | * Merge pull request #1154 from adithyaphilip/developmentDominik Schürmann2015-03-161-6/+2
| | |\ | | | | | | | | Removed unnecessary @TargetApi annotation in ContactHelper
| | | * removed unnecessary @TargetApi annotationAdithya Abraham Philip2015-03-171-6/+2
| | |/
| * / File extensions into ConstantsDominik Schürmann2015-03-175-13/+19
| |/
| * Disable hidden recipients for nowDominik Schürmann2015-03-162-10/+10
| |
| * Allow for hidden recipients in encrypt methodsDominik Schürmann2015-03-1613-33/+133
| |
| * Allow encrypt of filenames via overflow menuDominik Schürmann2015-03-167-11/+44
| |
| * Remove old info from readmeDominik Schürmann2015-03-161-2/+0
| |
| * Remove old info from readmeDominik Schürmann2015-03-161-28/+5
| |
| * Clarify certification help screenDominik Schürmann2015-03-161-2/+2
| |