aboutsummaryrefslogtreecommitdiffstats
path: root/OpenKeychain
Commit message (Expand)AuthorAgeFilesLines
* Merge remote-tracking branch 'origin/master'Vincent Breitmoser2014-07-0216-461/+341
|\
| * edit key: work on savingDominik Schürmann2014-07-024-31/+24
| * Merge branch 'master' of github.com:open-keychain/open-keychainDominik Schürmann2014-07-023-2/+7
| |\
| * | Edit key: adding user idsDominik Schürmann2014-07-0214-236/+330
| * | edit key: part 3Dominik Schürmann2014-07-015-387/+180
* | | Merge branch 'create-keyring'Vincent Breitmoser2014-07-029-104/+342
|\ \ \ | |_|/ |/| |
| * | support changing primary user id in SaveKeyringParcelVincent Breitmoser2014-07-023-4/+115
| * | use expert create key for key creation testing (revert this later on!)Vincent Breitmoser2014-07-021-5/+50
| * | fix subkey additionVincent Breitmoser2014-07-022-37/+62
| * | add create key capabilities to SaveKeyringParcelVincent Breitmoser2014-06-297-61/+118
* | | forgot a line in previous commitVincent Breitmoser2014-07-021-0/+1
* | | don't use zero plural string for englishVincent Breitmoser2014-07-022-2/+6
| |/ |/|
* | remove leftover of AndroidBootstrapDominik Schürmann2014-06-301-0/+0
* | Merge branch 'master' of github.com:open-keychain/open-keychainDominik Schürmann2014-06-3058-159/+268
|\ \
| * | 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-301-1/+0
| * | Fixed, issue #702Daniel Albert2014-06-301-1/+1
| * | Merge branch 'master' of https://github.com/open-keychain/open-keychainDaniel Albert2014-06-3030-309/+1460
| |\|
| * | 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
| * | Converted AsymetricKeyFragment to new button styleDaniel Albert2014-06-292-9/+6
| * | Added new button style and converted account_settings and the select_secret_k...Daniel Albert2014-06-299-19/+51
| * | Updated file_dialog to use the new buttonsDaniel Albert2014-06-293-13/+9
| * | Improved button styleDaniel Albert2014-06-293-21/+12
| * | Added button_rounded styleDaniel Albert2014-06-283-6/+52
* | | work on edit keyDominik Schürmann2014-06-307-40/+84
| |/ |/|
* | pass import results through to viewkeyactivity on updateVincent Breitmoser2014-06-285-83/+125
* | fix nullpointerexception in importkeyactivityVincent Breitmoser2014-06-283-3/+20
* | code cleanup and plurals in import log entriesVincent Breitmoser2014-06-289-154/+140
* | Merge remote-tracking branch 'upstream/master'Daniel Albert2014-06-2819-71/+1177
|\ \ | |/ |/|
| * 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
| |\
| * | 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
* | | 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
|\ \
| * | Move sks-keyservers.net CA into assets foldermar-v-in2014-06-255-41/+85
| * | Merge branch 'master' into hkps-by-defaultmar-v-in2014-06-2415-65/+563
| |\ \
| * | | 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
| * | | Few fixes on hkpsmar-v-in2014-06-232-35/+34
| * | | 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