moparisthebest/open-keychain
1
0
Fork 0
mirror of https://github.com/moparisthebest/open-keychain synced 2025-02-27 00:41:54 -05:00
Code Issues Releases Wiki Activity
1,322 Commits 12 Branches 24 Tags
Commit Graph

143 Commits

Author SHA1 Message Date
Vincent Breitmoser
a73e91c49c Merge branch 'master' into certs 
Conflicts:
	OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/provider/KeychainProvider.java
	OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/provider/ProviderHelper.java
	OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/KeyListFragment.java
	OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/ViewKeyActivity.java
	OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/ViewKeyCertsFragment.java
	OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/ViewKeyMainFragment.java
 2014-03-15 00:18:50 +01:00
Dominik Schürmann
37c81400ac Fix colors in item view 2014-03-13 20:18:25 +01:00
Dominik Schürmann
c1e16995db remove unused color 2014-03-13 20:12:57 +01:00
Dominik Schürmann
ba9a4bec3a Improve list item view, borderless button for API < 11 2014-03-13 20:11:21 +01:00
Dominik Schürmann
5c5e9d8e32 Forgot faq file 2014-03-13 19:09:54 +01:00
Dominik Schürmann
908cf8e769 Add FAQ tab to help 2014-03-13 19:08:03 +01:00
Dominik Schürmann
4c5ae3cdaa Readd create key menu items 2014-03-13 19:01:24 +01:00
Dominik Schürmann
cf51e5ff56 XML cleanup and bigger filename EditText 2014-03-13 18:53:21 +01:00
Vincent Breitmoser
9a1ce093bf Merge remote-tracking branch 'origin/master' 
Conflicts:
	OpenPGP-Keychain/src/main/res/menu/key_list_secret.xml
 2014-03-13 13:40:47 +01:00
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
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
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
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
43a20ad1da Add export... button and functionality in multi-select 2014-03-11 03:53:00 +02:00
Vincent Breitmoser
74027abdad experimental cert list, proper 2014-03-11 02:40:41 +01: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
Sreeram Boyapati
dc865427e3 linear layout edited to display test horizontally 2014-03-11 04:50:15 +05:30
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
d339029ab9 Pull from transifex 2014-03-10 22:40:59 +01:00
Bhargav Golla
b90e680ff9 Lint changes after testing 2014-03-10 14:59:15 -04:00
Dominik Schürmann
da83c8ff60 @color/white instead of hex 2014-03-10 18:26:52 +01:00
Dominik Schürmann
d91e2673d7 Revert "Lint changes" 
This reverts commit e00436b4096466af37b3e32c3f3277c3604d85ee.
 2014-03-10 18:23:47 +01:00
Dominik Schürmann
ef8eb3f8b5 Merge pull request #381 from bhargavgolla/Lint-error-fix 
Lint changes #223
 2014-03-10 18:11:37 +01:00
Sreeram Boyapati
a41ee31b6c Added string reference for Issue #207 2014-03-10 22:37:23 +05:30
Bhargav Golla
e00436b409 Lint changes 
Deleting lint-report gen files

Adding lint output files to gitignore
 2014-03-10 12:42:00 -04:00
Dominik Schürmann
6a8fa61908 remove double definition of progress_generating 2014-03-10 16:58:58 +01:00
Sreeram Boyapati
7d2c3f860e Fix to passphrase dialog and Issue #207 2014-03-10 08:31:53 +05:30
Dominik Schürmann
dd28303dc1 Merge pull request #368 from ajit766/master 
progress is shown when creating the default key based on number of keys created till then
 2014-03-09 23:39:53 +01:00
rafaelav
b107766f5b Issue #178 - Hide advanced options in EncryptActivity 2014-03-09 22:30:01 +01:00
grait
4874ea567a progress bar while key creation - added plurals based on no.of keys while key creation 2014-03-09 17:45:58 +05:30
grait
e471560e25 progress bar during key creation - minor text change 2014-03-09 14:59:56 +05:30
Dominik Schürmann
50d9908baf Merge pull request #369 from hav3n/branch-fixes 
Fix for #347
 2014-03-09 02:05:23 +01:00
Dominik Schürmann
5b255a263f Fix key id and fingerprint handling, use full key ids 2014-03-09 01:49:25 +01:00
Dominik Schürmann
8dc7a72331 Merge pull request #316 from danielhass/import-error 
Show error if file import has no content
 2014-03-08 18:27:32 +01:00
Vincent Breitmoser
be558944b5 add contact count to My Keys header 2014-03-08 14:52:29 +01:00
Vincent Breitmoser
16116ba725 ditch old key list activities 2014-03-08 13:42:50 +01:00
Vincent Breitmoser
706e212b6b add edit button and secret key info to public key view 2014-03-08 13:17:52 +01:00
Vincent Breitmoser
7ad8977cf3 move some placeholders into resources 2014-03-08 12:28:20 +01:00