aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* First code style changes in uiuberspot2014-03-1356-634/+486
* Fix code style in /helperuberspot2014-03-135-71/+64
* Fix code style in keychain/service/uberspot2014-03-1311-87/+129
* Optimize imports in all files, remove useless whitespace in some and fix inde...uberspot2014-03-1312-130/+82
* 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
* | Merge pull request #403 from Valodim/masterDominik Schürmann2014-03-1327-875/+549
|\ \ | |/ |/|
| * drop unified uri in favor of generic /key_ringsVincent Breitmoser2014-03-132-15/+10
| * 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
generated by cgit v1.2.3 (git 2.25.1) at 2024-07-03 08:13:53 +0000