cthrace/open-keychain
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
2,397 Commits 1 Branch 0 Tags
cb3425f94743f5569d8aad57ab54d3fed04309eb
Commit Graph
100 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Dominik Schürmann cb3425f947 Update spongycastle 2014-07-27 18:21:39 +02:00
Dominik Schürmann 4eceb5bde1 Merge pull request #720 from artbristol/skip-bc-tests-externally 
Skip spongycastle tests in root project
 2014-07-27 18:13:02 +02:00
Dominik Schürmann 0403cbf11a Prettify buttons 2014-07-27 18:12:14 +02:00
Dominik Schürmann dab540e121 Work on first time wizard design 2014-07-27 17:56:52 +02:00
Dominik Schürmann 9ea5148550 Update libs 2014-07-25 01:34:57 +02:00
Dominik Schürmann 5eb414a22b Program flow fixes 2014-07-25 01:34:29 +02:00
Dominik Schürmann 527c3e93f8 Update README.md 2014-07-19 15:16:45 +02:00
Dominik Schürmann 207870af1d Update README.md 2014-07-19 15:15:31 +02:00
Dominik Schürmann 8385c9c9dd Update README 2014-07-19 15:14:20 +02:00
Dominik Schürmann 94e56a4542 Merge branch 'da-kid-master' 2014-07-18 09:49:51 +02:00
Dominik Schürmann b332aacabb Merge branch 'master' of https://github.com/da-kid/open-keychain into da-kid-master 
Conflicts:
	OpenKeychain/src/test/resources/extern/OpenPGP-Haskell
 2014-07-18 09:49:20 +02:00
Dominik Schürmann 306bea5ee9 Removed OpenPGP-haskell submodule 2014-07-18 09:39:36 +02:00
Dominik Schürmann 3d74a9c11c Add OpenPGP-Haskell test files directly 2014-07-18 09:34:54 +02:00
Dominik Schürmann 82af9672fd Temporary program flow fixes 2014-07-16 10:07:50 +02:00
Dominik Schürmann 77d04a915b Simple create key 2014-07-16 10:05:00 +02:00
Dominik Schürmann 57f5a788fd Simple create key 2014-07-16 10:04:48 +02:00
Dominik Schürmann c1c831e52b New first time screen 2014-07-16 09:49:37 +02:00
Dominik Schürmann d3c54d5f12 Fallback if no primary user id exists 2014-07-16 00:22:45 +02:00
Dominik Schürmann 848043a481 Merge branch 'master' of github.com:open-keychain/open-keychain 2014-07-15 19:34:01 +02:00
Dominik Schürmann 503b146a14 Merge branch 'master' of github.com:open-keychain/open-keychain 2014-07-15 19:22:44 +02:00
Dominik Schürmann 72237a0892 some fixes for edit 2014-07-15 19:22:40 +02:00
Dominik Schürmann e1d505a291 Update README with build instructions for build 2014-07-15 17:51:31 +02:00
Dominik Schürmann 0ce9c13132 Fix strings from 'keys' to 'passphrases' 2014-07-12 21:07:29 +02:00
Dominik Schürmann af5fddab7c Merge branch 'master' of github.com:open-keychain/open-keychain 2014-07-12 21:04:57 +02:00
Dominik Schürmann 195f2c25cc Merge pull request #713 from da-kid/master 
Added notification to passphrasecache
 2014-07-12 21:02:19 +02:00
Dominik Schürmann 45dfb39749 more work on edit key 2014-07-12 20:39:23 +02:00
Dominik Schürmann 16498be4a2 Fix nullpointer in API, fix #693 2014-07-08 04:24:27 +02:00
Dominik Schürmann 61d0e12e8a cleanup 2014-07-08 03:37:32 +02:00
Dominik Schürmann daa1f5cf8e Merge branch 'master' of github.com:open-keychain/open-keychain 2014-07-08 03:34:53 +02:00
Dominik Schürmann 5adcb7885c Work on subkeys adapter 2014-07-08 03:34:27 +02:00
Dominik Schürmann 3363507be4 Bett API string 2014-07-04 09:52:25 +02:00
Dominik Schürmann 709196f774 Use strings in edit key 2014-07-03 16:49:25 +02:00
Dominik Schürmann e006d4762c Pull from transifex 2014-07-03 16:38:22 +02:00
Dominik Schürmann 9e56e53cf1 Pull from transifex 2014-07-03 16:30:41 +02:00
Dominik Schürmann 3085f0d229 Small strings fix 2014-07-03 16:24:10 +02:00
Dominik Schürmann 1ba41e7482 Remove old edit button, rename activities 2014-07-03 16:21:16 +02:00
Dominik Schürmann bd7b4ccf2b cleanup, debug for passphrase set 2014-07-03 15:58:03 +02:00
Dominik Schürmann 6ca9d8a268 fix no passphrase check 2014-07-03 15:54:07 +02:00
Dominik Schürmann b9d2ae938a Cache passphrase for edit 2014-07-03 15:49:46 +02:00
Dominik Schürmann 2988ac6e7b Cache passphrase for edit 2014-07-03 15:48:46 +02:00
Dominik Schürmann 85dde66804 parcel newPassphrase 2014-07-03 15:28:45 +02:00
Dominik Schürmann 9cbf78f7ad cleanup 2014-07-03 15:24:04 +02:00
Dominik Schürmann 42cc8b687b edit key: subkey adapter 2014-07-03 15:14:06 +02:00
Dominik Schürmann 55f067b063 Work on edit 2014-07-03 15:06:05 +02:00
Dominik Schürmann 8cbdf7b1c5 smaller dropdown items 2014-07-03 08:48:33 +02:00
Dominik Schürmann 3512ac7199 Remove unnecessary error logs 2014-07-02 20:53:16 +02:00
Dominik Schürmann 12db94abca A little bit less purple 2014-07-02 18:59:23 +02:00
Dominik Schürmann 931bfdd9df Update spongycastle 2014-07-02 16:56:38 +02:00
Dominik Schürmann d967c5d864 merge KeychainIntentService 2014-07-02 16:49:21 +02:00
Dominik Schürmann 13a13829a8 fix nullpointer, cleanup 2014-07-02 16:47:12 +02:00
Dominik Schürmann 94a58f3aa8 remove init methods from adapter 2014-07-02 16:33:30 +02:00
Dominik Schürmann 3d34eb8ca4 edit key: work on saving 2014-07-02 15:42:38 +02:00
Dominik Schürmann a66c6b5b7a Merge branch 'master' of github.com:open-keychain/open-keychain 2014-07-02 15:11:13 +02:00
Dominik Schürmann bb39caa28d Add infographic from FSFE 2014-07-02 15:11:06 +02:00
Dominik Schürmann 4f83a4f163 Edit key: adding user ids 2014-07-02 15:10:50 +02:00
Dominik Schürmann 7408a35e19 edit key: part 3 2014-07-01 12:36:02 +02:00
Dominik Schürmann a901004588 remove leftover of AndroidBootstrap 2014-06-30 22:05:02 +02:00
Dominik Schürmann 9c1c51bf0c Removed submodule AndroidBootstrap 2014-06-30 22:04:13 +02:00
Dominik Schürmann 7c84b1fffd Merge branch 'master' of github.com:open-keychain/open-keychain 2014-06-30 22:01:25 +02:00
Dominik Schürmann c2ba7e2420 work on edit key 2014-06-30 22:01:17 +02:00
Dominik Schürmann d07dbecef4 Merge pull request #704 from da-kid/master 
Fixed #702 and also #597
 2014-06-30 21:57:33 +02:00
Dominik Schürmann 0067cdf221 travis: update sdk 2014-06-28 20:49:54 +02:00
Dominik Schürmann 97e1f365c2 Update keybase lib 2014-06-28 20:44:01 +02:00
Dominik Schürmann 2d95ae6466 Try new travis hack 2014-06-28 20:36:54 +02:00
Dominik Schürmann 17aa5d1a90 Fix supertoast submodule 2014-06-28 20:24:02 +02:00
Dominik Schürmann 70bf0c67e1 Update git submodules for android gradle plugin to 0.12.0 2014-06-28 20:17:27 +02:00
Dominik Schürmann 2157ea59e4 Update android gradle plugin to 0.12.0 2014-06-28 20:15:19 +02:00
Dominik Schürmann b7b22beafc Update subnodule keybase to fixed version of support libs 2014-06-28 18:59:07 +02:00
Dominik Schürmann 1738b42968 Merge branch 'master' of github.com:open-keychain/open-keychain 2014-06-28 18:56:49 +02:00
Dominik Schürmann b34c744324 Change keybase submodule to our fork 2014-06-28 18:56:19 +02:00
Dominik Schürmann 6e188be81e Merge pull request #699 from da-kid/master 
Partial fix for #597 (Navbar)
 2014-06-28 17:44:11 +02:00
Dominik Schürmann 3f3e1cdb05 Magic to find possible mails and names of device owner 2014-06-28 00:05:12 +02:00
Dominik Schürmann 1d5606a1a3 More wizardry 2014-06-27 23:01:11 +02:00
Dominik Schürmann 8bfba0826f Merge branch 'master' of github.com:open-keychain/open-keychain 2014-06-27 21:40:26 +02:00
Dominik Schürmann 9fe07478e7 Start work on a first-time wizard 2014-06-27 21:40:18 +02:00
Dominik Schürmann bd487bf732 Merge pull request #692 from da-kid/master 
Temporary fix for #648
 2014-06-25 20:07:29 +02:00
Dominik Schürmann 150090852b Merge pull request #690 from mar-v-in/hkps-by-default 
HKPS by default
 2014-06-25 08:48:40 +02:00
Dominik Schürmann a1bcbe72a3 new edit key: first version to add user ids 2014-06-24 22:58:28 +02:00
Dominik Schürmann 94bd2a675e Merge pull request #688 from da-kid/master 
Fix for #687
 2014-06-24 20:22:50 +02:00
Dominik Schürmann bfd9de4721 Merge branch 'artbristol-functional-testing' 2014-06-24 20:17:02 +02:00
Dominik Schürmann 9ce7d29a2d Merge submodules 2014-06-24 20:16:46 +02:00
Dominik Schürmann e84aa5a69d Rename registered apps to apps 2014-06-24 13:54:24 +02:00
Dominik Schürmann 804f811998 Merge pull request #684 from da-kid/master 
Fix of #683
 2014-06-23 19:35:27 +02:00
Dominik Schürmann bfd7c03b0a remove margin in import keys (leftover from nav drawer) 2014-06-23 18:38:26 +02:00
Dominik Schürmann 8f4e66348d Merge pull request #681 from timbray/master 
Handle empty keybase.io query, should fix #675
 2014-06-23 13:42:58 +02:00
Dominik Schürmann e8b96d1035 Disable pre-dexing, causes exceptions on some systems 2014-06-23 13:44:25 +02:00
Dominik Schürmann 514a4c668b new edit key: change passphrase 2014-06-22 18:26:17 +02:00
Dominik Schürmann b43fb63753 new edit key: diff for existing user ids 2014-06-22 18:12:04 +02:00
Dominik Schürmann 4db0194e6a Merge branch 'master' of github.com:open-keychain/open-keychain 2014-06-22 16:03:13 +02:00
Dominik Schürmann 106e1fcf03 Rename adapter 2014-06-22 16:03:03 +02:00
Dominik Schürmann c52828d247 add buttons in edit key 2014-06-22 13:33:50 +02:00
Dominik Schürmann 012b895e4f Update lib 2014-06-22 12:03:40 +02:00
Dominik Schürmann 9d20e68f11 Revert hint_keybase_search 2014-06-22 10:59:50 +02:00
Dominik Schürmann 4cc127e460 Merge pull request #672 from artbristol/functional-testing 
VERY basic test for save keyring
 2014-06-21 21:31:25 +02:00
Dominik Schürmann 0c3a478a43 Cleanup pull keybase code 2014-06-21 21:31:00 +02:00
Dominik Schürmann 4ae5c56b73 Merge pull request #668 from timbray/master 
Moved Keybase stuff into KeybaseLib submodule
 2014-06-21 21:25:03 +02:00
Dominik Schürmann 18430bef17 Start new designed activity 2014-06-21 20:25:51 +02:00
Dominik Schürmann a1525bffe2 Fix qr code finally 2014-06-20 23:01:35 +02:00
Dominik Schürmann 0a790c7aa2 Work on Qr code import 2014-06-20 22:28:08 +02:00
Dominik Schürmann 6b7aa2767a Fix keybase import 2014-06-20 15:58:32 +02:00