Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | work on cookie scanning during creation | Vincent Breitmoser | 2015-03-24 | 6 | -13/+25 |
| | |||||
* | Merge branch 'development' into linked-identities | Vincent Breitmoser | 2015-03-24 | 50 | -786/+827 |
|\ | | | | | | | | | 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 |
| | | |||||
| * | Added docs for Notify class | Manoj Khanna | 2015-03-20 | 1 | -0/+10 |
| | | |||||
| * | Fixed Snackbar behind keyboard on ImportKeysActivity | Manoj Khanna | 2015-03-20 | 1 | -4/+9 |
| | | |||||
| * | Reworked Notify class | Manoj Khanna | 2015-03-20 | 17 | -173/+130 |
| | | |||||
| * | 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 | ||||
| * | | Implemented #1162: Invoke NFC in Advanced View | Kent | 2015-03-20 | 2 | -154/+36 |
| |/ | | | | | | | | | | | | | - 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 | 2 | -45/+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 | 1 | -40/+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 | 11 | -263/+323 |
| |/ | |||||
| * | New Passphrase class for safer passphrase handling in memory | Dominik Schürmann | 2015-03-19 | 17 | -65/+81 |
| | | |||||
| * | File extensions into Constants | Dominik Schürmann | 2015-03-17 | 4 | -13/+15 |
| | | |||||
| * | Allow for hidden recipients in encrypt methods | Dominik Schürmann | 2015-03-16 | 3 | -8/+36 |
| | | |||||
| * | Allow encrypt of filenames via overflow menu | Dominik Schürmann | 2015-03-16 | 4 | -6/+27 |
| | | |||||
| * | object oriented split user id | Dominik Schürmann | 2015-03-16 | 20 | -88/+84 |
| | | |||||
| * | Fix nullpointer when scanning malformed qr codes | Dominik Schürmann | 2015-03-16 | 1 | -1/+1 |
| | | |||||
| * | Clarify MIME usage | Dominik Schürmann | 2015-03-15 | 2 | -2/+2 |
| | | |||||
* | | support github resource (re) | Vincent Breitmoser | 2015-03-24 | 3 | -0/+252 |
| | | |||||
* | | work on certification ui | Vincent Breitmoser | 2015-03-15 | 2 | -12/+20 |
| | | |||||
* | | Merge branch 'development' into linked-identities | Vincent Breitmoser | 2015-03-15 | 29 | -143/+316 |
|\| | | | | | | | | | | | Conflicts: OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ViewKeyActivity.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ViewKeyFragment.java | ||||
| * | Remove display of key id in other lists | Dominik Schürmann | 2015-03-15 | 3 | -18/+65 |
| | | |||||
| * | Show main user id instead of key in certify screen | Dominik Schürmann | 2015-03-15 | 1 | -10/+15 |
| | | |||||
| * | Fixes for selection of certify key | Dominik Schürmann | 2015-03-15 | 2 | -10/+21 |
| | | |||||
| * | Merge pull request #1142 from tdjogi010/development | Dominik Schürmann | 2015-03-15 | 1 | -4/+10 |
| |\ | | | | | | | Preselected Suitable Key | ||||
| | * | Preselected Suitable Key | tdjogi010@gmail.com | 2015-03-13 | 1 | -4/+10 |
| | | | |||||
| * | | Merge pull request #1147 from Hiperzone/development | Dominik Schürmann | 2015-03-15 | 1 | -1/+3 |
| |\ \ | | | | | | | | | -fixed out of bounds crash when retrieving the main profile name with se... | ||||
| | * | | -fixed out of bounds crash when retrieving the main profile name with secret ↵ | Daniel Ramos | 2015-03-15 | 1 | -1/+3 |
| | | | | | | | | | | | | | | | | | | | | | | | | keys -fixed a possible crash when retrieving the main profile contactid | ||||
| * | | | Dont display key ids in KeySpinner, display creation date when user ids ↵ | Dominik Schürmann | 2015-03-15 | 3 | -14/+37 |
| | | | | | | | | | | | | | | | | duplicate | ||||
| * | | | Query for duplicate user ids | Dominik Schürmann | 2015-03-15 | 1 | -1/+4 |
| |/ / | |||||
| * | | added some documentation | Adithya Abraham Philip | 2015-03-13 | 1 | -4/+5 |
| | | | |||||
| * | | added own profile support in linekd system contact | Adithya Abraham Philip | 2015-03-13 | 1 | -7/+25 |
| | | | |||||
| * | | Clarify logs in DeleteFileDialog | Dominik Schürmann | 2015-03-12 | 1 | -2/+2 |
| | | | |||||
| * | | Use notify instead of Toast for NFC check | Dominik Schürmann | 2015-03-12 | 1 | -2/+2 |
| | | | |||||
| * | | Merge pull request #1133 from Rrego6/development | Dominik Schürmann | 2015-03-12 | 1 | -0/+6 |
| |\ \ | | | | | | | | | Check if NFC is available on device | ||||
| | * | | Check if NFC is available on device | Raoul | 2015-03-10 | 1 | -0/+6 |
| | | | | |||||
| * | | | Merge pull request #1117 from danielnelz/development | Dominik Schürmann | 2015-03-12 | 15 | -24/+27 |
| |\ \ \ | | | | | | | | | | | #1042: Replaced ints with enums | ||||
| | * | | | Merge remote-tracking branch 'upstream/development' into development | danielnelz | 2015-03-09 | 4 | -29/+32 |
| | |\| | | |||||
| | * | | | Created enum MessageStatus in KeychainIntentServiceHandler and enum IOType | danielnelz | 2015-03-09 | 15 | -24/+27 |
| | | | | | | | | | | | | | | | | | | | | | | | | | in KeychainIntentService and replaced int constants with them. Fixed some typos. | ||||
| * | | | | Improve file deletion strings | Dominik Schürmann | 2015-03-12 | 1 | -3/+3 |
| | | | | | |||||
| * | | | | Merge pull request #1137 from manojkhannakm/development | Dominik Schürmann | 2015-03-12 | 3 | -46/+104 |
| |\ \ \ \ | | | | | | | | | | | | | Updated fix for Issue #1116 | ||||
| | * | | | | Updated fix for Issue #1116 | Manoj Khanna | 2015-03-11 | 3 | -46/+104 |
| | | |_|/ | | |/| | | |||||
| * / | | | corrected linked system contact display name | Adithya Abraham Philip | 2015-03-11 | 1 | -11/+12 |
| |/ / / | |||||
* | | | | show certificates for secret keys differently | Vincent Breitmoser | 2015-03-14 | 4 | -28/+46 |
| | | | | |||||
* | | | | work on second step of identity creation | Vincent Breitmoser | 2015-03-13 | 3 | -23/+25 |
| | | | | |||||
* | | | | don't filter tweet intent | Vincent Breitmoser | 2015-03-13 | 1 | -31/+6 |
| | | | | |||||
* | | | | improve error handling in LinkedIdViewFragment, disable unknown identity ↵ | Vincent Breitmoser | 2015-03-13 | 2 | -8/+27 |
| | | | | | | | | | | | | | | | | types (for now?) |