aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge remote-tracking branch 'origin/master'Vincent Breitmoser2014-03-1318-51/+151
|\
| * Merge pull request #388 from ajit766/exportkeyfixDominik Schürmann2014-03-134-16/+56
| |\
| | * 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-1211-17/+20
| |\
| | * Removing tabBhargav Golla2014-03-101-1/+1
| | * Removing unused stringBhargav Golla2014-03-101-1/+1
| | * Merge remote-tracking branch 'upstream/master' into Lint-error-fixBhargav Golla2014-03-1049-481/+1293
| | |\
| | * | Lint changes after testingBhargav Golla2014-03-1012-19/+21
| * | | 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 67ffc24526uberspot2014-03-122-12/+60
| * | | | Merge pull request #405 from honnel/checkstyleDominik Schürmann2014-03-121-6/+15
| |\ \ \ \
| | * | | | Added Windows section to CheckStyle configuration information part (and split...Daniel Hammann2014-03-121-6/+15
| | * | | | 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 library installation overheadEmantor2014-03-121-1/+1
| | | |_|_|/ | | |/| | |
* | | | | | merge fixes as per comments in mergeVincent Breitmoser2014-03-131-30/+19
* | | | | | remove special treatment for unified list queryVincent Breitmoser2014-03-131-39/+14
* | | | | | keychainprovider cleanup, kindasortaVincent Breitmoser2014-03-132-56/+47
* | | | | | Merge branch 'unified-keylist'Vincent Breitmoser2014-03-1227-876/+600
|\ \ \ \ \ \ | |/ / / / / |/| | | | |
| * | | | | add contact count to My Keys headerVincent Breitmoser2014-03-083-2/+30
| * | | | | better handling of multi select in ListKeysFragmentVincent Breitmoser2014-03-081-17/+22
| * | | | | ditch old key list activitiesVincent Breitmoser2014-03-0819-1433/+6
| * | | | | add edit button and secret key info to public key viewVincent Breitmoser2014-03-085-2/+71
| * | | | | move some placeholders into resourcesVincent Breitmoser2014-03-084-5/+6
| * | | | | Normalize public key uri in KeyListFragmentVincent Breitmoser2014-03-083-6/+29
| * | | | | Make EditKeyActivity's uri handling (more) saneVincent Breitmoser2014-03-082-6/+4
| * | | | | working unified list (no actions yet)Vincent Breitmoser2014-03-089-246/+450
| * | | | | copy public keylist as stub for unified keylistVincent Breitmoser2014-03-068-5/+776
* | | | | | Merge pull request #395 from uberspot/masterDominik Schürmann2014-03-1241-281/+609
|\ \ \ \ \ \
| * | | | | | 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
| * | | | | | 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 via...uberspot2014-03-119-187/+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
| * | | | | | Merge pull request #1 from openpgp-keychain/masterTharindu Wijewardane2014-03-1160-596/+1561
| |\| | | | |
* | | | | | | 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 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
| | |_|/ | |/| |