cthrace/open-keychain
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
2,223 Commits 1 Branch 0 Tags
d07dbecef435b255667b9a6d7da493057eb85a60
Commit Graph
100 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Dominik Schürmann f0b8261ad3 Use actionbar button for log activity 2014-06-20 15:49:54 +02:00
Dominik Schürmann 717d66961b Fix onTouchEvent delegation, with workaround for Android bug 2014-06-20 15:39:27 +02:00
Dominik Schürmann 4aec28c237 Fix update from keyserver flow 2014-06-20 15:14:34 +02:00
Dominik Schürmann 313e571a61 Merge pull request #664 from mar-v-in/improve-file 
Add Document/Storage API support
 2014-06-19 17:07:52 +02:00
Dominik Schürmann 48c96184dc Fix app name in PGP header, closing #663 2014-06-19 11:56:36 +02:00
Dominik Schürmann 3d8e6b303c Fixing fingerprint search, part 1 2014-06-19 01:26:21 +02:00
Dominik Schürmann 47edcacf61 Remove unused code to import splitted qr codes 2014-06-19 00:54:52 +02:00
Dominik Schürmann f0487b0ca7 Merge branch 'master' of github.com:open-keychain/open-keychain 2014-06-19 00:38:47 +02:00
Dominik Schürmann 7fc188dbd6 New callback model for ImportKeysActivity 2014-06-19 00:38:36 +02:00
Dominik Schürmann 0db425b289 Reference ic_launcher instead of icon 2014-06-18 23:19:54 +02:00
Dominik Schürmann bce874db09 decrease size of search icons in import 2014-06-18 23:06:58 +02:00
Dominik Schürmann a246dc9675 Fix new actionbar icon sizes, rename icon to ic_launcher following Android naming conventions 2014-06-18 22:30:54 +02:00
Dominik Schürmann 37a81af748 Merge branch 'master' of github.com:open-keychain/open-keychain 2014-06-18 22:02:07 +02:00
Dominik Schürmann d9ccef4899 consistent button design in import activity 2014-06-18 22:01:58 +02:00
Dominik Schürmann 8ffc959f07 Merge pull request #661 from mar-v-in/improve-contacts 
Improve contact sync
 2014-06-18 20:56:38 +02:00
Dominik Schürmann 4d34361590 Merge branch 'master' of github.com:open-keychain/open-keychain 2014-06-18 00:03:19 +02:00
Dominik Schürmann 8c7a360d6e Redesign Import, still some todos and regression bugs 2014-06-18 00:03:06 +02:00
Dominik Schürmann 21e9d0b7b4 Merge pull request #656 from danielhass/supertoast-dev 
Added SuperToasts with new notify-wrapper
 2014-06-16 15:20:15 +02:00
Dominik Schürmann 81344389e5 Merge pull request #654 from artbristol/master 
Update JUnit version
 2014-06-14 15:54:22 +02:00
Dominik Schürmann 70d454785f Update example code instructions 2014-06-09 22:51:13 +02:00
Dominik Schürmann 2b825c8df7 Update README for build tools 2014-06-09 22:30:12 +02:00
Dominik Schürmann 73a825a152 Really fix travis 2014-06-09 22:14:30 +02:00
Dominik Schürmann cb3c2b2008 Disable robolectric, update to android gradle 0.11.1, update gradle to 1.12 2014-06-09 22:09:30 +02:00
Dominik Schürmann de6fe46eca Fix travis for buildTools 19.1 2014-06-09 22:02:04 +02:00
Dominik Schürmann fe1b8468a1 Update buildTools to 19.1 2014-06-09 21:55:32 +02:00
Dominik Schürmann d530a7b0ee Update buildTools to 19.1 2014-06-09 21:52:17 +02:00
Dominik Schürmann 90f9646f25 Merge pull request #650 from open-keychain/v/import-log 
Parcelable operation result with logging capabilities + import logging
 2014-06-06 23:07:06 +02:00
Dominik Schürmann a0f43febbb Merge pull request #649 from mar-v-in/automatic-contact-discovery 
Automatic contact discovery and more
 2014-06-06 22:57:51 +02:00
Dominik Schürmann d2430fe0e3 Move SlidingTabLayout and SlidingTabStrip into appropriate subpackage 2014-06-06 22:47:28 +02:00
Dominik Schürmann 341247d446 Hide subkeys, certs tabs in key view, checkable menu item to show/hide them 2014-06-06 22:46:39 +02:00
Dominik Schürmann 255462def4 Merge pull request #646 from timbray/master 
Clean up keyimport.ImportKeysListEntry
 2014-06-05 21:02:19 +02:00
Dominik Schürmann fc3a692002 Merge pull request #645 from timbray/master 
Don't show full fingerprint in key search result lists
 2014-06-05 18:16:29 +02:00
Dominik Schürmann 52f1f30846 Use fixed gradle versions 2014-06-04 10:22:05 +02:00
Dominik Schürmann 6cb791d567 Use fixed gradle versions 2014-06-04 10:21:28 +02:00
Dominik Schürmann 84d03dd514 Merge pull request #643 from open-keychain/v/dev 
wrap bouncycastle objects and don't use them in android-related code
 2014-06-03 13:06:49 +02:00
Dominik Schürmann 39997a802e Merge branch 'master' of github.com:open-keychain/open-keychain 2014-05-31 20:54:30 +02:00
Dominik Schürmann 6d1369be56 Pull from transifex 2014-05-31 20:49:56 +02:00
Dominik Schürmann 13d4a6d902 Merge pull request #632 from timbray/master 
Refactor server query exceptions again
 2014-05-25 13:55:29 +02:00
Dominik Schürmann 8a2ffd8f90 Layout fixes for key import 2014-05-19 00:10:34 +02:00
Dominik Schürmann 8e846dc132 Add license header to FixedDrawerLayout 2014-05-18 23:23:58 +02:00
Dominik Schürmann c36565fc24 Merge branch 'thi-highlight-keyserver-search-results-as-well' 2014-05-18 23:19:35 +02:00
Dominik Schürmann 6e9acafc6d Merge highlight keyserver pull request 2014-05-18 23:19:22 +02:00
Dominik Schürmann 19072824ba Rename KeyServer to Keyserver 2014-05-18 23:06:50 +02:00
Dominik Schürmann 9025de2b74 Merge pull request #630 from timbray/master 
Handle changed keybase.io search results format
 2014-05-16 09:52:34 +02:00
Dominik Schürmann bbc0694700 New screenshots 2014-05-14 22:28:41 +02:00
Dominik Schürmann bbf19248ef Merge pull request #627 from thi/improve-keybase.io-support 
Improve keybase.io support
 2014-05-14 20:19:44 +02:00
Dominik Schürmann fd12f89ccb Clarify help start 2014-05-14 18:01:40 +02:00
Dominik Schürmann 638554f256 Update html-textview 2014-05-14 11:02:30 +02:00
Dominik Schürmann 05a3163f17 Merge branch 'master' of github.com:open-keychain/open-keychain 2014-05-13 18:52:57 +02:00
Dominik Schürmann be46eabdb5 Add pgpauth app to help, update html-textview 2014-05-13 18:52:48 +02:00
Dominik Schürmann 9c3a614ac5 Merge pull request #623 from danielhass/appmsg 
Further Toast replacements
 2014-05-12 09:59:09 +02:00
Dominik Schürmann 2aa3eb2bb5 Add Tim Bray to about 2014-05-09 11:38:40 +02:00
Dominik Schürmann 1daddfbaab Version 2.7 2014-05-08 19:40:13 +02:00
Dominik Schürmann 37ad355d20 Translations from transifex 2014-05-08 19:39:44 +02:00
Dominik Schürmann badfa9f7bc Changelog 2.7 2014-05-08 19:32:07 +02:00
Dominik Schürmann c2b75e3d2e Merge branch 'master' of github.com:open-keychain/open-keychain 2014-05-08 18:44:58 +02:00
Dominik Schürmann af4f32e2d7 Translations from transifex 2014-05-08 18:44:54 +02:00
Dominik Schürmann 956b9a12bb Merge branch 'master' of github.com:open-keychain/open-keychain 2014-05-08 15:47:06 +02:00
Dominik Schürmann 33cad382f9 Use flat buttons where appropriate 2014-05-08 15:46:57 +02:00
Dominik Schürmann 5a1120e791 Merge pull request #619 from Valodim/loader-fragment 
Introduce LoaderFragment
 2014-05-08 14:20:07 +02:00