moparisthebest/open-keychain
1
0
Fork 0
mirror of https://github.com/moparisthebest/open-keychain synced 2025-02-26 16:31:46 -05:00
Code Issues Releases Wiki Activity
1,566 Commits 12 Branches 24 Tags
Commit Graph

82 Commits

Author SHA1 Message Date
Dominik Schürmann
19e5a3815a language 2014-04-01 15:36:27 +02:00
Dominik Schürmann
6e705e5519 Language clarifications 2014-04-01 15:19:12 +02:00
Dominik Schürmann
b020f950e1 Merge branch 'master' of github.com:openpgp-keychain/openpgp-keychain 2014-04-01 13:31:57 +02:00
Dominik Schürmann
4c3506f4b1 Experimental work on a fragment-based encrypt activity 2014-04-01 13:25:44 +02:00
Ashley Hughes
9283205ea8 don't disable save button, show message if nothing needs to be done 2014-04-01 00:37:18 +01:00
Dominik Schürmann
2947ab7e48 More experimental work on decrypt fragments 2014-03-30 19:32:05 +02:00
Ashley Hughes
e1d07214df merge master 2014-03-29 13:21:39 +00:00
Dominik Schürmann
ac134790a0 Text for creation of new api accounts 2014-03-26 18:23:48 +01:00
Dominik Schürmann
92a4d0e914 Part 2 of basic user interface for api accounts 2014-03-26 13:21:29 +01:00
Dominik Schürmann
cff35ca842 More experimental work on api accounts 2014-03-25 21:23:59 +01:00
Dominik Schürmann
8fead6fddb Merge pull request #458 from hav3n/branch-delete-fix 
New Fix for #410
 2014-03-21 09:59:19 +01:00
Daniel Hammann
e00eeab1bf UI-Icon-Modifying #429 added hint to text edit, different icons for share and clipboard button 2014-03-20 22:49:59 +01:00
Nikhil Peter Raj
2816461283 Fix for #410 2014-03-21 01:50:20 +05:30
gogowitczak
19e962481d Note about blocked possibility to generate weak (<1024) RSA key. 2014-03-18 23:30:42 +01:00
Dominik Schürmann
72a5d6d870 Merge pull request #431 from honnel/ui-modification 
Ui modification
 2014-03-18 14:57:32 +01:00
Dominik Schürmann
711a51f7fc Merge pull request #430 from Valodim/certify 
Revamp certify dialogue
 2014-03-18 14:43:20 +01:00
Daniel Hammann
b39d37f59c #429 4) 
In the clicking for a particular contact , two icon in the actionbar show the same hint ('Share'). Second
icon hint can be 'Keyserver' or just only 'server'
 2014-03-17 22:17:05 +01:00
Vincent Breitmoser
87004fd0ca certify: preserve user id certificates when saving secret keys 2014-03-17 14:11:32 +01:00
Vincent Breitmoser
1de0312bb5 certify: revamp certifykeyactivity 
show info on the key to be certified, along with a list of (selectable)
user ids. user ids are handed through to the signing service, but not
yet handled.
 2014-03-15 18:20:49 +01:00
uberspot
e387dd7c54 Fix export for new unified key list #409 2014-03-15 01:51:01 +02: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 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
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
Ashley Hughes
fba0e2af1d keep up with master 2014-03-07 15:16:13 +00:00
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