aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #404 from uberspot/masterDominik Schürmann2014-03-122-12/+60
|\ | | | | Change colorizing of fingerprint to use SHA1 based on apg's commit 67ffc
| * change colorizing of fingerprint to use SHA1 based on apg's commit 67ffc24526uberspot2014-03-122-12/+60
| |
* | Merge pull request #405 from honnel/checkstyleDominik Schürmann2014-03-121-6/+15
|\ \ | | | | | | Checkstyle configuration information reworked
| * | Added Windows section to CheckStyle configuration information part (and ↵Daniel Hammann2014-03-121-6/+15
| | | | | | | | | | | | splitted Linux and MacOSX up).
| * | Merge branch 'master' of https://github.com/openpgp-keychain/openpgp-keychainDaniel Hammann2014-03-1244-336/+660
| |\|
| * | Merge branch 'master' of https://github.com/openpgp-keychain/openpgp-keychainDaniel Hammann2014-03-1148-458/+1260
| |\ \
* | \ \ Merge pull request #406 from Emantor/tests_and_travisDominik Schürmann2014-03-121-1/+1
|\ \ \ \ | |_|_|/ |/| | | Reduce travis library installation overhead
| * | | Reduce library installation overheadEmantor2014-03-121-1/+1
| | | |
* | | | Merge pull request #395 from uberspot/masterDominik Schürmann2014-03-1241-281/+609
|\ \ \ \ | | | | | | | | | | Remove duplicate code from ActionBarHelper. Add export in multiselect.
| * | | | Add Email suggestions in Create Key activityuberspot2014-03-124-6/+55
| | | | |
| * | | | fix plenty of lint warnings, make some for loops into foreach, remove unused ↵uberspot2014-03-1115-24/+24
| | | | | | | | | | | | | | | | | | | | imports and throw exceptions
| * | | | Added initial xml and readme info for checkstyleuberspot2014-03-113-0/+365
| | | | |
| * | | | minor clean up in colorize methoduberspot2014-03-111-2/+3
| | | | |
| * | | | Add export... button and functionality in multi-selectuberspot2014-03-1110-12/+31
| | | | |
| * | | | Make export work with rowIds instead of MasterKeyIdsuberspot2014-03-116-53/+92
| | | | |
| * | | | Remove duplicate code from ActionBarHelper. You can now set the drawables ↵uberspot2014-03-119-187/+42
| |/ / / | | | | | | | | | | | | via the method calls
* | | | Merge pull request #397 from tharinduwijewardane/masterDominik Schürmann2014-03-121-0/+1
|\ \ \ \ | | | | | | | | | | Fix for Issue #393 ( PublicKeyListFragment: Query not really resetted )
| * | | | Issue #393 ( PublicKeyListFragment: Query not really resetted ) : FixedTharindu Wijewardane2014-03-111-0/+1
| | | | |
| * | | | Merge pull request #1 from openpgp-keychain/masterTharindu Wijewardane2014-03-1160-596/+1561
| |\| | | | | | | | | | | | | updating my fork
* | | | | Merge pull request #402 from mb-14/hkpgetDominik Schürmann2014-03-121-1/+1
|\ \ \ \ \ | |_|/ / / |/| | | | Fix error in importing/updating keys from keyserver by removing extra 0x
| * | | | 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 horizontally #391
| * | | | 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
|\ \ \ \ | |/ / / |/| | / | | |/ | |/| Reset cursor query when closing search view #386
| * | OnFocusChangeListener replaced with OnActionExpandListenerDaniel Hammann2014-03-111-6/+10
| | | | | | | | | | | | For same behaviour like contacts app #386 #387
| * | Reset cursor query when closing search view #386Daniel Hammann2014-03-101-0/+10
| | | | | | | | | | | | Without focus the search result get erased.
* | | Merge pull request #390 from uberspot/masterDominik Schürmann2014-03-109-1/+153
|\ \ \ | | | | | | | | Appropriate save Icon in EditKeyActivity fixes #382
| * | | Appropriate save Icon in EditKeyActivityuberspot2014-03-119-1/+153
|/ / /
* | | Merge pull request #383 from sreeram-boyapati/masterDominik Schürmann2014-03-105-39/+109
|\ \ \ | | | | | | | | Fix to passphrase dialog and Issue #207
| * | | 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-1014-24/+23
| | | | | | | | | | | | This reverts commit e00436b4096466af37b3e32c3f3277c3604d85ee.
* | | Merge pull request #381 from bhargavgolla/Lint-error-fixDominik Schürmann2014-03-1014-23/+24
|\ \ \ | | | | | | | | Lint changes #223
| * | | Lint changesBhargav Golla2014-03-1014-23/+24
| | | | | | | | | | | | | | | | | | | | | | | | Deleting lint-report gen files Adding lint output files to gitignore
* | | | 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
|\ \ \ \ | | | | | | | | | | Highlight search query in SelectPublicKeyFragment and KeyListPublicFragment
| * \ \ \ 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
| | | | | | | | | | | | | | | | | | | | | | | | KeyListPublicFragment
* | | | | | Cleanup ImportKeysListEntryDominik Schürmann2014-03-101-4/+6
| | | | | |
generated by cgit v1.2.3 (git 2.25.1) at 2025-09-12 00:14:10 +0000