Dominik Schürmann
|
fd55cdb08e
|
Merge branch 'development' of github.com:open-keychain/open-keychain into development
Conflicts:
OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/MainActivity.java
|
2015-02-28 00:39:18 +01:00 |
|
Dominik Schürmann
|
453b67f7a8
|
Update from transifex
|
2015-02-28 00:38:53 +01:00 |
|
Vincent Breitmoser
|
9c62c3fd39
|
control flow for moving the fab up with snackbar
|
2015-02-28 00:28:20 +01:00 |
|
Dominik Schürmann
|
0669193e75
|
Simplify MainActivity
|
2015-02-28 00:22:31 +01:00 |
|
Dominik Schürmann
|
1c91be84af
|
Upload new keys to keyserver by default
|
2015-02-28 00:11:34 +01:00 |
|
Dominik Schürmann
|
0b49becaa8
|
padding fixes for key list
|
2015-02-28 00:04:15 +01:00 |
|
Dominik Schürmann
|
dc38031b4e
|
Merge branch 'development' of github.com:open-keychain/open-keychain into development
|
2015-02-27 23:57:00 +01:00 |
|
Dominik Schürmann
|
582caaba97
|
Reorder advanced key view
|
2015-02-27 23:56:53 +01:00 |
|
Vincent Breitmoser
|
c46fdef203
|
Merge branch 'development' of github.com:open-keychain/open-keychain into development
|
2015-02-27 23:53:14 +01:00 |
|
Vincent Breitmoser
|
8cfba4c0fb
|
slightly longer color fade duration
|
2015-02-27 23:52:51 +01:00 |
|
Dominik Schürmann
|
f2a9a41840
|
Enable multi line snackbar option
|
2015-02-27 23:47:15 +01:00 |
|
Dominik Schürmann
|
200d4a6bb6
|
Remove swipte to refresh src, fix padding in key list
|
2015-02-27 23:39:36 +01:00 |
|
Dominik Schürmann
|
b1c8fa3471
|
Fix keyboard overlay bug on top of edittexts
|
2015-02-27 23:24:04 +01:00 |
|
Vincent Breitmoser
|
aec9bdfc1e
|
transition status color in key view
|
2015-02-27 23:10:02 +01:00 |
|
Vincent Breitmoser
|
863f4e6ac1
|
hand through result in CertifyFingerprintActivity
|
2015-02-27 23:09:17 +01:00 |
|
Dominik Schürmann
|
5b1d834f91
|
Merge branch 'development' of github.com:open-keychain/open-keychain into development
|
2015-02-27 22:47:43 +01:00 |
|
Dominik Schürmann
|
fd2f858b12
|
Fix status images in user id adapter
|
2015-02-27 22:47:39 +01:00 |
|
Vincent Breitmoser
|
80c159056d
|
show refresh key progress inline
|
2015-02-27 22:46:48 +01:00 |
|
Dominik Schürmann
|
fe31883f66
|
Keybase header text
|
2015-02-27 22:40:52 +01:00 |
|
Dominik Schürmann
|
54e04f496e
|
Better qr code resizing
|
2015-02-27 22:26:11 +01:00 |
|
Adithya Abraham Philip
|
23cbd786ea
|
cleaned up log export
|
2015-02-28 02:11:39 +05:30 |
|
Adithya Abraham Philip
|
960a163185
|
Merge branch 'development' of https://github.com/open-keychain/open-keychain into development
|
2015-02-28 01:30:41 +05:30 |
|
Adithya Abraham Philip
|
d776bd2888
|
refined log output
|
2015-02-28 01:30:17 +05:30 |
|
Vincent Breitmoser
|
2cd7be6373
|
go to directly to certify screen after nfc import
|
2015-02-27 18:05:36 +01:00 |
|
Dominik Schürmann
|
ea4ca9e686
|
Prettify qr code cleanup
|
2015-02-27 01:47:06 +01:00 |
|
Dominik Schürmann
|
11c3436454
|
Prettify qr code in advanced key view
|
2015-02-27 01:44:40 +01:00 |
|
Dominik Schürmann
|
4ccd9f9bb1
|
Uncluttering advanced key view
|
2015-02-27 01:38:57 +01:00 |
|
Dominik Schürmann
|
b90335f901
|
Simplify delete key dialog
|
2015-02-27 01:30:32 +01:00 |
|
Dominik Schürmann
|
8230fb1179
|
Remove unused BadImportKeyDialogFragment
|
2015-02-27 01:26:26 +01:00 |
|
Dominik Schürmann
|
6bd4e1e5b3
|
Fix margins of dialog views
|
2015-02-27 01:26:04 +01:00 |
|
Dominik Schürmann
|
6dce7c88d8
|
Merge keybase-proof branch
|
2015-02-27 01:18:18 +01:00 |
|
Vincent Breitmoser
|
a70d80483d
|
add unit test for "no expiry where revoked user id still has expiry" case
|
2015-02-26 19:06:23 +01:00 |
|
Vincent Breitmoser
|
4ff8eca292
|
Merge branch 'development' of github.com:open-keychain/open-keychain into development
|
2015-02-26 18:54:00 +01:00 |
|
Vincent Breitmoser
|
55dd6526a6
|
split up and mark unsafe expiry-related methods
|
2015-02-26 18:53:42 +01:00 |
|
Vincent Breitmoser
|
e5bb7a35b5
|
save revocation instead of self-cert for revoked uids
|
2015-02-26 18:53:16 +01:00 |
|
Vincent Breitmoser
|
d7888d4666
|
ignore revoked user ids for primary key expiry
|
2015-02-26 18:52:54 +01:00 |
|
Adithya Abraham Philip
|
99ff9d2340
|
merged dialog
|
2015-02-26 22:26:40 +05:30 |
|
Dominik Schürmann
|
1210a80a96
|
Remove old Holo design resources
|
2015-02-26 17:37:28 +01:00 |
|
Dominik Schürmann
|
93109985e7
|
Merge branch 'development' of github.com:open-keychain/open-keychain into development
|
2015-02-26 17:32:28 +01:00 |
|
Dominik Schürmann
|
4c4782bd5e
|
Hopefully fixes drop down icon for spinners on Android lower 5
|
2015-02-26 17:32:08 +01:00 |
|
Adithya Abraham Philip
|
ec353b0c39
|
initial Log Display function
|
2015-02-26 21:58:25 +05:30 |
|
Vincent Breitmoser
|
ad8209bd94
|
pre-select certification key if only one is available
|
2015-02-26 10:48:17 +01:00 |
|
Dominik Schürmann
|
72acaaa41f
|
Fingerprint verification, design fixes for qr code card
|
2015-02-26 02:06:57 +01:00 |
|
Dominik Schürmann
|
a38f84a401
|
Dont show verification icons in my key view, hide edit button for non-secret keys
|
2015-02-25 21:53:46 +01:00 |
|
Dominik Schürmann
|
b521162ef0
|
Invoke NFC button
|
2015-02-25 20:50:34 +01:00 |
|
Dominik Schürmann
|
0931c7742b
|
Other icon for key exchange
|
2015-02-25 20:20:39 +01:00 |
|
Dominik Schürmann
|
57fa702cbf
|
Design fixes for header, QR Code shared element transitions
|
2015-02-25 19:38:13 +01:00 |
|
Dominik Schürmann
|
27263edda5
|
CardView and more header design
|
2015-02-25 18:37:31 +01:00 |
|
Dominik Schürmann
|
4ea59f79cc
|
Use material icon for safeslinger
|
2015-02-25 15:18:00 +01:00 |
|
Dominik Schürmann
|
8ddca4f8fe
|
Fix menu
|
2015-02-25 13:49:54 +01:00 |
|