aboutsummaryrefslogtreecommitdiffstats
path: root/OpenPGP-Keychain/src/main/res
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'unified-keylist'Vincent Breitmoser2014-03-1213-133/+111
|\
| * add contact count to My Keys headerVincent Breitmoser2014-03-082-1/+20
| * ditch old key list activitiesVincent Breitmoser2014-03-0811-289/+1
| * add edit button and secret key info to public key viewVincent Breitmoser2014-03-082-1/+35
| * move some placeholders into resourcesVincent Breitmoser2014-03-082-2/+4
| * working unified list (no actions yet)Vincent Breitmoser2014-03-083-2/+97
| * copy public keylist as stub for unified keylistVincent Breitmoser2014-03-064-0/+124
* | Add Email suggestions in Create Key activityuberspot2014-03-121-1/+1
* | fix plenty of lint warnings, make some for loops into foreach, remove unused ...uberspot2014-03-113-3/+0
* | Add export... button and functionality in multi-selectuberspot2014-03-112-0/+8
* | Remove duplicate code from ActionBarHelper. You can now set the drawables via...uberspot2014-03-113-92/+0
* | more tight layoutDominik Schürmann2014-03-111-12/+10
* | linear layout edited to display test horizontallySreeram Boyapati2014-03-111-1/+4
* | Appropriate save Icon in EditKeyActivityuberspot2014-03-117-0/+92
* | Merge pull request #383 from sreeram-boyapati/masterDominik Schürmann2014-03-103-7/+26
|\ \
| * | Added string reference for Issue #207Sreeram Boyapati2014-03-101-0/+2
| * | Fix to passphrase dialog and Issue #207Sreeram Boyapati2014-03-102-7/+24
* | | 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
* | | Merge pull request #381 from bhargavgolla/Lint-error-fixDominik Schürmann2014-03-1011-23/+16
|\ \ \
| * | | Lint changesBhargav Golla2014-03-1011-23/+16
| |/ /
* | | 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 bar while key creation - added plurals based on no.of keys while key...grait2014-03-091-1/+6
| * | | 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 #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
|\ \ \ \ | |_|/ / |/| | |
| * | | 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
|\ \ \ \
| * | | | 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, be...Dominik Schürmann2014-03-072-8/+7
* | | | 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
|\ \ \
| * | | corrected commitAnkush2014-03-0714-20/+20
* | | | 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 SelectPublicKeyFragmentMiroojin Bakshi2014-03-061-0/+8
| * | | Implement search for KeyListPublicFragmentMiroojin Bakshi2014-03-062-1/+6
* | | | Merge branch 'master' of https://github.com/openpgp-keychain/openpgp-keychain...Miroojin Bakshi2014-03-0617-305/+376
|\| | |
| * | | Merge pull request #339 from uberspot/masterDominik Schürmann2014-03-054-16/+87
| |\ \ \
| | * | | Put Preferences in subscreenuberspot2014-03-054-16/+87
generated by cgit v1.2.3 (git 2.25.1) at 2024-07-17 22:54:45 +0000