aboutsummaryrefslogtreecommitdiffstats
path: root/OpenPGP-Keychain
Commit message (Expand)AuthorAgeFilesLines
* Optimize imports in all files, remove useless whitespace in some and fix inde...uberspot2014-03-1311-128/+80
* Merge pull request #407 from uberspot/masterDominik Schürmann2014-03-131-15/+31
|\
| * add apg's change to colorizing, no more background changes neededuberspot2014-03-131-15/+31
* | Forgot faq fileDominik Schürmann2014-03-131-0/+12
* | Merge branch 'master' of github.com:openpgp-keychain/openpgp-keychainDominik Schürmann2014-03-131-23/+29
|\ \
| * \ Merge pull request #408 from gogowitczak/masterDominik Schürmann2014-03-131-23/+29
| |\ \
| | * | Added possibility to specify port for KeyServer.gogowitczak2014-03-131-1/+1
| | * | Added possibility to specify port for KeyServer.gogowitczak2014-03-131-24/+30
| | |/
* | / Add FAQ tab to helpDominik Schürmann2014-03-132-8/+12
|/ /
* | Readd create key menu itemsDominik Schürmann2014-03-133-16/+61
* | XML cleanup and bigger filename EditTextDominik Schürmann2014-03-133-161/+173
* | Cleanup and simplificationDominik Schürmann2014-03-132-61/+24
* | drop unified uri in favor of generic /key_ringsVincent Breitmoser2014-03-132-15/+10
* | Merge remote-tracking branch 'origin/master'Vincent Breitmoser2014-03-1315-44/+130
|\|
| * 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-1210-17/+15
| |\
| | * 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-1011-19/+16
| * | | change colorizing of fingerprint to use SHA1 based on apg's commit 67ffc24526uberspot2014-03-122-12/+60
* | | | 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-1238-281/+244
|\ \ \ \
| * | | | 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
| * | | | 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
| |/ / /
* / / / 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
|\ \ \ \ | |/ / / |/| | |
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-29 11:53:05 +0000