cthrace/open-keychain
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
6,473 Commits 1 Branch 0 Tags
07b7936d0ba75fba0866ce25c93edf3313bce6ee
Commit Graph

6473 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Dominik Schürmann
07b7936d0b Merge pull request #2183 from open-keychain/locate-hotspot 
Add "Where is my NFC reader?" button to nfc waiting dialog
 2017-10-23 18:37:15 +02:00
Dominik Schürmann
f876f08cf0 Re-enable Yubikey 4 USB filter 2017-10-23 18:08:17 +02:00
Dominik Schürmann
e18ca42789 Merge branch 'master' of github.com:open-keychain/open-keychain 2017-10-23 14:49:00 +02:00
Dominik Schürmann
96d856f2e6 Improve language based on comments on transifex 2017-10-23 14:48:52 +02:00
Vincent Breitmoser
476f756607 Merge pull request #2189 from open-keychain/disable-tokens 
Disable unsupported USB tokens
 2017-10-23 11:07:59 +02:00
Dominik Schürmann
992d5fb703 Merge pull request #2190 from wiktor-k/master 
Accept dash character (-) in GitHub user names when checking for Gist URL
 2017-10-20 13:02:16 +02:00
Wiktor Kwapisiewicz
f2cda5dd6c Accept dash character (-) in GitHub user names when checking for Gist URL 
GitHub allows dash / minus characters in usernames (e.g. "wiktor-k" or
"open-keychain"). This change extends the regular expression to capture
this missing character.
 2017-10-18 21:20:25 +02:00
Dominik Schürmann
fdbd89e094 Disable unsupported USB tokens 2017-10-18 14:56:32 +02:00
Dominik Schürmann
3a22c1f480 remove remember time from setting summary 2017-10-17 21:23:01 +02:00
Dominik Schürmann
0b950cae24 Merge pull request #2169 from open-keychain/travis-25 
WIP: Travis: use sys-img-armeabi-v7a-android-25
 2017-10-16 12:18:56 +02:00
Dominik Schürmann
60891958c2 Travis: disable androidTests 2017-10-16 10:35:57 +02:00
Dominik Schürmann
bd7afb95b8 Travis: use sys-img-armeabi-v7a-android-25 2017-10-15 13:14:42 +02:00
Dominik Schürmann
ebb6a8d4df Merge pull request #2174 from hagau/update_dependencies 
Update support libraries to 25.3.1 and update gradle-witness hashes
 2017-10-15 13:13:49 +02:00
Christian Hagau
a6b7fc836f Enable multidex for debug builds only 2017-10-13 15:11:08 +00:00
Christian Hagau
b373df2933 Update support libraries to 25.3.1 and update gradle-witness hashes 2017-10-13 15:11:08 +00:00
Dominik Schürmann
7525f54cbf 4.8-beta1 2017-10-13 13:47:02 +02:00
Dominik Schürmann
51109bdf5c Merge pull request #2182 from open-keychain/usb-refactor 
Usb refactoring
 2017-10-13 13:44:08 +02:00
Vincent Breitmoser
dfed7d3c93 Move decision of whether to show button into ShowNfcSweetspotActivity 2017-10-12 10:05:04 +02:00
Vincent Breitmoser
287d3251c5 Add "Where is my NFC reader?" feature to nfc waiting dialog 2017-10-10 05:06:40 +02:00
Vincent Breitmoser
c07e808d24 add nfc sweetspot data, scraped from NFC-Ring API 2017-10-10 04:54:43 +02:00
Vincent Breitmoser
0cb000a0be Change some package structure 2017-10-09 14:24:42 +02:00
Vincent Breitmoser
a51252910b some T=1 refactoring 2017-10-09 14:17:30 +02:00
Vincent Breitmoser
6cc058e25f some more cleanup in usb classes 2017-10-08 05:01:40 +02:00
Vincent Breitmoser
31da4c450d Ignore leading data before IccPowerOn operation in CcidTransceiver 2017-10-08 05:01:39 +02:00
Vincent Breitmoser
7a24f4c237 refactor CcidTransceiver 2017-10-08 05:01:25 +02:00
Vincent Breitmoser
65c1ca91d4 explicitly connect before writing to output stream while creating github linked id 2017-10-06 19:19:35 +02:00
Vincent Breitmoser
c4905c5eda increase timeouts for github account linking 2017-10-06 19:07:54 +02:00
Vincent Breitmoser
fa3345f595 fix base64 encoding for github auth revocation 2017-10-06 19:07:40 +02:00
Vincent Breitmoser
2debc23ce0 slightly nicer error reporting for security token cla chaining 2017-10-06 19:06:43 +02:00
Vincent Breitmoser
618c3a506c Merge pull request #2167 from open-keychain/ditch-consolidate 
Ditch "consolidate" mechanism
 2017-10-02 16:46:12 +02:00
Vincent Breitmoser
b2e4a035a2 make qr code background color in transfer fragment white 2017-09-30 21:30:10 +02:00
Vincent Breitmoser
4536645170 don't show "link account" button if feature is disabled 2017-09-30 21:19:20 +02:00
Vincent Breitmoser
95e6562386 fix more NPEs in ManageSecurityTokenFragment 2017-09-29 23:41:32 +02:00
Vincent Breitmoser
565c237903 nicer preview for api deduplicate key dialog 2017-09-29 15:56:50 +02:00
Vincent Breitmoser
7ee41aa51c support partially bound tokens in key health view 2017-09-28 17:29:46 +02:00
Vincent Breitmoser
77856afc4f locked empty security tokens are locked, not empty 2017-09-28 17:29:46 +02:00
Vincent Breitmoser
3d473e05ad set security token admin pin to 12345678 in debug builds 2017-09-28 17:29:46 +02:00
Vincent Breitmoser
75263f8d37 Merge pull request #2171 from kbsriram/license-update 
Update interop test license to Apache 2.0
 2017-09-28 15:26:19 +02:00
KB Sriram
db4f058ba8 Update interop test license to Apache 2.0 
Change the license for the interoperability test runner
to Apache 2.0, matching standard Google open source practice.
 2017-09-28 06:18:58 -07:00
Vincent Breitmoser
4a0c61a478 prevent crashes after detach in manage security token fragment 2017-09-27 20:16:14 +02:00
Dominik Schürmann
a155201400 Fix for travis android test 2017-09-25 11:46:19 +02:00
Dominik Schürmann
48e01e15e0 Version 4.7 2017-09-25 11:19:15 +02:00
Dominik Schürmann
d9fec6efb9 fastlane changelog, remove unused files 2017-09-25 11:16:52 +02:00
Dominik Schürmann
9d1ec7443c Pull from transifex 2017-09-25 10:57:45 +02:00
Dominik Schürmann
1641ac307d Changelog 4.7 2017-09-25 10:46:32 +02:00
Dominik Schürmann
2ac67865d7 Fix indentation 2017-09-25 10:18:52 +02:00
Arnaud Fontaine
ae0b3dc396 Fix EC decipher template (#2166) 
Fix EC decipher template
 2017-09-25 10:13:41 +02:00
Vincent Breitmoser
bf31d4f55d add logging 2017-09-23 01:54:34 +02:00
Vincent Breitmoser
a6f97cf46e remember if key signatures table has been initialized 2017-09-23 01:35:40 +02:00
Vincent Breitmoser
678a5c1562 slight cleanup 2017-09-23 01:35:39 +02:00