| Commit message (Collapse) | Author | Age | Files | Lines | ||
|---|---|---|---|---|---|---|
| ... | ||||||
| * | Fix email pattern | Dominik Schürmann | 2015-05-04 | 1 | -1/+1 | |
| | | ||||||
| * | Use more simple email validation regex | Dominik Schürmann | 2015-05-04 | 1 | -7/+8 | |
| | | ||||||
| * | Merge branch 'development' of https://github.com/Hiperzone/open-keychain ↵ | Dominik Schürmann | 2015-05-04 | 3 | -51/+94 | |
| |\ | | | | | | | | | | | | | into Hiperzone-development Conflicts: OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/CreateKeyEmailFragment.java | |||||
| | * | -removed unneeded inputType attribute from xml files (+1 squashed commits) | Daniel Ramos | 2015-04-30 | 3 | -12/+10 | |
| | | | | | | | | | | | | | Squashed commits: [ef54e68] -code style fixing | |||||
| | * | -Removed unneeded view references from the fragment class since they are not ↵ | Daniel Ramos | 2015-04-26 | 1 | -7/+3 | |
| | | | | | | | | | | | | | used outside of createView. -cleanup | |||||
| | * | -removed unneeded code from previous commits. I tested on a KitKat(4.4.2) ↵ | Daniel Ramos | 2015-04-26 | 1 | -3/+0 | |
| | | | | | | | | | and Lollipop (5.1) phone and everything seems to be preserved as expected. | |||||
| | * | Merge branch 'development' of https://github.com/open-keychain/open-keychain ↵ | Daniel Ramos | 2015-04-26 | 41 | -450/+770 | |
| | |\ | | | | | | | | | | into development | |||||
| | * \ | Merge branch 'localdev' of https://github.com/Hiperzone/open-keychain into ↵ | Daniel Ramos | 2015-04-24 | 5 | -44/+92 | |
| | |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | development Conflicts: OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/base/BaseNfcActivity.java | |||||
| | | * | | -Fixed a crash while recreating CreateKeyEmailFragment | Daniel Ramos | 2015-04-24 | 1 | -16/+16 | |
| | | | | | | | | | | | | | | | | | | | | | -Email data is properly restored while rotating the Activity. -Added necessary logic to guarantee that an email is actually valid before continuing, there are verifications for empty, duplicated and invalid formatted emails for both additional and main email. | |||||
| | | * | | -Improved email sanity verifications when adding emails when creating a new Key | Daniel Ramos | 2015-04-14 | 6 | -30/+82 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | -fixed a few NFC crashes -fixed a few instances when showing the keyboard would crash the Activity -fixed a case where adding new emails would crash the app if the user went back and forth between the Add Email fragment and the Add Name fragment. | |||||
| * | | | | Fix dublicated code in CreateKeyEmailFragment | Dominik Schürmann | 2015-05-04 | 1 | -4/+0 | |
| | | | | | ||||||
| * | | | | Merge branch 'development' of https://github.com/manojkhannakm/open-keychain ↵ | Dominik Schürmann | 2015-05-04 | 3 | -2/+274 | |
| |\ \ \ \ | | | | | | | | | | | | | | | | into manojkhannakm-development | |||||
| | * | | | | Espresso test for CreateKeyActivity | Manoj Khanna | 2015-04-25 | 3 | -5/+274 | |
| | | | | | | ||||||
| * | | | | | license header for PgpCertifyOperation | Dominik Schürmann | 2015-05-04 | 1 | -1/+19 | |
| | | | | | | ||||||
| * | | | | | Apply patch from ↵ | Dominik Schürmann | 2015-05-04 | 1 | -2/+9 | |
| | | | | | | | | | | | | | | | | | | | | | https://github.com/open-keychain/open-keychain/issues/1222#issuecomment-98582938 | |||||
| * | | | | | Apply patch from https://github.com/open-keychain/open-keychain/issues/1240 ↵ | Dominik Schürmann | 2015-05-04 | 1 | -8/+22 | |
| | | | | | | | | | | | | | | | | | | | | | with db upgrade | |||||
| * | | | | | Fix yubikey strings | Dominik Schürmann | 2015-05-01 | 2 | -7/+7 | |
| | | | | | | ||||||
| * | | | | | More nullpointer fixes | Dominik Schürmann | 2015-05-01 | 1 | -1/+1 | |
| | | | | | | ||||||
| * | | | | | Fix nullpointer in EncryptKeyCompletionView | Dominik Schürmann | 2015-05-01 | 1 | -2/+2 | |
| | | | | | | ||||||
| * | | | | | Remove time from key creation display | Dominik Schürmann | 2015-04-30 | 1 | -1/+0 | |
| | | | | | | ||||||
| * | | | | | Fix key creation string and display | Dominik Schürmann | 2015-04-30 | 4 | -27/+13 | |
| | | | | | | ||||||
| * | | | | | API: Allow selection of decryption keys when decryption fails | Dominik Schürmann | 2015-04-30 | 6 | -6/+188 | |
| | | | | | | ||||||
| * | | | | | fix crash when moving focus from EncryptKeyCompletionView with unknown text | Vincent Breitmoser | 2015-04-28 | 1 | -1/+1 | |
| | | | | | | ||||||
| * | | | | | display unknown keys red rather than orange | Vincent Breitmoser | 2015-04-28 | 1 | -1/+1 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | For an unknown key, there is no indication of the state the key is in. To indicate both immediate action required, and to make this status equal to its worst case (rather than *better* than its worst case), the status is displayed in red. At some point, we will probably want to download unknown keys automatically, at which point an unknown key will actually be an error state. This is an intermediate solution until then. | |||||
| * | | | | | fix "select all" in key list multi-select | Vincent Breitmoser | 2015-04-28 | 1 | -1/+1 | |
| | | | | | | ||||||
| * | | | | | prevent crashes in EncryptKeyCompletionView | Vincent Breitmoser | 2015-04-27 | 1 | -2/+10 | |
| | | | | | | ||||||
| * | | | | | display creation dates for ambiguous user ids | Vincent Breitmoser | 2015-04-27 | 4 | -17/+44 | |
| | | | | | | ||||||
| * | | | | | add distinct status for messages signed by "your" key | Vincent Breitmoser | 2015-04-27 | 2 | -0/+14 | |
| | | | | | | ||||||
| * | | | | | profiling says: caching qrCode bitmaps is a good idea | Vincent Breitmoser | 2015-04-27 | 2 | -19/+43 | |
| | |_|_|/ |/| | | | ||||||
| * | | | | UI fixes for Android < 5 | Dominik Schürmann | 2015-04-26 | 5 | -22/+19 | |
| | | | | | ||||||
| * | | | | Remove unused decrypt result layout | Dominik Schürmann | 2015-04-26 | 3 | -140/+0 | |
| | | | | | ||||||
| * | | | | Put decrypt result in toolbar, some ui fixes for decrypt | Dominik Schürmann | 2015-04-26 | 16 | -16/+162 | |
| | | | | | ||||||
| * | | | | Switch to new support lib version 22.1 | Dominik Schürmann | 2015-04-25 | 12 | -43/+21 | |
| |/ / / | ||||||
| * | | | Update in-app contributor list | Dominik Schürmann | 2015-04-25 | 1 | -3/+22 | |
| | | | | ||||||
| * | | | Set different titles when changing in nav drawer | Dominik Schürmann | 2015-04-25 | 1 | -6/+10 | |
| | | | | ||||||
| * | | | Fix empty screen when clicking on encrypt in details view | Dominik Schürmann | 2015-04-25 | 1 | -5/+2 | |
| | | | | ||||||
| * | | | Update lib section in about | Dominik Schürmann | 2015-04-25 | 1 | -2/+2 | |
| | | | | ||||||
| * | | | Remove old navigation drawer dependency | Dominik Schürmann | 2015-04-25 | 2 | -9/+1 | |
| | | | | ||||||
| * | | | Merge pull request #1220 from vectorijk/SwitchToMaterialDrawer | Dominik Schürmann | 2015-04-25 | 3 | -20/+182 | |
| |\ \ \ | | | | | | | | | Switch to MaterialDrawer library | |||||
| | * | | | Fix #1197 Switch to MaterialDrawer library | vectorijk | 2015-04-24 | 2 | -46/+89 | |
| | | | | | ||||||
| | * | | | Introduce and Switch to mikepenz/MaterialDrawer | vectorijk | 2015-04-24 | 3 | -25/+144 | |
| | |/ / | ||||||
| * | | | fix encrypt activity layout | Vincent Breitmoser | 2015-04-24 | 2 | -3/+4 | |
| | | | | ||||||
| * | | | revamp decrypt ui | Vincent Breitmoser | 2015-04-24 | 7 | -230/+391 | |
| |/ / | ||||||
| * | | Merge branch 'development' of github.com:open-keychain/open-keychain into ↵ | Dominik Schürmann | 2015-04-22 | 8 | -30/+449 | |
| |\ \ | | | | | | | | | | development | |||||
| | * | | Fixed Snackbar behind layout | Manoj Khanna | 2015-04-22 | 5 | -29/+29 | |
| | | | | | | | | | | | | | Surrounded string with quotes | |||||
| | * | | keyserver verification on addition | Adithya Abraham Philip | 2015-04-22 | 4 | -1/+420 | |
| | | | | ||||||
| * | | | Update changelog | Dominik Schürmann | 2015-04-22 | 1 | -6/+8 | |
| |/ / | ||||||
| * | | corrected possible null pointer | Adithya Abraham Philip | 2015-04-22 | 1 | -1/+1 | |
| | | | ||||||
| * | | Simplify ImportKeysProxyActivity | Dominik Schürmann | 2015-04-21 | 1 | -29/+12 | |
| | | | ||||||
| * | | Merge branch 'development' of github.com:open-keychain/open-keychain into ↵ | Dominik Schürmann | 2015-04-21 | 10 | -52/+212 | |
| |\ \ | | | | | | | | | | development | |||||
 |
index : connectbot-yubikey/open-keychain | |
| open-keychain with patches to support ssh authentication | James |
| aboutsummaryrefslogtreecommitdiffstats |