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 | 119 | -1201/+1770 |
|\ | | | | | | | | | Conflicts: OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ViewKeyActivity.java | ||||
| * | use top line in snackbar for status indication | Vincent Breitmoser | 2015-03-22 | 1 | -14/+23 |
| | | |||||
| * | Merge branch 'development' of https://github.com/manojkhannakm/open-keychain ↵ | Dominik Schürmann | 2015-03-21 | 25 | -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 | 24 | -197/+153 |
| | | | |||||
| * | | Add TODO to remote API | Dominik Schürmann | 2015-03-21 | 1 | -0/+2 |
| |/ | |||||
| * | 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 | ||||
| * | | Fix API RESULT_TYPE | Dominik Schürmann | 2015-03-20 | 2 | -3/+6 |
| | | | |||||
| * | | Fix PASSPHRASE handling in API | Dominik Schürmann | 2015-03-20 | 1 | -2/+18 |
| | | | |||||
| * | | 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 | ||||
| | * | 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 tests for Passphrase class | Dominik Schürmann | 2015-03-19 | 1 | -0/+4 |
| | | |||||
| * | Merge branch 'development' of github.com:open-keychain/open-keychain into ↵ | Dominik Schürmann | 2015-03-19 | 2 | -17/+27 |
| |\ | | | | | | | | | | development | ||||
| | * | 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 |
| | | | |||||
| | * | 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 | ||||
| | * | 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 | 12 | -33/+133 |
| | | |||||
| * | Allow encrypt of filenames via overflow menu | Dominik Schürmann | 2015-03-16 | 7 | -11/+44 |
| | | |||||
| * | Clarify certification help screen | Dominik Schürmann | 2015-03-16 | 1 | -2/+2 |
| | | |||||
| * | object oriented split user id | Dominik Schürmann | 2015-03-16 | 25 | -148/+139 |
| | | |||||
| * | Fix nullpointer when scanning malformed qr codes | Dominik Schürmann | 2015-03-16 | 1 | -1/+1 |
| | | |||||
| * | Allow selection of none in SelectSignKeyIdActivity | Dominik Schürmann | 2015-03-15 | 2 | -2/+37 |
| | | |||||
| * | Clarify MIME usage | Dominik Schürmann | 2015-03-15 | 3 | -2/+7 |
| | | |||||
| * | Merge branch 'development' of github.com:open-keychain/open-keychain into ↵ | Dominik Schürmann | 2015-03-15 | 1 | -15/+16 |
| |\ | | | | | | | | | | development | ||||
| * | | Put API activites in normal process to allow hydrate/dehydrate of logs | Dominik Schürmann | 2015-03-15 | 1 | -4/+2 |
| | | | |||||
* | | | support github resource (ci) | Vincent Breitmoser | 2015-03-24 | 3 | -3/+70 |
| | | | |||||
* | | | support github resource (re) | Vincent Breitmoser | 2015-03-24 | 8 | -1/+594 |
| | | | |||||
* | | | support github resource (pa) | Vincent Breitmoser | 2015-03-24 | 6 | -46/+224 |
| | | | |||||
* | | | work on certification ui | Vincent Breitmoser | 2015-03-15 | 20 | -45/+117 |
| | | | |||||
* | | | Merge branch 'development' into linked-identities | Vincent Breitmoser | 2015-03-15 | 157 | -1974/+2855 |
|\ \ \ | | |/ | |/| | | | | | | | | | | Conflicts: OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ViewKeyActivity.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ViewKeyFragment.java | ||||
| * | | fix expiry of master keys | Vincent Breitmoser | 2015-03-15 | 1 | -15/+16 |
| |/ | | | | | | | fixes #1141 | ||||
| * | Prefer ZIP algorithm as discussed on OpenPGP WG mailinglist | Dominik Schürmann | 2015-03-15 | 1 | -1/+7 |
| | | |||||
| * | Remove display of key id in other lists | Dominik Schürmann | 2015-03-15 | 6 | -19/+70 |
| | | |||||
| * | Show main user id instead of key in certify screen | Dominik Schürmann | 2015-03-15 | 1 | -10/+15 |
| | |