moparisthebest/open-keychain
1
0
Fork 0
mirror of https://github.com/moparisthebest/open-keychain synced 2024-11-30 12:32:17 -05:00
Code Issues Releases Wiki Activity
1,215 Commits 12 Branches 24 Tags 116 MiB
b90e680ff9
Commit Graph

1215 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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 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
Dominik Schürmann
83c346fec4 Make code more tidy for multiselect 2014-03-10 17:49:30 +01:00
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
caa0740919 Improve hightlight query code: make cursor abstract, tidy up code 2014-03-10 17:22:19 +01:00
Dominik Schürmann
70d1e01a2b Merge pull request #384 from mb-14/search1 
Highlight search query in SelectPublicKeyFragment and KeyListPublicFragment
 2014-03-10 17:05:09 +01:00
Dominik Schürmann
2166d66680 Cleanup ImportKeysListEntry 2014-03-10 17:06:11 +01:00
Dominik Schürmann
6a8fa61908 remove double definition of progress_generating 2014-03-10 16:58:58 +01:00
Miroojin Bakshi
b8261d7319 Merge remote-tracking branch 'upstream/master' into search1 2014-03-10 21:11:14 +05:30
Miroojin Bakshi
98da2d0c48 Create custom HighlightQueryCursorAdapter 2014-03-10 21:10:04 +05:30
Dominik Schürmann
3372cfacb6 Merge pull request #385 from tharinduwijewardane/master 
Issue #378 ( private keys are no longer red ): Fixed
 2014-03-10 16:02:58 +01:00
Tharindu Wijewardane
2b4b09d13c Issue #378 ( private keys are no longer red ): Fixed 2014-03-10 17:10:16 +05:30
Miroojin Bakshi
b927c0f26a Highlight search query in SelectPublicKeyFragment and 
KeyListPublicFragment
 2014-03-10 15:25:09 +05:30
Dominik Schürmann
8d85aa5876 remove unneeded replace for newline on fingerprint 2014-03-09 23:51:18 +01:00
Dominik Schürmann
a8add47238 Merge pull request #380 from uberspot/master 
Colorize fingerprint
 2014-03-09 23:48:51 +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
Dominik Schürmann
9a7a7f2b01 Merge pull request #372 from rafaelav/master 
Issue #178 - Hide advanced options in EncryptActivity
 2014-03-09 23:18:50 +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
grait
7b8668a7e3 Merge branch 'develop' into master2 2014-03-09 14:44:20 +05:30
uberspot
059e57c5d0 Colorize fingerprint 2014-03-09 04:14:23 +02:00
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
Nikhil Peter Raj
14b3807811 Revised fix for #347 2014-03-09 01:32:41 +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
Dominik Schürmann
402aeeabf3 use parameter in updateFromKeyserver 2014-03-08 17:19:57 +01:00
Nikhil Peter Raj
b29c430959 Fix for #347 2014-03-08 15:28:46 +05:30
Dominik Schürmann
db05b3043a beta4 2014-03-08 00:17:24 +01:00
Dominik Schürmann
0e33fd2392 Split api libs into OpenKeychain specific and OpenPGP Provider lib 2014-03-07 23:05:03 +01:00
grait
3fbda4245c progress is shown when creating the default key based on number of keys created so far 2014-03-08 03:27:22 +05:30
Dominik Schürmann
2737aedca7 Revert "Fix for #347" 
This reverts commit dd80ddd6f9.
 2014-03-07 22:48:20 +01:00
Dominik Schürmann
882333ce05 Merge pull request #366 from uberspot/master 
Minor code clean up
 2014-03-07 22:39:53 +01:00
Dominik Schürmann
7b1e3fef19 Merge pull request #367 from hav3n/branch-fixes 
Fix for #347
 2014-03-07 22:39:20 +01:00
Dominik Schürmann
def9e5a492 Move search view into onCreateView, fixes #365 2014-03-07 22:37:38 +01:00
uberspot
477d06c43a removed useless semicolons, fixed some parameters in documenation, simplified some conditionals 2014-03-07 22:35:49 +02:00
uberspot
c1c462db4f move hardcode strings to strings.xml 2014-03-07 22:35:49 +02:00
uberspot
ca851ba21f remove unused imports and unthrown exceptions 2014-03-07 22:35:49 +02:00
Nikhil Peter Raj
dd80ddd6f9 Fix for #347 2014-03-08 02:04:50 +05:30
Dominik Schürmann
a1be0d302b move search view from activity to fragment by setting it as a list header, better reusability! Required for service activites 2014-03-07 21:32:24 +01:00
Dominik Schürmann
3572571391 Reworking main KeyListPublicFragment to get progress indicator 2014-03-07 20:58:33 +01:00
Dominik Schürmann
0a0bdad5b5 Merge branch 'master' of github.com:openpgp-keychain/openpgp-keychain 2014-03-07 19:50:50 +01:00
Dominik Schürmann
ba61e69a7d Cleanup code, search with preceeding % 2014-03-07 19:50:36 +01:00
Dominik Schürmann
e4736736b0 Merge pull request #361 from mb-14/file 
Add option for  sharing encrypted file.
 2014-03-07 18:37:22 +01:00
Miroojin Bakshi
2e2a9bc967 Add option for sharing encrypted file. 2014-03-07 21:16:58 +05:30
Dominik Schürmann
59067f9f8b API: get key 2014-03-07 11:24:53 +01:00
Dominik Schürmann
53ba741810 Fix API docs 2014-03-07 11:05:11 +01:00
Dominik Schürmann
a3f17be192 Fix API docs 2014-03-07 10:54:36 +01:00