aboutsummaryrefslogtreecommitdiffstats
path: root/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain
Commit message (Expand)AuthorAgeFilesLines
* Export cancellable - minor changesgrait2014-03-133-6/+10
* Export is cancellable nowgrait2014-03-133-16/+52
* Merge pull request #396 from bhargavgolla/Lint-error-fixDominik Schürmann2014-03-121-0/+2
|\
| * Merge remote-tracking branch 'upstream/master' into Lint-error-fixBhargav Golla2014-03-1016-203/+344
| |\
| * | Lint changes after testingBhargav Golla2014-03-102-1/+2
* | | change colorizing of fingerprint to use SHA1 based on apg's commit 67ffc24526uberspot2014-03-122-12/+60
* | | Merge pull request #395 from uberspot/masterDominik Schürmann2014-03-1228-185/+234
|\ \ \
| * | | Add Email suggestions in Create Key activityuberspot2014-03-122-5/+53
| * | | fix plenty of lint warnings, make some for loops into foreach, remove unused ...uberspot2014-03-1112-21/+24
| * | | minor clean up in colorize methoduberspot2014-03-111-2/+3
| * | | Add export... button and functionality in multi-selectuberspot2014-03-118-12/+23
| * | | Make export work with rowIds instead of MasterKeyIdsuberspot2014-03-116-53/+92
| * | | Remove duplicate code from ActionBarHelper. You can now set the drawables via...uberspot2014-03-116-95/+42
| | |/ | |/|
* | | 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
|/ /
* | cleanupDominik Schürmann2014-03-112-43/+37
* | 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-112-1/+61
* | Merge pull request #383 from sreeram-boyapati/masterDominik Schürmann2014-03-102-32/+83
|\ \
| * | Added string reference for Issue #207Sreeram Boyapati2014-03-101-4/+4
| * | ViewHolder Pattern ImplementedSreeram Boyapati2014-03-101-26/+39
| * | Fix to passphrase dialog and Issue #207Sreeram Boyapati2014-03-101-6/+44
* | | More fixes for KeychainIntentServiceHandlerDominik Schürmann2014-03-101-41/+43
* | | 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
| |/ |/|
* | Revert "Lint changes"Dominik Schürmann2014-03-101-2/+0
* | Merge pull request #381 from bhargavgolla/Lint-error-fixDominik Schürmann2014-03-101-0/+2
|\ \
| * | Lint changesBhargav Golla2014-03-101-0/+2
| |/
* | 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
| |/ / |/| |
* | | 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-092-1/+9
|\ \ \
| * | | progress bar while key creation - added plurals based on no.of keys while key...grait2014-03-091-1/+2
| * | | Merge branch 'develop' into master2grait2014-03-0913-94/+136
| |\| |
| * | | 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-091-0/+56
| |/ |/|
* | Merge pull request #369 from hav3n/branch-fixesDominik Schürmann2014-03-091-0/+1
|\ \
generated by cgit v1.2.3 (git 2.25.1) at 2024-07-26 13:59:17 +0000