aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #1155 from adithyaphilip/developmentDominik Schürmann2015-03-171-16/+13
|\ | | | | Removed JellyBean restriction on Contact Sync
| * contacts work on all supported api levelsAdithya Abraham Philip2015-03-171-16/+13
|/
* Manifest cleanupDominik Schürmann2015-03-171-9/+12
|
* Merge branch 'development' of github.com:open-keychain/open-keychain into ↵Dominik Schürmann2015-03-171-6/+2
|\ | | | | | | development
| * Merge pull request #1154 from adithyaphilip/developmentDominik Schürmann2015-03-161-6/+2
| |\ | | | | | | Removed unnecessary @TargetApi annotation in ContactHelper
| | * removed unnecessary @TargetApi annotationAdithya Abraham Philip2015-03-171-6/+2
| |/
* / File extensions into ConstantsDominik Schürmann2015-03-175-13/+19
|/
* Disable hidden recipients for nowDominik Schürmann2015-03-162-10/+10
|
* Allow for hidden recipients in encrypt methodsDominik Schürmann2015-03-1613-33/+133
|
* Allow encrypt of filenames via overflow menuDominik Schürmann2015-03-167-11/+44
|
* Remove old info from readmeDominik Schürmann2015-03-161-2/+0
|
* Remove old info from readmeDominik Schürmann2015-03-161-28/+5
|
* Clarify certification help screenDominik Schürmann2015-03-161-2/+2
|
* Update api libDominik Schürmann2015-03-161-0/+0
|
* 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 ↵Dominik Schürmann2015-03-152-15/+22
|\ | | | | | | development
| * fix expiry of master keysVincent Breitmoser2015-03-152-15/+22
| | | | | | | | fixes #1141
* | Put API activites in normal process to allow hydrate/dehydrate of logsDominik Schürmann2015-03-151-4/+2
|/
* 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
|\ | | | | Preselected Suitable Key
| * Merge branch 'development' of https://github.com/tdjogi010/open-keychain ↵tdjogi010@gmail.com2015-03-130-0/+0
| |\ | | | | | | | | | | | | | | | | | | into development Conflicts: OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/widget/CertifyKeySpinner.java
| | * 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 ClassCastException
| * | 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 se...
| * | | -fixed out of bounds crash when retrieving the main profile name with secret ↵Daniel Ramos2015-03-152-11/+15
| |/ / | | | | | | | | | | | | | | | keys -fixed a possible crash when retrieving the main profile contactid
* | | Dont display key ids in KeySpinner, display creation date when user ids ↵Dominik Schürmann2015-03-154-16/+39
| | | | | | | | | | | | duplicate
* | | 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 ↵Dominik Schürmann2015-03-141-1/+2
|\| | | | | | | | | | | development
| * | Merge pull request #1143 from manojkhannakm/developmentDominik Schürmann2015-03-141-1/+2
| |\ \ | | | | | | | | Fix for Issue #1115
| | * | 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
|\ \ \ | |/ / |/| | Own keys linked to "me" contact
| * | added some documentationAdithya Abraham Philip2015-03-132-27/+87
| | |
| * | added own profile support in linekd system contactAdithya Abraham Philip2015-03-132-10/+61
| | |
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-30 10:37:35 +0000