Skip to content
This repository has been archived by the owner on May 5, 2022. It is now read-only.

Commit

Permalink
Merge pull request #1631 from CTemplar/dev
Browse files Browse the repository at this point in the history
Release
  • Loading branch information
The-Hidden-Hand authored Feb 1, 2022
2 parents 20b029b + c60588a commit 5ef33e0
Show file tree
Hide file tree
Showing 5 changed files with 48 additions and 50 deletions.
64 changes: 32 additions & 32 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "ctemplar",
"version": "2.5.64",
"version": "2.5.65",
"license": "Apache",
"main": "electron-main.js",
"description": "Angular webclient (with Linux, macOS and Windows desktop clients) for CTemplar's encrypted email service.",
Expand Down Expand Up @@ -49,7 +49,7 @@
"@ngrx/store-devtools": "^10.1.2",
"@ngx-translate/core": "^12.1.2",
"@ngx-translate/http-loader": "^4.0.0",
"@sentry/browser": "^6.7.2",
"@sentry/browser": "^6.17.2",
"angular2-cookie-law": "^7.0.1",
"bcryptjs": "^2.4.3",
"electron-context-menu": "^3.1.0",
Expand Down
22 changes: 11 additions & 11 deletions src/app/mail/mail-contact/mail-contact.component.html
Original file line number Diff line number Diff line change
Expand Up @@ -194,12 +194,12 @@
<table class="table mail-contact">
<thead class="mail-contact-header border-bottom-0 hidden-xs-down">
<tr>
<th></th>
<th></th>
<th>
<th id="contact-check"></th>
<th id="contact-star"></th>
<th id="contact-name">
<strong>{{ 'common.name' | translate }}</strong>
</th>
<th>
<th id="contact-email">
<strong>{{ 'common.email' | translate }}</strong>
</th>
</tr>
Expand All @@ -211,7 +211,7 @@
*ngFor="let contact of contactsState.contacts"
[class.active-contact]="selectedContact == contact"
>
<td (click)="checkContact(contact)">
<td (click)="checkContact(contact)" headers="contact-check">
<div class="mail-list-col-item mail-checkbox">
<mat-checkbox
[(ngModel)]="contact.markForDelete"
Expand All @@ -224,7 +224,7 @@
<label [attr.for]="contact.id" class="fancy-field-empty"></label>
</div>
</td>
<td>
<td headers="contact-star">
<a
[ngbTooltip]="
contact.starred ? ('mail_list.remove_star' | translate) : ('mail_list.start_message' | translate)
Expand All @@ -239,7 +239,7 @@
<i class="icon icon-star-filled" [ngClass]="{ 'icon-star': !contact.starred }"></i>
</a>
</td>
<td (click)="editContact(contact, addUserContent)">
<td (click)="editContact(contact, addUserContent)" headers="contact-name">
<div class="mail-list-col-item mail-from-name cursor-pointer">
<span
*ngIf="contact.is_encrypted && !contact.name; else contactName"
Expand All @@ -252,7 +252,7 @@
</ng-template>
</div>
</td>
<td (click)="editContact(contact, addUserContent)">
<td (click)="editContact(contact, addUserContent)" headers="contact-email">
<div class="mail-contact-col-lg cursor-pointer">
<div class="mail-desc">
<p>
Expand Down Expand Up @@ -283,7 +283,7 @@
*ngFor="let contact of contactsState.contacts"
[class.active-contact]="selectedContact == contact"
>
<td (click)="checkContact(contact)">
<td (click)="checkContact(contact)" headers="contact-check">
<div class="mail-list-col-item mail-checkbox">
<mat-checkbox
[(ngModel)]="contact.markForDelete"
Expand All @@ -296,7 +296,7 @@
<label [attr.for]="contact.id" class="fancy-field-empty"></label>
</div>
</td>
<td (click)="editContact(contact, addUserContent)">
<td (click)="editContact(contact, addUserContent)" headers="contact-name">
<div class="mail-list-col-item cursor-pointer">
<span
*ngIf="contact.is_encrypted && !contact.name; else contactName"
Expand Down Expand Up @@ -328,7 +328,7 @@
</div>
</div>
</td>
<td>
<td headers="contact-star">
<a
(click)="contact.isDecryptedFrontend && toggleStarred(contact)"
[ngClass]="{ 'is-fav': contact.starred }"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2008,10 +2008,8 @@ export class ComposeMailComponent implements OnInit, AfterViewInit, OnDestroy {
this.isMixedContacts$.next(isMixedContacts);
this.pgpEncryptionType = isMixedContacts ? null : pgpEncryptionType;

// if encryption is set to PGP_INLINE or PGP_MIME and we have at least one external with PGP enabled
this.draftMail.is_encrypted = this.pgpEncryptionType
? !this.receiversInfo.some(c => c?.isExternal)
: !!this.pgpEncryptionType;
// if encryption is set to PGP_INLINE or PGP_MIME or we have at least one external contact
this.draftMail.is_encrypted = !(this.pgpEncryptionType || this.receiversInfo.some(c => c?.isExternal));
this.draftMail.encryption_type = this.pgpEncryptionType;

if (this.pgpEncryptionType === PGPEncryptionType.PGP_INLINE && this.draftMail?.is_html) {
Expand Down
2 changes: 1 addition & 1 deletion src/assets/static/email.html
Original file line number Diff line number Diff line change
Expand Up @@ -293,7 +293,7 @@
line-height: 24px;
"
>
You have received a secure massage from
You have received a secure message from
</td>
</tr>
<tr>
Expand Down

0 comments on commit 5ef33e0

Please sign in to comment.