moparisthebest/open-keychain
1
0
Fork 0
mirror of https://github.com/moparisthebest/open-keychain synced 2025-02-01 23:50:18 -05:00
Code Issues Releases Wiki Activity
1,295 Commits 12 Branches 24 Tags 116 MiB
c1e16995db
Commit Graph

59 Commits

Author SHA1 Message Date
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
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
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
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
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
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
Bhargav Golla
b90e680ff9 Lint changes after testing 2014-03-10 14:59:15 -04:00
Dominik Schürmann
d91e2673d7 Revert "Lint changes" 
This reverts commit e00436b409.
 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
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
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
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
uberspot
c1c462db4f move hardcode strings to strings.xml 2014-03-07 22:35:49 +02:00
Miroojin Bakshi
2e2a9bc967 Add option for sharing encrypted file. 2014-03-07 21:16:58 +05:30
Dominik Schürmann
3d944483d3 Merge pull request #344 from ankushb92/ankush2 
#338
 2014-03-06 21:59:56 +01:00
Ankush
8e29b82d6d corrected commit 
mCurrentPassPhrase, mChangePassPhrase

Minor variable naming Issue #338
 2014-03-07 00:43:09 +05:30
uberspot
1cf912de2b Multiselect: Create 'select all' in public and secret keylist 2014-03-06 20:32:27 +02:00
Miroojin Bakshi
127ab0fd81 Use string from strings.xml 2014-03-06 01:27:35 +05:30
Dominik Schürmann
07bb421da5 Merge pull request #315 from jessicayuen/master 
#226: Added cancel option to ProgressDialogFragments. Create Key is now cancelable.
 2014-03-04 10:51:26 +01:00
Daniel Haß
d691d4c965 Added handling for other exceptions in the ImportListLoader. 2014-03-03 20:42:38 +01:00
Dominik Schürmann
94e161fe0d change ordering in Intent descriptions for better readability in small dialogs 2014-03-03 15:45:53 +01:00
Daniel Haß
6362b2de94 Added FileHasNoContent string 2014-03-03 09:36:40 +01:00
Jessica Yuen
1baae3775e #226: Added cancel option to ProgressDialogFragments. Create Key is now cancelable. 2014-03-02 15:08:18 -05:00
Daniel Haß
c60ec7a8a7 Added error strings for key import from keyserver 2014-02-27 22:10:07 +01:00
Dominik Schürmann
b4f977673f rename to OpenKeychain 2014-02-21 01:03:20 +01:00
Dominik Schürmann
d23950f799 add integrity check 2014-02-18 22:59:00 +01:00
Dominik Schürmann
9b4245739e merge internal signText and signAndEncrypt methods 2014-02-18 22:47:26 +01:00
Dominik Schürmann
b97a099598 warn that key generation takes looong 2014-02-15 17:09:55 +01:00
Dominik Schürmann
52f1c930eb parse string util method, better help text for access screen 2014-02-15 13:00:47 +01:00
Dominik Schürmann
acad2ba957 PendingIntent to handle user input 2014-02-14 13:40:24 +01:00
Dominik Schürmann
7b819e65de Transifex update 2014-02-13 23:37:48 +01:00
Dominik Schürmann
0c4b809195 rework key view into fragments to later add certifications 2014-02-09 21:17:30 +01:00
Dominik Schürmann
754b2a6cb1 Restructuring for new API library 2014-02-09 19:22:14 +01:00
Dominik Schürmann
76806ebd57 language fixes 2014-02-08 15:42:31 +01:00
Dominik Schürmann
616c903a2a do not delete pub keys where secret key exists 2014-02-06 01:02:18 +01:00
Dominik Schürmann
09ae50cc56 keyserver instead of key server 2014-02-05 13:09:59 +01:00
Dominik Schürmann
b203723b20 fix small language confusion 2014-02-05 12:52:25 +01:00
Dominik Schürmann
d090d4d332 work on lookup key, fix some illegal state exceptions with hack 2014-02-04 19:53:50 +01:00