Vincent Breitmoser
|
a9c9b6132c
|
Merge branch 'master' into certs
Conflicts:
OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/pgp/PgpKeyHelper.java
OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/provider/ProviderHelper.java
|
2014-03-12 23:45:21 +01:00 |
|
Dominik Schürmann
|
217f4a1cef
|
Merge pull request #396 from bhargavgolla/Lint-error-fix
Lint error fix after testing
|
2014-03-12 22:28:25 +01:00 |
|
Dominik Schürmann
|
65633112a0
|
Merge pull request #404 from uberspot/master
Change colorizing of fingerprint to use SHA1 based on apg's commit 67ffc
|
2014-03-12 22:12:51 +01:00 |
|
Dominik Schürmann
|
c8c8d8f4b6
|
Merge pull request #405 from honnel/checkstyle
Checkstyle configuration information reworked
|
2014-03-12 22:10:11 +01:00 |
|
Dominik Schürmann
|
0749eef1c5
|
Merge pull request #406 from Emantor/tests_and_travis
Reduce travis library installation overhead
|
2014-03-12 22:09:50 +01:00 |
|
Daniel Hammann
|
1df4d4a9e0
|
Added Windows section to CheckStyle configuration information part (and splitted Linux and MacOSX up).
|
2014-03-12 21:33:13 +01:00 |
|
Daniel Hammann
|
6ca58dd211
|
Merge branch 'master' of https://github.com/openpgp-keychain/openpgp-keychain
|
2014-03-12 20:44:33 +01:00 |
|
Emantor
|
5848172621
|
Reduce library installation overhead
|
2014-03-12 20:33:08 +01:00 |
|
uberspot
|
e909b6bb9d
|
change colorizing of fingerprint to use SHA1 based on apg's commit 67ffc24526
|
2014-03-12 19:14:13 +02:00 |
|
Vincent Breitmoser
|
69f5bf6b57
|
Merge branch 'unified-keylist'
Conflicts:
OpenPGP-Keychain/src/main/AndroidManifest.xml
OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/KeyListActivity.java
OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/KeyListPublicFragment.java
OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/KeyListSecretActivity.java
OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/KeyListSecretFragment.java
OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/adapter/KeyListPublicAdapter.java
OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/adapter/KeyListSecretAdapter.java
OpenPGP-Keychain/src/main/res/layout/key_list_secret_item.xml
OpenPGP-Keychain/src/main/res/menu/key_list.xml
OpenPGP-Keychain/src/main/res/menu/key_list_multi.xml
OpenPGP-Keychain/src/main/res/menu/key_list_secret_multi.xml
|
2014-03-12 18:05:28 +01:00 |
|
Dominik Schürmann
|
a9e5619a14
|
Merge pull request #395 from uberspot/master
Remove duplicate code from ActionBarHelper. Add export in multiselect.
|
2014-03-12 16:23:22 +01:00 |
|
Dominik Schürmann
|
5a5509053f
|
Merge pull request #397 from tharinduwijewardane/master
Fix for Issue #393 ( PublicKeyListFragment: Query not really resetted )
|
2014-03-12 16:12:35 +01:00 |
|
Dominik Schürmann
|
c7f4fc72d8
|
Merge pull request #402 from mb-14/hkpget
Fix error in importing/updating keys from keyserver by removing extra 0x
|
2014-03-12 15:59:47 +01:00 |
|
Miroojin Bakshi
|
11b19f0fce
|
Fix error in importing/updating keys from keyserver by removing extra 0x
|
2014-03-12 20:14:56 +05:30 |
|
Vincent Breitmoser
|
edb98c67f4
|
add certify action button to viewkeymainfragment
|
2014-03-12 03:10:46 +01:00 |
|
Vincent Breitmoser
|
3d8d22c9ed
|
add empty view to viewkeycertsfragment
|
2014-03-12 02:47:19 +01:00 |
|
Vincent Breitmoser
|
20193e0992
|
add menu to viewcertactivity
|
2014-03-12 02:30:49 +01:00 |
|
Vincent Breitmoser
|
84598dd665
|
add view cert activity
|
2014-03-12 02:25:48 +01:00 |
|
uberspot
|
b955c3de01
|
Add Email suggestions in Create Key activity
|
2014-03-12 02:04:04 +02:00 |
|
uberspot
|
d586ad288d
|
fix plenty of lint warnings, make some for loops into foreach, remove unused imports and throw exceptions
|
2014-03-11 23:42:45 +02:00 |
|
uberspot
|
317595dc72
|
Added initial xml and readme info for checkstyle
|
2014-03-11 23:41:21 +02:00 |
|
Tharindu Wijewardane
|
e2ec5a3882
|
Issue #393 ( PublicKeyListFragment: Query not really resetted ) : Fixed
|
2014-03-11 11:04:31 +05:30 |
|
Tharindu Wijewardane
|
03b0e43aa2
|
Merge pull request #1 from openpgp-keychain/master
updating my fork
|
2014-03-11 09:14:46 +05:30 |
|
Bhargav Golla
|
15d94c51bb
|
Removing tab
|
2014-03-10 23:20:30 -04:00 |
|
Bhargav Golla
|
b4022b9a24
|
Removing unused string
|
2014-03-10 23:19:10 -04:00 |
|
Bhargav Golla
|
31ffcb5db0
|
Merge remote-tracking branch 'upstream/master' into Lint-error-fix
|
2014-03-10 23:17:00 -04:00 |
|
Vincent Breitmoser
|
57873650b1
|
forgot to commit two layout files
|
2014-03-11 03:19:41 +01:00 |
|
Vincent Breitmoser
|
3ed93b7671
|
add "show unknown signatures" button
|
2014-03-11 03:19:12 +01:00 |
|
uberspot
|
e8122df35d
|
minor clean up in colorize method
|
2014-03-11 04:13:58 +02:00 |
|
uberspot
|
43a20ad1da
|
Add export... button and functionality in multi-select
|
2014-03-11 03:53:00 +02:00 |
|
Vincent Breitmoser
|
8b4a63d5c4
|
add keys we don't know about, just for fun
|
2014-03-11 02:40:57 +01:00 |
|
Vincent Breitmoser
|
74027abdad
|
experimental cert list, proper
|
2014-03-11 02:40:41 +01:00 |
|
uberspot
|
361c45a481
|
Make export work with rowIds instead of MasterKeyIds
|
2014-03-11 03:22:05 +02:00 |
|
uberspot
|
d937317012
|
Remove duplicate code from ActionBarHelper. You can now set the drawables via the method calls
|
2014-03-11 01:50:17 +02:00 |
|
Dominik Schürmann
|
c9b117b706
|
more tight layout
|
2014-03-11 00:31:13 +01:00 |
|
Dominik Schürmann
|
50ed5db001
|
cleanup
|
2014-03-11 00:28:28 +01:00 |
|
Dominik Schürmann
|
05126a7d15
|
Merge pull request #394 from sreeram-boyapati/master
linear layout edited to display test horizontally #391
|
2014-03-11 00:25:26 +01:00 |
|
Sreeram Boyapati
|
dc865427e3
|
linear layout edited to display test horizontally
|
2014-03-11 04:50:15 +05:30 |
|
Dominik Schürmann
|
7fc80be660
|
Merge pull request #392 from honnel/cursor-reset2
Reset cursor query when closing search view #386
|
2014-03-11 00:15:22 +01:00 |
|
Vincent Breitmoser
|
3b38ffe55e
|
experimental cert display
|
2014-03-11 00:14:38 +01:00 |
|
Vincent Breitmoser
|
7a8db90425
|
join cert info into query routines
|
2014-03-11 00:14:04 +01:00 |
|
Vincent Breitmoser
|
ba7613dc34
|
experimental cert import
|
2014-03-11 00:13:03 +01:00 |
|
Daniel Hammann
|
77ebfd0875
|
Merge branch 'master' of https://github.com/openpgp-keychain/openpgp-keychain
|
2014-03-11 00:12:45 +01:00 |
|
Vincent Breitmoser
|
74f8ec0365
|
certs: close in from both sides :)
|
2014-03-11 00:11:27 +01:00 |
|
Vincent Breitmoser
|
535f2caf2c
|
(preliminary) certs table
|
2014-03-11 00:09:11 +01:00 |
|
Daniel Hammann
|
506782b689
|
OnFocusChangeListener replaced with OnActionExpandListener
For same behaviour like contacts app #386 #387
|
2014-03-11 00:07:53 +01:00 |
|
Dominik Schürmann
|
3f5de1eac6
|
Merge pull request #390 from uberspot/master
Appropriate save Icon in EditKeyActivity fixes #382
|
2014-03-10 23:48:53 +01:00 |
|
uberspot
|
3cad8b6248
|
Appropriate save Icon in EditKeyActivity
|
2014-03-11 00:46:25 +02:00 |
|
Dominik Schürmann
|
612ad9e6b3
|
Merge pull request #383 from sreeram-boyapati/master
Fix to passphrase dialog and Issue #207
|
2014-03-10 23:20:07 +01:00 |
|
Dominik Schürmann
|
8fa62161df
|
More fixes for KeychainIntentServiceHandler
|
2014-03-10 22:46:30 +01:00 |
|