aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* -removed unneeded inputType attribute from xml files (+1 squashed commits)Daniel Ramos2015-04-303-12/+10
| | | | | | Squashed commits: [ef54e68] -code style fixing
* -Removed unneeded view references from the fragment class since they are not ↵Daniel Ramos2015-04-261-7/+3
| | | | | | used outside of createView. -cleanup
* -removed unneeded code from previous commits. I tested on a KitKat(4.4.2) ↵Daniel Ramos2015-04-261-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 Ramos2015-04-2643-462/+791
|\ | | | | | | into development
| * Merge pull request #1225 from vectorijk/SwitchToMaterialDrawerDominik Schürmann2015-04-261-2/+2
| |\ | | | | | | update lib MaterialDrawer to latest(2.8.2)
| | * update lib MaterialDrawer to latest(2.8.2)vectorijk2015-04-251-2/+2
| | |
| * | UI fixes for Android < 5Dominik Schürmann2015-04-266-27/+24
| | |
| * | Remove unused decrypt result layoutDominik Schürmann2015-04-263-140/+0
| | |
| * | Put decrypt result in toolbar, some ui fixes for decryptDominik Schürmann2015-04-2617-16/+164
| |/
| * Switch to new support lib version 22.1Dominik Schürmann2015-04-2513-52/+30
| |
| * Update in-app contributor listDominik Schürmann2015-04-251-3/+22
| |
| * Set different titles when changing in nav drawerDominik Schürmann2015-04-251-6/+10
| |
| * Fix empty screen when clicking on encrypt in details viewDominik Schürmann2015-04-251-5/+2
| |
| * Update lib section in aboutDominik Schürmann2015-04-251-2/+2
| |
| * Remove old navigation drawer dependencyDominik Schürmann2015-04-253-12/+1
| |
| * Merge pull request #1220 from vectorijk/SwitchToMaterialDrawerDominik Schürmann2015-04-254-20/+192
| |\ | | | | | | Switch to MaterialDrawer library
| | * Fix #1197 Switch to MaterialDrawer libraryvectorijk2015-04-242-46/+89
| | |
| | * Introduce and Switch to mikepenz/MaterialDrawervectorijk2015-04-244-25/+154
| | |
| * | fix encrypt activity layoutVincent Breitmoser2015-04-242-3/+4
| | |
| * | revamp decrypt uiVincent Breitmoser2015-04-247-230/+391
| |/
* | Merge branch 'localdev' of https://github.com/Hiperzone/open-keychain into ↵Daniel Ramos2015-04-245-44/+92
|\ \ | |/ |/| | | | | | | | | development Conflicts: OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/base/BaseNfcActivity.java
| * Merge branch 'feature/emailImprovements' into localdevDaniel Ramos2015-04-246-45/+97
| |\
| | * -Fixed a crash while recreating CreateKeyEmailFragmentDaniel Ramos2015-04-241-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 KeyDaniel Ramos2015-04-146-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.
* | Merge branch 'development' of github.com:open-keychain/open-keychain into ↵Dominik Schürmann2015-04-228-30/+449
|\ \ | | | | | | | | | development
| * \ Merge pull request #1218 from manojkhannakm/developmentDominik Schürmann2015-04-225-29/+29
| |\ \ | | | | | | | | Fixed Snackbar behind layout
| | * | Fixed Snackbar behind layoutManoj Khanna2015-04-225-29/+29
| |/ / | | | | | | | | | Surrounded string with quotes
| * | Merge pull request #1214 from adithyaphilip/keyserver-verificationDominik Schürmann2015-04-224-1/+420
| |\ \ | | | | | | | | Verifying Newly Added Keyservers
| | * | keyserver verification on additionAdithya Abraham Philip2015-04-224-1/+420
| |/ /
* / / Update changelogDominik Schürmann2015-04-221-6/+8
|/ /
* | Merge pull request #1212 from adithyaphilip/qr-resultDominik Schürmann2015-04-221-1/+1
|\ \ | | | | | | Corrected possible null pointer with key import
| * | corrected possible null pointerAdithya Abraham Philip2015-04-221-1/+1
|/ /
* | Simplify ImportKeysProxyActivityDominik Schürmann2015-04-211-29/+12
| |
* | Merge branch 'development' of github.com:open-keychain/open-keychain into ↵Dominik Schürmann2015-04-2110-52/+212
|\ \ | | | | | | | | | development
| * \ Merge pull request #1209 from adithyaphilip/qr-resultDominik Schürmann2015-04-211-12/+11
| |\ \ | | | | | | | | Make Logs not Toasts - Fixes Issue #1198
| | * | added log to QR code scan/import failAdithya Abraham Philip2015-04-211-12/+11
| |/ /
| * | Merge pull request #1210 from josecastillo/developmentVincent2015-04-211-3/+34
| |\ \ | | | | | | | | Maintain client-side state for PIN verification operations
| | * | Fix for initialization failure when card returns FCI in data field.Joey Castillo2015-04-201-1/+1
| | | |
| | * | Track state of PIN verification on smart card; only verify when needed.Joey Castillo2015-04-201-2/+33
| |/ /
| * | Merge pull request #1207 from adithyaphilip/register-keyserver-urlsDominik Schürmann2015-04-208-37/+167
| |\ \ | | | | | | | | support for handling keyserver urls from browser, added documentation
| | * | support for handling keyserver urls from browser, added documentationAdithya Abraham Philip2015-04-208-37/+167
| |/ /
* / / Cleanup in HkpKeyserverDominik Schürmann2015-04-201-4/+3
|/ /
* | Format KeyListFragmentDominik Schürmann2015-04-181-10/+9
| |
* | Temporarily fix devices without nfcDominik Schürmann2015-04-181-0/+6
| |
* | Graphic stuffDominik Schürmann2015-04-173-213/+134
| |
* | Use https for zxing libDominik Schürmann2015-04-171-1/+1
| |
* | Use portrait mode for qr code scanningDominik Schürmann2015-04-151-10/+8
| |
* | More cleanupDominik Schürmann2015-04-159-324/+28
| |
* | Fix YubiKey naming, cleanupDominik Schürmann2015-04-1511-67/+59
| |
* | Clean up NfcOperationActivityDominik Schürmann2015-04-151-8/+6
| |
generated by cgit v1.2.3 (git 2.25.1) at 2024-07-05 14:18:52 +0000