aboutsummaryrefslogtreecommitdiffstats
path: root/OpenPGP-Keychain/src/main/res
Commit message (Expand)AuthorAgeFilesLines
* keep up with masterAshley Hughes2014-03-0773-550/+999
|\
| * 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
| | * | Lint Issue:Daniel Hammann2014-03-0510-263/+263
| | |/
| | * 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 cance...Jessica Yuen2014-03-021-0/+1
| * | 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
| * Update help_start.htmlDominik Schürmann2014-02-231-1/+1
* | master mergeAshley Hughes2014-02-2295-807/+2265
|\|
| * 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
| * certifications textDominik Schürmann2014-02-191-0/+7
| * add integrity checkDominik Schürmann2014-02-181-0/+1
| * merge internal signText and signAndEncrypt methodsDominik Schürmann2014-02-181-1/+1
| * fix marginsDominik Schürmann2014-02-171-2/+2
| * prevent key view from scrolling, move encrypt button down againDominik Schürmann2014-02-171-17/+21
| * warn that key generation takes looongDominik Schürmann2014-02-151-1/+1
| * parse string util method, better help text for access screenDominik Schürmann2014-02-151-1/+1
| * PendingIntent to handle user inputDominik Schürmann2014-02-141-1/+1
| * Transifex updateDominik Schürmann2014-02-1312-5/+360
| * Layout fixes for registered appsDominik Schürmann2014-02-134-149/+150
| * Pull from transifexDominik Schürmann2014-02-097-10/+58
| * rework key view into fragments to later add certificationsDominik Schürmann2014-02-096-231/+267
| * Restructuring for new API libraryDominik Schürmann2014-02-091-1/+1
| * Update from transifexDominik Schürmann2014-02-0834-186/+315
| * language fixesDominik Schürmann2014-02-081-3/+7
| * do not delete pub keys where secret key existsDominik Schürmann2014-02-061-0/+2
| * Fix wordingDominik Schürmann2014-02-051-2/+2
| * keyserver instead of key serverDominik Schürmann2014-02-054-15/+15
| * fix certify key resourceDominik Schürmann2014-02-051-1/+1
| * Update from transifexDominik Schürmann2014-02-0523-236/+422
generated by cgit v1.2.3 (git 2.25.1) at 2024-07-09 21:51:11 +0000