Dominik Schürmann
|
3325ff57a7
|
Use new safe slinger activity from share tab
|
2014-10-26 02:34:51 +02:00 |
|
Dominik Schürmann
|
4631f45ed7
|
Merge branch 'development' of github.com:open-keychain/open-keychain into development
|
2014-10-26 02:17:26 +02:00 |
|
Dominik Schürmann
|
be3e6ae6ef
|
Move advanced info into own activity
|
2014-10-26 02:16:39 +02:00 |
|
Vincent Breitmoser
|
d6b9fc27b7
|
Merge branch 'development' of github.com:open-keychain/open-keychain into development
|
2014-10-26 01:54:12 +02:00 |
|
Vincent Breitmoser
|
510ef40f55
|
implement upload of keyring after certification, check that option by default
|
2014-10-26 01:50:48 +02:00 |
|
Dominik Schürmann
|
3059007995
|
Merge branch 'development' of github.com:open-keychain/open-keychain into development
|
2014-10-26 01:09:46 +02:00 |
|
Dominik Schürmann
|
97baa0e52f
|
Keyboard tests
|
2014-10-26 01:09:35 +02:00 |
|
Vincent Breitmoser
|
108b35cb50
|
add description of symantec test case
|
2014-10-26 00:41:36 +02:00 |
|
Dominik Schürmann
|
825baeee1b
|
Merge branch 'development' of github.com:open-keychain/open-keychain into development
|
2014-10-26 00:38:31 +02:00 |
|
Dominik Schürmann
|
8257e450f9
|
Fixes from transifex
|
2014-10-26 00:38:25 +02:00 |
|
Vincent Breitmoser
|
fb7264d7fd
|
Merge branch 'development' of github.com:open-keychain/open-keychain into development
|
2014-10-26 00:34:19 +02:00 |
|
Vincent Breitmoser
|
8b778809bf
|
add test case for symantec secret keys (#974)
|
2014-10-26 00:34:16 +02:00 |
|
Dominik Schürmann
|
f51aebf52d
|
Move some multi select items in overflow menu, rename import
|
2014-10-26 00:30:10 +02:00 |
|
Vincent Breitmoser
|
33738b1f52
|
Retry canonicalization with pubkey self certs if first attempt failed
Fixes #974
|
2014-10-26 00:26:13 +02:00 |
|
Dominik Schürmann
|
94693efbe5
|
Fail on unknown key ids on API, Key item design consistency for API
|
2014-10-26 00:19:14 +02:00 |
|
Dominik Schürmann
|
e4391c282d
|
Fix layout of select key adapter
|
2014-10-26 00:15:35 +02:00 |
|
Dominik Schürmann
|
74bac3ea36
|
Remove empty layout
|
2014-10-25 23:36:48 +02:00 |
|
Dominik Schürmann
|
94e7bbb67b
|
Remove PassphraseDialogFragment
|
2014-10-25 22:56:27 +02:00 |
|
Dominik Schürmann
|
ad60ec2d00
|
Remove old certify activity
|
2014-10-25 22:55:16 +02:00 |
|
Dominik Schürmann
|
c1ef9ed149
|
Use passphrase dialog activity instead of passphrase dialog
|
2014-10-25 22:53:35 +02:00 |
|
Dominik Schürmann
|
1099382250
|
Remove old exception handling code from loaders
|
2014-10-25 22:31:28 +02:00 |
|
Dominik Schürmann
|
8dddc82f69
|
Merge branch 'development' of github.com:open-keychain/open-keychain into development
|
2014-10-25 22:25:14 +02:00 |
|
Dominik Schürmann
|
4f37c88ea7
|
Fix color in import list
|
2014-10-25 22:25:11 +02:00 |
|
Vincent Breitmoser
|
b9c0504465
|
remove unnecessary (and buggy) BufferedInputStream wrapping
|
2014-10-25 22:20:55 +02:00 |
|
Dominik Schürmann
|
c2e7c2416f
|
Remove tabs from import keys activity
|
2014-10-25 22:05:55 +02:00 |
|
Dominik Schürmann
|
71e3fb5380
|
Merge branch 'development' of github.com:open-keychain/open-keychain into development
|
2014-10-25 21:15:12 +02:00 |
|
Dominik Schürmann
|
0abfff0b0e
|
Fixes and icons for apps list, also add Password Store
|
2014-10-25 21:15:05 +02:00 |
|
Vincent Breitmoser
|
26bd847c32
|
shorter certification explanation
|
2014-10-25 03:18:54 +02:00 |
|
Vincent Breitmoser
|
ce4b8edaab
|
more rewording
|
2014-10-25 03:18:54 +02:00 |
|
Dominik Schürmann
|
d3e0e823e3
|
Fix result passing
|
2014-10-25 03:06:39 +02:00 |
|
Dominik Schürmann
|
e11df08ea1
|
Merge branch 'development' of github.com:open-keychain/open-keychain into development
|
2014-10-25 02:57:42 +02:00 |
|
Dominik Schürmann
|
339b283df5
|
Safeslinger fixesÄ
|
2014-10-25 02:57:33 +02:00 |
|
Vincent Breitmoser
|
748049fb5b
|
slightly change wording in merge logs
|
2014-10-25 02:50:48 +02:00 |
|
Vincent Breitmoser
|
c5028dc9ce
|
Merge branch 'development' of github.com:open-keychain/open-keychain into development
|
2014-10-25 02:49:37 +02:00 |
|
Vincent Breitmoser
|
30d0afa363
|
change the way merging is logged
|
2014-10-25 02:45:16 +02:00 |
|
Dominik Schürmann
|
49b237d609
|
Fix safe slinger button
|
2014-10-25 02:42:13 +02:00 |
|
Dominik Schürmann
|
418f0970ab
|
Fix safe slinger button
|
2014-10-25 02:41:20 +02:00 |
|
Dominik Schürmann
|
57a26a6cb3
|
Use selected number of users in safe slinger
|
2014-10-25 02:39:48 +02:00 |
|
Dominik Schürmann
|
2d992f19f7
|
Update safeslinger lib
|
2014-10-25 02:39:03 +02:00 |
|
Dominik Schürmann
|
e332c664cf
|
Merge branch 'development' of github.com:open-keychain/open-keychain into development
|
2014-10-25 02:38:09 +02:00 |
|
Dominik Schürmann
|
33b54ab03e
|
Safe slinger activity preps
|
2014-10-25 02:38:06 +02:00 |
|
Vincent Breitmoser
|
7c4bbc83cb
|
change indentation of import logs
|
2014-10-25 02:25:39 +02:00 |
|
Vincent Breitmoser
|
059c058040
|
set padding for sublog entries
|
2014-10-25 02:25:28 +02:00 |
|
Vincent Breitmoser
|
ba724353e5
|
more work on import logging
|
2014-10-25 02:13:02 +02:00 |
|
Vincent Breitmoser
|
478b2a4d8b
|
add logging to import and change order of import, keyservers first
|
2014-10-25 01:59:15 +02:00 |
|
Dominik Schürmann
|
1cbedb60d6
|
Qr code button text
|
2014-10-24 00:44:26 +02:00 |
|
Dominik Schürmann
|
b1c164bde0
|
remove space in on large devices in layouts where no drawer nav is shown
|
2014-10-24 00:39:33 +02:00 |
|
Dominik Schürmann
|
9447f8fdf9
|
Fix import from cloud
|
2014-10-24 00:30:58 +02:00 |
|
Dominik Schürmann
|
bfc3774f02
|
Merge pull request #973 from timbray/development
Make the Certify screen a little more self-explanatory
|
2014-10-24 00:23:40 +02:00 |
|
Dominik Schürmann
|
efa5a80eb6
|
Merge branch 'development' of github.com:open-keychain/open-keychain into development
Conflicts:
OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/KeyListActivity.java
|
2014-10-23 23:33:50 +02:00 |
|