aboutsummaryrefslogtreecommitdiffstats
path: root/OpenPGP-Keychain/src/main
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #397 from tharinduwijewardane/masterDominik Schürmann2014-03-121-0/+1
|\
| * Issue #393 ( PublicKeyListFragment: Query not really resetted ) : FixedTharindu Wijewardane2014-03-111-0/+1
* | Fix error in importing/updating keys from keyserver by removing extra 0xMiroojin Bakshi2014-03-121-1/+1
|/
* more tight layoutDominik Schürmann2014-03-111-12/+10
* cleanupDominik Schürmann2014-03-112-43/+37
* Merge pull request #394 from sreeram-boyapati/masterDominik Schürmann2014-03-111-1/+4
|\
| * linear layout edited to display test horizontallySreeram Boyapati2014-03-111-1/+4
* | Merge pull request #392 from honnel/cursor-reset2Dominik Schürmann2014-03-111-0/+14
|\ \ | |/ |/|
| * OnFocusChangeListener replaced with OnActionExpandListenerDaniel Hammann2014-03-111-6/+10
| * Reset cursor query when closing search view #386Daniel Hammann2014-03-101-0/+10
* | Appropriate save Icon in EditKeyActivityuberspot2014-03-119-1/+153
* | Merge pull request #383 from sreeram-boyapati/masterDominik Schürmann2014-03-105-39/+109
|\ \
| * | Added string reference for Issue #207Sreeram Boyapati2014-03-102-4/+6
| * | ViewHolder Pattern ImplementedSreeram Boyapati2014-03-101-26/+39
| * | Fix to passphrase dialog and Issue #207Sreeram Boyapati2014-03-103-13/+68
* | | More fixes for KeychainIntentServiceHandlerDominik Schürmann2014-03-101-41/+43
* | | Pull from transifexDominik Schürmann2014-03-1023-269/+828
* | | getString before init of KeychainIntentHandlerDominik Schürmann2014-03-109-62/+49
* | | Fix progress_generating and reformatDominik Schürmann2014-03-101-1/+1
* | | Fix progress_generating and reformatDominik Schürmann2014-03-106-61/+93
| |/ |/|
* | @color/white instead of hexDominik Schürmann2014-03-101-1/+1
* | Revert "Lint changes"Dominik Schürmann2014-03-1012-18/+23
* | Merge pull request #381 from bhargavgolla/Lint-error-fixDominik Schürmann2014-03-1012-23/+18
|\ \
| * | Lint changesBhargav Golla2014-03-1012-23/+18
* | | Make code more tidy for multiselectDominik Schürmann2014-03-104-44/+10
* | | Improve hightlight query code: make cursor abstract, tidy up codeDominik Schürmann2014-03-104-55/+51
* | | Merge pull request #384 from mb-14/search1Dominik Schürmann2014-03-105-8/+79
|\ \ \
| * \ \ Merge remote-tracking branch 'upstream/master' into search1Miroojin Bakshi2014-03-101-0/+3
| |\ \ \
| * | | | Create custom HighlightQueryCursorAdapterMiroojin Bakshi2014-03-103-68/+70
| * | | | Highlight search query in SelectPublicKeyFragment andMiroojin Bakshi2014-03-104-3/+72
* | | | | Cleanup ImportKeysListEntryDominik Schürmann2014-03-101-4/+6
* | | | | remove double definition of progress_generatingDominik Schürmann2014-03-101-1/+0
| |/ / / |/| | |
* | | | Merge pull request #385 from tharinduwijewardane/masterDominik Schürmann2014-03-101-0/+3
|\ \ \ \ | |/ / / |/| | |
| * | | Issue #378 ( private keys are no longer red ): FixedTharindu Wijewardane2014-03-101-0/+3
* | | | remove unneeded replace for newline on fingerprintDominik Schürmann2014-03-091-2/+1
* | | | Merge pull request #380 from uberspot/masterDominik Schürmann2014-03-092-12/+28
|\ \ \ \
| * | | | Colorize fingerprintuberspot2014-03-092-12/+28
| |/ / /
* | | | Merge pull request #368 from ajit766/masterDominik Schürmann2014-03-093-1/+14
|\ \ \ \
| * | | | progress bar while key creation - added plurals based on no.of keys while key...grait2014-03-092-2/+8
| * | | | progress bar during key creation - minor text changegrait2014-03-091-1/+1
| * | | | Merge branch 'develop' into master2grait2014-03-0917-99/+147
| |\| | |
| * | | | progress is shown when creating the default key based on number of keys crea...grait2014-03-082-1/+8
| | |/ / | |/| |
* | | | Issue #178 - Hide advanced options in EncryptActivityrafaelav2014-03-093-40/+132
| |/ / |/| |
* | | Merge pull request #369 from hav3n/branch-fixesDominik Schürmann2014-03-092-2/+3
|\ \ \
| * | | Revised fix for #347Nikhil Peter Raj2014-03-091-11/+1
| * | | Fix for #347Nikhil Peter Raj2014-03-082-3/+14
* | | | Fix key id and fingerprint handling, use full key idsDominik Schürmann2014-03-0910-88/+78
* | | | Merge pull request #316 from danielhass/import-errorDominik Schürmann2014-03-083-6/+63
|\ \ \ \
| * | | | Fixed some namingDaniel Haß2014-03-041-7/+7
| * | | | Added exception is null option to display nothing if no error occuredDaniel Haß2014-03-041-4/+6
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-06 17:50:18 +0000