aboutsummaryrefslogtreecommitdiffstats
path: root/OpenKeychain/src/main/java
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'master' into improve-file-moremar-v-in2014-07-0144-504/+1494
|\ | | | | | | | | | | | | | | Conflicts: OpenKeychain/src/main/java/org/sufficientlysecure/keychain/KeychainApplication.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/DecryptFileFragment.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/EncryptFileFragment.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/dialog/FileDialogFragment.java
| * Merge branch 'master' of github.com:open-keychain/open-keychainDominik Schürmann2014-06-3015-68/+52
| |\
| | * Fixed Bootstrap resourceDaniel Albert2014-06-301-1/+1
| | |
| | * Fixed, issue #702Daniel Albert2014-06-301-1/+1
| | |
| | * Merge branch 'master' of https://github.com/open-keychain/open-keychainDaniel Albert2014-06-3021-299/+1109
| | |\
| | * | Converted all other buttonsDaniel Albert2014-06-305-30/+20
| | | |
| | * | Ported even more buttons to use new design (Key and User editor)Daniel Albert2014-06-294-13/+12
| | | | | | | | | | | | | | | | Added drawables for them
| | * | Converted AsymetricKeyFragment to new button styleDaniel Albert2014-06-291-4/+3
| | | |
| | * | Added new button style and converted account_settings and the ↵Daniel Albert2014-06-292-9/+6
| | | | | | | | | | | | | | | | select_secret_key_layout to use it
| | * | Updated file_dialog to use the new buttonsDaniel Albert2014-06-292-7/+6
| | | |
| | * | Added button_rounded styleDaniel Albert2014-06-281-3/+3
| | | | | | | | | | | | | | | | converted decrypt_file_fragment to new style
| * | | work on edit keyDominik Schürmann2014-06-304-34/+82
| | |/ | |/|
| * | pass import results through to viewkeyactivity on updateVincent Breitmoser2014-06-284-83/+119
| | |
| * | fix nullpointerexception in importkeyactivityVincent Breitmoser2014-06-283-3/+20
| | |
| * | code cleanup and plurals in import log entriesVincent Breitmoser2014-06-288-144/+117
| | | | | | | | | | | | closes #698
| * | Merge remote-tracking branch 'upstream/master'Daniel Albert2014-06-2811-71/+855
| |\ \ | | |/ | |/|
| | * Magic to find possible mails and names of device ownerDominik Schürmann2014-06-283-4/+145
| | |
| | * More wizardryDominik Schürmann2014-06-273-89/+159
| | |
| | * Merge branch 'master' of github.com:open-keychain/open-keychainDominik Schürmann2014-06-276-91/+217
| | |\
| | * | Start work on a first-time wizardDominik Schürmann2014-06-272-4/+399
| | | |
| | * | new edit key: first version to add user idsDominik Schürmann2014-06-245-58/+236
| | | |
| * | | Added unlock icon, fixed drawer items, switched to icons from resource in drawerDaniel Albert2014-06-271-11/+15
| | |/ | |/|
| * | Merge pull request #690 from mar-v-in/hkps-by-defaultDominik Schürmann2014-06-255-90/+212
| |\ \ | | | | | | | | HKPS by default
| | * | Move sks-keyservers.net CA into assets foldermar-v-in2014-06-254-41/+53
| | | |
| | * | Merge branch 'master' into hkps-by-defaultmar-v-in2014-06-2411-54/+475
| | |\ \
| | * | | Fix sks-keyservers.net sub poolmar-v-in2014-06-241-1/+1
| | | | |
| | * | | Update Keyservers to use hkps as neededmar-v-in2014-06-243-2/+25
| | | | |
| | * | | Use URLEncoder instead of Uri.encodemar-v-in2014-06-241-2/+6
| | | | |
| | * | | Rewrote hkp add to work with hkps as well.mar-v-in2014-06-241-24/+13
| | | | | | | | | | | | | | | | | | | | Also removes HttpClient dependency (deprecated for android)
| | * | | Few fixes on hkpsmar-v-in2014-06-232-35/+34
| | | | | | | | | | | | | | | | | | | | TODO: Fix add as well
| | * | | Add hkps support for sks-keyservers.netmar-v-in2014-06-232-65/+77
| | | | |
| | * | | Add TlsHelper (designed to be used with sks-keyservers.net)mar-v-in2014-06-231-0/+83
| | | | | | | | | | | | | | | | | | | | We can't use the AndroidPinning library for this, because it requires the certificate to be signed using a system CA, sks-keyservers.net uses there own CA
| * | | | Merge pull request #688 from da-kid/masterDominik Schürmann2014-06-241-1/+5
| |\ \ \ \ | | |_|_|/ | |/| | | Fix for #687
| | * | | Fix for #687Daniel Albert2014-06-241-1/+5
| | | | |
| * | | | Merge submodulesDominik Schürmann2014-06-242-6/+25
| |\ \ \ \ | | |_|_|/ | |/| | |
| | * | | borrow tests from Haskell OpenPGPArt O Cathain2014-06-232-6/+25
| | | | |
* | | | | Merge branch 'master' into improve-file-moremar-v-in2014-06-2412-69/+493
|\| | | |
| * | | | Merge pull request #686 from mar-v-in/minidnsVincent2014-06-232-15/+18
| |\ \ \ \ | | |_|/ / | |/| | / | | | |/ | | |/| Use minidns instead of dnsjava
| | * | Switch to dnsjavamar-v-in2014-06-232-15/+18
| | | |
| * | | Merge branch 'master' of https://github.com/da-kid/open-keychainDaniel Albert2014-06-232-63/+110
| |\ \ \ | | | |/ | | |/|
| | * | Merge pull request #681 from timbray/masterDominik Schürmann2014-06-231-0/+3
| | |\ \ | | | | | | | | | | Handle empty keybase.io query, should fix #675
| | | * | Handle empty keybase.io query, should fix #675Tim Bray2014-06-221-0/+3
| | | | |
| | * | | new edit key: change passphraseDominik Schürmann2014-06-221-63/+107
| | |/ /
| * / / Fixed Issue #683 which caused OK to crash upon importing keys which contain ↵Daniel Albert2014-06-231-0/+6
| |/ / | | | | | | | | | percent signs.
| * | new edit key: diff for existing user idsDominik Schürmann2014-06-226-26/+384
| | |
| * | Merge branch 'master' of github.com:open-keychain/open-keychainDominik Schürmann2014-06-227-131/+93
| |\|
| * | Rename adapterDominik Schürmann2014-06-226-29/+39
| | |
* | | Merge branch 'master' of github.com:mar-v-in/open-keychain into ↵mar-v-in2014-06-2230-445/+795
|\ \ \ | | |/ | |/| | | | improve-file-more
| * | ditch outdated certifyKey operationVincent Breitmoser2014-06-221-54/+0
| | |
| * | use arraylists instead of arrays in savekeyringparcelVincent Breitmoser2014-06-221-14/+14
| | |
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-09 20:14:55 +0000