aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
...
| * Update api libDominik Schürmann2015-03-161-0/+0
| * object oriented split user idDominik Schürmann2015-03-161-0/+53
| * object oriented split user idDominik Schürmann2015-03-1626-148/+139
| * Update openpgp-api libDominik Schürmann2015-03-161-0/+0
| * Fix nullpointer when scanning malformed qr codesDominik Schürmann2015-03-161-1/+1
| * Allow selection of none in SelectSignKeyIdActivityDominik Schürmann2015-03-152-2/+37
| * Clarify MIME usageDominik Schürmann2015-03-153-2/+7
| * Merge branch 'development' of github.com:open-keychain/open-keychain into dev...Dominik Schürmann2015-03-152-15/+22
| |\
| * | Put API activites in normal process to allow hydrate/dehydrate of logsDominik Schürmann2015-03-151-4/+2
* | | support github resource (ci)Vincent Breitmoser2015-03-243-3/+70
* | | support github resource (re)Vincent Breitmoser2015-03-248-1/+594
* | | support github resource (pa)Vincent Breitmoser2015-03-246-46/+224
* | | give short branch description in readmeVincent Breitmoser2015-03-161-0/+6
* | | work on certification uiVincent Breitmoser2015-03-1522-48/+197
* | | Merge branch 'development' into linked-identitiesVincent Breitmoser2015-03-15162-1977/+2884
|\ \ \ | | |/ | |/|
| * | fix expiry of master keysVincent Breitmoser2015-03-152-15/+22
| |/
| * Prefer ZIP algorithm as discussed on OpenPGP WG mailinglistDominik Schürmann2015-03-151-1/+7
| * Add ignore dirty to other git submodulesDominik Schürmann2015-03-151-2/+9
| * Remove display of key id in other listsDominik Schürmann2015-03-156-19/+70
| * Show main user id instead of key in certify screenDominik Schürmann2015-03-151-10/+15
| * Fixes for selection of certify keyDominik Schürmann2015-03-152-10/+21
| * Merge pull request #1142 from tdjogi010/developmentDominik Schürmann2015-03-151-4/+10
| |\
| | * Merge branch 'development' of https://github.com/tdjogi010/open-keychain into...tdjogi010@gmail.com2015-03-130-0/+0
| | |\
| | | * Preselected Suitable Keytdjogi010@gmail.com2015-03-121-4/+9
| | * | Preselected Suitable Keytdjogi010@gmail.com2015-03-131-4/+10
| | |/
| * | Merge pull request #1148 from manojkhannakm/developmentDominik Schürmann2015-03-152-5/+5
| |\ \
| | * | Fixed a ClassCastExceptionManoj Khanna2015-03-152-5/+5
| * | | Merge pull request #1147 from Hiperzone/developmentDominik Schürmann2015-03-152-11/+15
| |\ \ \
| | * | | -fixed out of bounds crash when retrieving the main profile name with secret ...Daniel Ramos2015-03-152-11/+15
| | |/ /
| * | | Dont display key ids in KeySpinner, display creation date when user ids dupli...Dominik Schürmann2015-03-154-16/+39
| * | | Use fixed version of com.squareup:fest-android, enable offline buildsDominik Schürmann2015-03-151-1/+1
| * | | Query for duplicate user idsDominik Schürmann2015-03-153-2/+14
| * | | Add missing license headersDominik Schürmann2015-03-156-0/+102
| * | | Merge branch 'development' of github.com:open-keychain/open-keychain into dev...Dominik Schürmann2015-03-141-1/+2
| |\| |
| | * | Merge pull request #1143 from manojkhannakm/developmentDominik Schürmann2015-03-141-1/+2
| | |\ \
| | | * | Fix for Issue #1115Manoj Khanna2015-03-131-1/+2
| * | | | disable debug syncDominik Schürmann2015-03-141-1/+1
| * | | | Use names also for main contactDominik Schürmann2015-03-142-4/+4
| * | | | Show key name instead of key id in contacts, cleanupDominik Schürmann2015-03-141-20/+7
| |/ / /
| * | | Merge pull request #1144 from adithyaphilip/main-profile-keysDominik Schürmann2015-03-143-27/+248
| |\ \ \ | | |/ / | |/| |
| | * | added some documentationAdithya Abraham Philip2015-03-132-27/+87
| | * | added own profile support in linekd system contactAdithya Abraham Philip2015-03-132-10/+61
| | * | links own keys to me profile in contactsAdithya Abraham Philip2015-03-132-9/+119
| |/ /
| * | Clarify logs in DeleteFileDialogDominik Schürmann2015-03-121-2/+2
| * | Use notify instead of Toast for NFC checkDominik Schürmann2015-03-121-2/+2
| * | Merge pull request #1133 from Rrego6/developmentDominik Schürmann2015-03-121-0/+6
| |\ \
| | * | Check if NFC is available on deviceRaoul2015-03-101-0/+6
| * | | Merge pull request #1117 from danielnelz/developmentDominik Schürmann2015-03-1218-73/+108
| |\ \ \
| | * | | Fixed possible ArrayIndexOutOfBoundsException.danielnelz2015-03-112-2/+2
| | * | | Merge remote-tracking branch 'upstream/development' into developmentdanielnelz2015-03-096-48/+51
| | |\| |
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-06 05:31:24 +0000