aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #704 from da-kid/masterDominik Schürmann2014-06-3059-160/+268
|\ | | | | Fixed #702 and also #597
| * Fixed Bootstrap resourceDaniel Albert2014-06-301-1/+1
| |
| * (should have) fixed Travis buildsDaniel Albert2014-06-302-7/+2
| |
| * Deprecated Android Bootstrap, thus fixing #597Daniel Albert2014-06-302-2/+0
| |
| * Fixed, issue #702Daniel Albert2014-06-301-1/+1
| |
| * Merge branch 'master' of https://github.com/open-keychain/open-keychainDaniel Albert2014-06-3036-314/+1466
| |\ | |/ |/|
* | pass import results through to viewkeyactivity on updateVincent Breitmoser2014-06-285-83/+125
| |
* | fix nullpointerexception in importkeyactivityVincent Breitmoser2014-06-283-3/+20
| |
* | travis: update sdkDominik Schürmann2014-06-281-2/+2
| |
* | Update keybase libDominik Schürmann2014-06-281-0/+0
| |
* | Try new travis hackDominik Schürmann2014-06-281-1/+2
| |
* | Fix supertoast submoduleDominik Schürmann2014-06-281-0/+0
| |
* | Update git submodules for android gradle plugin to 0.12.0Dominik Schürmann2014-06-283-0/+0
| |
* | Update android gradle plugin to 0.12.0Dominik Schürmann2014-06-281-1/+1
| |
* | code cleanup and plurals in import log entriesVincent Breitmoser2014-06-289-154/+140
| | | | | | | | closes #698
* | Update subnodule keybase to fixed version of support libsDominik Schürmann2014-06-281-0/+0
| |
* | Merge branch 'master' of github.com:open-keychain/open-keychainDominik Schürmann2014-06-2810-18/+20
|\ \
| * \ Merge pull request #699 from da-kid/masterDominik Schürmann2014-06-2810-18/+20
| |\ \ | | | | | | | | Partial fix for #597 (Navbar)
| | * \ Merge remote-tracking branch 'upstream/master'Daniel Albert2014-06-2819-71/+1177
| | |\ \ | | |/ / | |/| |
* / | | Change keybase submodule to our forkDominik Schürmann2014-06-281-1/+1
|/ / /
* | | Magic to find possible mails and names of device ownerDominik Schürmann2014-06-285-5/+147
| | |
* | | More wizardryDominik Schürmann2014-06-275-104/+202
| | |
* | | Merge branch 'master' of github.com:open-keychain/open-keychainDominik Schürmann2014-06-278-91/+257
|\ \ \
| * \ \ Merge pull request #692 from da-kid/masterDominik Schürmann2014-06-251-0/+8
| |\ \ \ | | | | | | | | | | Temporary fix for #648
* | | | | Start work on a first-time wizardDominik Schürmann2014-06-278-4/+622
| | | | |
* | | | | new edit key: first version to add user idsDominik Schürmann2014-06-247-58/+306
| | | | |
| | | | * Converted all other buttonsDaniel Albert2014-06-3023-60/+48
| | | | |
| | | | * Ported even more buttons to use new design (Key and User editor)Daniel Albert2014-06-2917-37/+102
| | | | | | | | | | | | | | | | | | | | Added drawables for them
| | | | * Converted AsymetricKeyFragment to new button styleDaniel Albert2014-06-292-9/+6
| | | | |
| | | | * Added new button style and converted account_settings and the ↵Daniel Albert2014-06-299-19/+51
| | | | | | | | | | | | | | | | | | | | select_secret_key_layout to use it
| | | | * Updated file_dialog to use the new buttonsDaniel Albert2014-06-293-13/+9
| | | | |
| | | | * Improved button styleDaniel Albert2014-06-293-21/+12
| | | | | | | | | | | | | | | | | | | | | | | | | centered buttons removed commented-out button
| | | | * Added button_rounded styleDaniel Albert2014-06-283-6/+52
| | | |/ | | | | | | | | | | | | converted decrypt_file_fragment to new style
| | | * Switched to the dark iconsDaniel Albert2014-06-284-0/+0
| | | |
| | | * Added unlock icon, fixed drawer items, switched to icons from resource in drawerDaniel Albert2014-06-276-14/+20
| | | |
| | | * Swapped out FontawesomeText with normal ImageViewDaniel Albert2014-06-261-10/+6
| | |/
| | * Temporary fix for #648Daniel Albert2014-06-251-0/+8
| |/
| * Merge pull request #690 from mar-v-in/hkps-by-defaultDominik Schürmann2014-06-256-90/+244
| |\ | | | | | | HKPS by default
| | * Move sks-keyservers.net CA into assets foldermar-v-in2014-06-255-41/+85
| | |
| | * Merge branch 'master' into hkps-by-defaultmar-v-in2014-06-2416-66/+564
| | |\
| | * | 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)
| | * | Merge branch 'hkps-by-default' of github.com:mar-v-in/open-keychain into ↵mar-v-in2014-06-230-0/+0
| | |\ \ | | | | | | | | | | | | | | | hkps-by-default
| | | * | 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
| | * | | 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
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-09 07:35:33 +0000