Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | work on cookie scanning during creation | Vincent Breitmoser | 2015-03-24 | 12 | -153/+157 |
| | |||||
* | Merge branch 'development' into linked-identities | Vincent Breitmoser | 2015-03-24 | 136 | -1273/+1900 |
|\ | | | | | | | | | Conflicts: OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ViewKeyActivity.java | ||||
| * | use top line in snackbar for status indication | Vincent Breitmoser | 2015-03-22 | 5 | -16/+29 |
| | | |||||
| * | Merge branch 'manojkhannakm-development' into development | Dominik Schürmann | 2015-03-21 | 26 | -203/+184 |
| |\ | |||||
| | * | Merge branch 'development' of https://github.com/manojkhannakm/open-keychain ↵ | Dominik Schürmann | 2015-03-21 | 26 | -203/+184 |
| |/| | | | | | | | | | | into manojkhannakm-development | ||||
| | * | Added docs for Notify class | Manoj Khanna | 2015-03-20 | 1 | -0/+10 |
| | | | |||||
| | * | Fixed Snackbar behind keyboard on ImportKeysActivity | Manoj Khanna | 2015-03-20 | 2 | -9/+24 |
| | | | |||||
| | * | Reworked Notify class | Manoj Khanna | 2015-03-20 | 25 | -197/+153 |
| | | | |||||
| * | | Add TODO to remote API | Dominik Schürmann | 2015-03-21 | 1 | -0/+2 |
| |/ | |||||
| * | Merge branch 'development' of github.com:open-keychain/open-keychain into ↵ | Dominik Schürmann | 2015-03-20 | 1 | -2/+17 |
| |\ | | | | | | | | | | development | ||||
| | * | Merge pull request #1163 from kentnek/dev-list-footer | Dominik Schürmann | 2015-03-20 | 1 | -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 ↵ | Kent | 2015-03-20 | 1 | -2/+17 |
| | | | | | | | | | | | | | | | | items' content | ||||
| * | | | Update api lib | Dominik Schürmann | 2015-03-20 | 1 | -0/+0 |
| |/ / | |||||
| * | | Update OpenPGP API lib | Dominik Schürmann | 2015-03-20 | 1 | -0/+0 |
| | | | |||||
| * | | Fix API RESULT_TYPE | Dominik Schürmann | 2015-03-20 | 2 | -3/+6 |
| | | | |||||
| * | | Fix PASSPHRASE handling in API | Dominik Schürmann | 2015-03-20 | 2 | -2/+18 |
| | | | |||||
| * | | Merge pull request #1164 from kentnek/dev-nfc-advanced-view | Dominik Schürmann | 2015-03-20 | 9 | -158/+275 |
| |\ \ | | |/ | |/| | Implemented #1071: Invoke NFC in Advanced View | ||||
| | * | Updated GNU header | Kent | 2015-03-20 | 1 | -1/+2 |
| | | | |||||
| | * | Removed create and added GPLv3 header | Kent | 2015-03-20 | 1 | -4/+17 |
| | | | |||||
| | * | Implemented #1162: Invoke NFC in Advanced View | Kent | 2015-03-20 | 9 | -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 icon | Dominik Schürmann | 2015-03-19 | 1 | -0/+2 |
| | | |||||
| * | Merge branch 'development' of github.com:open-keychain/open-keychain into ↵ | Dominik Schürmann | 2015-03-19 | 3 | -60/+81 |
| |\ | | | | | | | | | | development | ||||
| | * | Merge pull request #1158 from manojkhannakm/development | Dominik Schürmann | 2015-03-19 | 3 | -60/+81 |
| | |\ | | | | | | | | | Fixed a crash on ViewKeyActivity and Issue #1114 | ||||
| | | * | Fix for Issue #1114 | Manoj Khanna | 2015-03-19 | 1 | -5/+30 |
| | | | | | | | | | | | | | | | | Displays the snackbar above the keyboard on all activities. | ||||
| | | * | Fixed a crash on ViewKeyActivity | Manoj Khanna | 2015-03-19 | 2 | -55/+51 |
| | |/ | | | | | | | | | | | | | This occurs when deleting a key with a stripped master key from the ViewKeyActivity. | ||||
| * / | Manage my keys wizard | Dominik Schürmann | 2015-03-19 | 35 | -430/+455 |
| |/ | |||||
| * | Improve Passphrase class with finalize() | Dominik Schürmann | 2015-03-19 | 1 | -6/+34 |
| | | |||||
| * | Fix header | Dominik Schürmann | 2015-03-19 | 1 | -1/+2 |
| | | |||||
| * | Fix tests for Passphrase class | Dominik Schürmann | 2015-03-19 | 10 | -45/+71 |
| | | |||||
| * | Merge branch 'development' of github.com:open-keychain/open-keychain into ↵ | Dominik Schürmann | 2015-03-19 | 2 | -17/+27 |
| |\ | | | | | | | | | | development | ||||
| | * | Merge pull request #1160 from jellysheep/cloudsearch-show-main-email | Dominik Schürmann | 2015-03-18 | 1 | -1/+14 |
| | |\ | | | | | | | | | Show HKP server results first in key cloud search. Fixes #1066 | ||||
| | | * | Added comments for server result sorting in key search | Max Mertens | 2015-03-18 | 1 | -0/+6 |
| | | | | |||||
| | | * | Show HKP server results first in key cloud search. Fixes #1066 | Max Mertens | 2015-03-18 | 1 | -1/+8 |
| | |/ | |||||
| | * | Merge pull request #1155 from adithyaphilip/development | Dominik Schürmann | 2015-03-17 | 1 | -16/+13 |
| | |\ | | | | | | | | | Removed JellyBean restriction on Contact Sync | ||||
| | | * | contacts work on all supported api levels | Adithya Abraham Philip | 2015-03-17 | 1 | -16/+13 |
| | |/ | |||||
| * / | New Passphrase class for safer passphrase handling in memory | Dominik Schürmann | 2015-03-19 | 34 | -140/+307 |
| |/ | |||||
| * | Manifest cleanup | Dominik Schürmann | 2015-03-17 | 1 | -9/+12 |
| | | |||||
| * | Merge branch 'development' of github.com:open-keychain/open-keychain into ↵ | Dominik Schürmann | 2015-03-17 | 1 | -6/+2 |
| |\ | | | | | | | | | | development | ||||
| | * | Merge pull request #1154 from adithyaphilip/development | Dominik Schürmann | 2015-03-16 | 1 | -6/+2 |
| | |\ | | | | | | | | | Removed unnecessary @TargetApi annotation in ContactHelper | ||||
| | | * | removed unnecessary @TargetApi annotation | Adithya Abraham Philip | 2015-03-17 | 1 | -6/+2 |
| | |/ | |||||
| * / | File extensions into Constants | Dominik Schürmann | 2015-03-17 | 5 | -13/+19 |
| |/ | |||||
| * | Disable hidden recipients for now | Dominik Schürmann | 2015-03-16 | 2 | -10/+10 |
| | | |||||
| * | Allow for hidden recipients in encrypt methods | Dominik Schürmann | 2015-03-16 | 13 | -33/+133 |
| | | |||||
| * | Allow encrypt of filenames via overflow menu | Dominik Schürmann | 2015-03-16 | 7 | -11/+44 |
| | | |||||
| * | Remove old info from readme | Dominik Schürmann | 2015-03-16 | 1 | -2/+0 |
| | | |||||
| * | Remove old info from readme | Dominik Schürmann | 2015-03-16 | 1 | -28/+5 |
| | | |||||
| * | Clarify certification help screen | Dominik Schürmann | 2015-03-16 | 1 | -2/+2 |
| | | |||||
| * | Update api lib | Dominik Schürmann | 2015-03-16 | 1 | -0/+0 |
| | | |||||
| * | Update api lib | Dominik Schürmann | 2015-03-16 | 1 | -0/+0 |
| | | |||||
| * | object oriented split user id | Dominik Schürmann | 2015-03-16 | 1 | -0/+53 |
| | |