aboutsummaryrefslogtreecommitdiffstats
path: root/OpenPGP-Keychain/src/main/res
Commit message (Collapse)AuthorAgeFilesLines
* Pull from transifexDominik Schürmann2014-03-1023-269/+828
|
* @color/white instead of hexDominik Schürmann2014-03-101-1/+1
|
* Revert "Lint changes"Dominik Schürmann2014-03-1011-16/+23
| | | | This reverts commit e00436b4096466af37b3e32c3f3277c3604d85ee.
* Merge pull request #381 from bhargavgolla/Lint-error-fixDominik Schürmann2014-03-1011-23/+16
|\ | | | | Lint changes #223
| * Lint changesBhargav Golla2014-03-1011-23/+16
| | | | | | | | | | | | Deleting lint-report gen files Adding lint output files to gitignore
* | remove double definition of progress_generatingDominik Schürmann2014-03-101-1/+0
| |
* | Merge pull request #368 from ajit766/masterDominik Schürmann2014-03-091-0/+5
|\ \ | | | | | | progress is shown when creating the default key based on number of keys created till then
| * | progress bar while key creation - added plurals based on no.of keys while ↵grait2014-03-091-1/+6
| | | | | | | | | | | | key creation
| * | progress bar during key creation - minor text changegrait2014-03-091-1/+1
| | |
* | | Issue #178 - Hide advanced options in EncryptActivityrafaelav2014-03-092-40/+76
|/ /
* | Merge pull request #369 from hav3n/branch-fixesDominik Schürmann2014-03-091-2/+2
|\ \ | | | | | | Fix for #347
| * | Fix for #347Nikhil Peter Raj2014-03-081-2/+2
| | |
* | | Fix key id and fingerprint handling, use full key idsDominik Schürmann2014-03-091-1/+1
| | |
* | | Merge pull request #316 from danielhass/import-errorDominik Schürmann2014-03-081-0/+6
|\ \ \ | |_|/ |/| | Show error if file import has no content
| * | Added handling for other exceptions in the ImportListLoader.Daniel Haß2014-03-031-0/+5
| | |
| * | Added FileHasNoContent stringDaniel Haß2014-03-031-0/+1
| | |
* | | Merge pull request #366 from uberspot/masterDominik Schürmann2014-03-0710-10/+13
|\ \ \ | | | | | | | | Minor code clean up
| * | | move hardcode strings to strings.xmluberspot2014-03-0710-10/+13
| | | |
* | | | Move search view into onCreateView, fixes #365Dominik Schürmann2014-03-071-7/+0
|/ / /
* | | move search view from activity to fragment by setting it as a list header, ↵Dominik Schürmann2014-03-072-8/+7
| | | | | | | | | | | | better reusability! Required for service activites
* | | Reworking main KeyListPublicFragment to get progress indicatorDominik Schürmann2014-03-071-54/+85
| |/ |/|
* | Add option for sharing encrypted file.Miroojin Bakshi2014-03-072-0/+15
| |
* | Merge pull request #344 from ankushb92/ankush2Dominik Schürmann2014-03-0614-20/+20
|\ \ | | | | | | #338
| * | corrected commitAnkush2014-03-0714-20/+20
| | | | | | | | | | | | | | | | | | mCurrentPassPhrase, mChangePassPhrase Minor variable naming Issue #338
* | | Multiselect: Create 'select all' in public and secret keylistuberspot2014-03-067-0/+9
| | |
* | | add lock icon for 'Encrypt to..' multiselect optionuberspot2014-03-065-0/+1
| | |
* | | Add search icon for other dpiuberspot2014-03-063-0/+0
| | |
* | | Merge pull request #342 from mb-14/searchDominik Schürmann2014-03-063-1/+14
|\ \ \ | |/ / |/| | Implement search for KeyListPublicFragment and SelectPublicKeyFragment
| * | Implement search for SelectPublicKeyFragmentMiroojin Bakshi2014-03-061-0/+8
| | |
| * | Implement search for KeyListPublicFragmentMiroojin Bakshi2014-03-062-1/+6
| | |
* | | Merge branch 'master' of ↵Miroojin Bakshi2014-03-0617-305/+376
|\| | | | | | | | | | | https://github.com/openpgp-keychain/openpgp-keychain into datefix
| * | Merge pull request #339 from uberspot/masterDominik Schürmann2014-03-054-16/+87
| |\ \ | | | | | | | | Put Preferences in subscreen
| | * | Put Preferences in subscreenuberspot2014-03-054-16/+87
| | | |
| * | | Lint Issue:Daniel Hammann2014-03-0510-263/+263
| |/ / | | | | | | | | | | | | | | | TypographyEllipsis: Ellipsis string can be replaced with ellipsis character Replace "..." with ellipsis character (…, …) ... -> …
| * | Update from transifexDominik Schürmann2014-03-048-26/+26
| | |
* | | Use string from strings.xmlMiroojin Bakshi2014-03-061-0/+1
|/ /
* | Merge pull request #315 from jessicayuen/masterDominik Schürmann2014-03-041-0/+1
|\ \ | | | | | | #226: Added cancel option to ProgressDialogFragments. Create Key is now cancelable.
| * | #226: Added cancel option to ProgressDialogFragments. Create Key is now ↵Jessica Yuen2014-03-021-0/+1
| | | | | | | | | | | | cancelable.
* | | Merge branch 'master' of github.com:openpgp-keychain/openpgp-keychainDominik Schürmann2014-03-033-6/+6
|\ \ \
| * | | Fix ScrollViewSize Lint WarningsEmantor2014-03-033-6/+6
| | |/ | |/|
* / | change ordering in Intent descriptions for better readability in small dialogsDominik Schürmann2014-03-031-4/+4
|/ /
* / Update from transifexDominik Schürmann2014-03-0239-276/+626
|/
* Added error strings for key import from keyserverDaniel Haß2014-02-271-0/+3
|
* Removed Thumbs.db,added to gitignoreNikhil Peter Raj2014-02-254-0/+0
|
* Fix for #266Nikhil Peter Raj2014-02-258-0/+0
| | | | | -Extra: Added the appropriate images to drawable folder from Android SDK source, can be used as alternative if required.
* Update help_start.htmlDominik Schürmann2014-02-231-1/+1
|
* renameDominik Schürmann2014-02-212-7/+7
|
* rename to OpenKeychainDominik Schürmann2014-02-212-8/+8
|
* Updated library section (AppMsg library)Daniel Haß2014-02-201-1/+2
|
* Update from transifexDominik Schürmann2014-02-1915-123/+344
|
generated by cgit v1.2.3 (git 2.25.1) at 2024-07-12 06:18:46 +0000