index
:
connectbot-yubikey/open-keychain
master
open-keychain with patches to support ssh authentication
James
about
summary
refs
log
tree
commit
diff
stats
log msg
author
committer
range
path:
root
/
OpenKeychain
/
src
/
main
Commit message (
Expand
)
Author
Age
Files
Lines
*
Merge branch 'master' of github.com:open-keychain/open-keychain
Vincent Breitmoser
2014-08-20
4
-13
/
+8
|
\
|
*
Upload key working
Dominik Schürmann
2014-08-20
4
-13
/
+8
*
|
small change to make android studio recognize a honeycomb-only block
Vincent Breitmoser
2014-08-20
1
-2
/
+4
*
|
move key deletion into KeychainIntentHandler
Vincent Breitmoser
2014-08-20
4
-40
/
+104
*
|
Merge branch 'master' of github.com:open-keychain/open-keychain
Vincent Breitmoser
2014-08-20
7
-33
/
+49
|
\
|
|
*
Upload key working
Dominik Schürmann
2014-08-20
1
-0
/
+3
|
*
Fix key sharing
Dominik Schürmann
2014-08-20
1
-3
/
+1
|
*
Work on upload key
Dominik Schürmann
2014-08-20
1
-14
/
+24
|
*
Notify duration, cleanup
Dominik Schürmann
2014-08-20
2
-9
/
+4
|
*
Fix nullpointer in first time activity
Dominik Schürmann
2014-08-20
1
-1
/
+3
|
*
Merge branch 'master' of github.com:open-keychain/open-keychain
Dominik Schürmann
2014-08-20
2
-3
/
+3
|
|
\
|
*
|
return some more results
Dominik Schürmann
2014-08-20
2
-6
/
+14
*
|
|
consolidate: small ui things
Vincent Breitmoser
2014-08-20
2
-1
/
+6
*
|
|
make number of secret keys imported part of ImportResult parcel
Vincent Breitmoser
2014-08-20
2
-5
/
+11
*
|
|
close actionmode in keylist on loading events (avoid inconsistent state)
Vincent Breitmoser
2014-08-20
1
-0
/
+10
*
|
|
consolidate: remove debug "breakpoint"
Vincent Breitmoser
2014-08-20
1
-5
/
+0
|
|
/
|
/
|
*
|
Merge branch 'master' of github.com:open-keychain/open-keychain
Vincent Breitmoser
2014-08-20
2
-9
/
+7
|
\
|
|
*
progress dialog design fix
Dominik Schürmann
2014-08-20
2
-9
/
+7
*
|
modifyKey: small logging changes
Vincent Breitmoser
2014-08-20
2
-3
/
+3
|
/
*
Merge branch 'master' of github.com:open-keychain/open-keychain
Dominik Schürmann
2014-08-20
4
-91
/
+115
|
\
|
*
Merge branch 'master' of github.com:open-keychain/open-keychain
Vincent Breitmoser
2014-08-20
7
-19
/
+30
|
|
\
|
*
|
consolidate: prevent concurrent calls of step 2
Vincent Breitmoser
2014-08-20
4
-91
/
+115
*
|
|
return some more results
Dominik Schürmann
2014-08-20
6
-35
/
+41
|
|
/
|
/
|
*
|
Merge branch 'master' of github.com:open-keychain/open-keychain
Dominik Schürmann
2014-08-20
8
-54
/
+74
|
\
|
|
*
Merge branch 'master' of github.com:open-keychain/open-keychain
Vincent Breitmoser
2014-08-20
15
-76
/
+135
|
|
\
|
*
|
consolidate: implement (mostly) recovery mode
Vincent Breitmoser
2014-08-20
5
-49
/
+67
|
*
|
consolidate: use KeychainProvider for deletion operation
Vincent Breitmoser
2014-08-20
4
-5
/
+7
*
|
|
Fixes and temporary fixes for returning results
Dominik Schürmann
2014-08-20
7
-19
/
+30
|
|
/
|
/
|
*
|
Pull from transifex
Dominik Schürmann
2014-08-20
15
-76
/
+135
|
/
*
Pull from transifex
Dominik Schürmann
2014-08-20
32
-338
/
+1203
*
Fix mime types, #781
mar-v-in
2014-08-19
2
-3
/
+5
*
Fix strings
Dominik Schürmann
2014-08-19
3
-7
/
+7
*
consolidate: a lot more log output, better recovery
Vincent Breitmoser
2014-08-19
4
-35
/
+108
*
Start consolidate activity
Dominik Schürmann
2014-08-19
1
-1
/
+8
*
ConsolidateDialogActivity
Dominik Schürmann
2014-08-19
2
-41
/
+30
*
Merge branch 'master' of github.com:open-keychain/open-keychain
Dominik Schürmann
2014-08-19
10
-27
/
+266
|
\
|
*
stub for consolidate recovery in KeychainApplication
Vincent Breitmoser
2014-08-19
1
-1
/
+8
|
*
add ProgressFixedScaler (forgot in a previous commit)
Vincent Breitmoser
2014-08-19
1
-0
/
+29
|
*
add OpenDialogActivity (stub)
Vincent Breitmoser
2014-08-19
1
-0
/
+117
|
*
consolidate: split into two steps, can pick up at second step if anything fails
Vincent Breitmoser
2014-08-19
7
-26
/
+112
*
|
Scroll fixes for certify activity
Dominik Schürmann
2014-08-19
3
-8
/
+21
|
/
*
Notes about criticality
Dominik Schürmann
2014-08-19
1
-2
/
+15
*
Decrease iteration count, delayed for 2.9
Dominik Schürmann
2014-08-19
1
-1
/
+1
*
Merge branch 'master' of github.com:open-keychain/open-keychain
Dominik Schürmann
2014-08-19
1
-1
/
+3
|
\
|
*
fix primary user id in master key flag modification
Vincent Breitmoser
2014-08-19
1
-1
/
+3
*
|
Change criticallity of subpackets after discussion
Dominik Schürmann
2014-08-19
1
-5
/
+5
|
/
*
Use higher s2k count
Dominik Schürmann
2014-08-19
1
-10
/
+29
*
Use SHA512 instead of SHA1 and AES256 instead of CAST5 where possible
Dominik Schürmann
2014-08-19
1
-20
/
+22
*
Mark packets critical
Dominik Schürmann
2014-08-19
1
-11
/
+11
*
add feature to key sig subpacket to indicate that we want MDC
Dominik Schürmann
2014-08-19
1
-0
/
+3
[next]