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 #1124 from CTemplar/dev
Browse files Browse the repository at this point in the history 
Release
  • Loading branch information
@The-Hidden-Hand
The-Hidden-Hand authored Apr 5, 2021
2 parents fb4252e + 921f307 commit 048c74d
Show file tree
Hide file tree
Showing 28 changed files with 303 additions and 133 deletions.
14 changes: 4 additions & 10 deletions package-lock.json
View file

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

2 changes: 1 addition & 1 deletion package.json
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "ctemplar",
"version": "2.5.20",
"version": "2.5.21",
"license": "Apache",
"main": "electron-main.js",
"description": "Angular webclient (with Linux, macOS and Windows desktop clients) for CTemplar's encrypted email service.",
Expand Down
18 changes: 0 additions & 18 deletions src/app/app.component.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -85,24 +85,6 @@ export class AppComponent implements OnInit, OnDestroy {
});
}

ngAfterViewChecked() {
// For big window height, fix bottom white space issue
const allContent = document.getElementById('app-outer-id');
const header = document.getElementById('mastHead');
const footer = document.getElementById('colphon');
const mainContent = document.getElementById('login-main');
if (allContent && mainContent) {
mainContent.style.height =
window.innerHeight > allContent.getBoundingClientRect().height
? (
window.innerHeight -
header.getBoundingClientRect().height -
footer.getBoundingClientRect().height
).toString() + 'px'
: 'auto';
}
}

private updateLoadingStatus(): void {
this.store
.select(state => state.loading)
Expand Down
10 changes: 4 additions & 6 deletions src/app/footer/footer.component.scss
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,10 @@
color: $menu-link;
font-size: 0.875rem;

.app-credit {
color: #f8f9fa;
}

@include media('>sm') {
padding: 3.125rem calc(2rem - 0.938rem) 2.188rem;
}
Expand Down Expand Up @@ -146,9 +150,3 @@
}
}
}

.site-footer {
.app-credit {
color: #f8f9fa;
}
}
16 changes: 8 additions & 8 deletions src/app/mail/mail-detail/mail-detail.component.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -214,7 +214,7 @@ <h5 class="ui-header-subtitle text-dark mb-0 mail-subject">
<li id="{{ mail.id }}-mail-from" class="font-weight-bold">
{{ 'settings.compose.from' | translate }}
<span class="text-secondary"> </span>
<app-receiver-email-chip [contacts]="contacts" [email]="mail.sender_display.email" [name]="mail.sender_display.name" [isContactEncrypted]="userState.settings.is_contacts_encrypted" [composePopover]="false" [mailboxes]="mailboxes"> </app-receiver-email-chip>
<app-receiver-email-chip [contacts]="contacts" [email]="mail.sender_display.email" [name]="mail.sender_display.name" [isContactEncrypted]="userState.settings.is_contacts_encrypted" [composePopover]="false" [mailboxes]="mailboxes" [blacklist]="userState.blackList" [whitelist]="userState.whiteList"> </app-receiver-email-chip>
<span class="position-relative">
<i *ngIf="mail.last_action" class="fas fa-{{ mail.last_action | lastAction }} last-action"></i>
</span>
Expand All @@ -223,7 +223,7 @@ <h5 class="ui-header-subtitle text-dark mb-0 mail-subject">
{{ 'settings.compose.to' | translate }}
<ng-container *ngFor="let receiver of mail.receiver_display; let i = index">
<span class="text-secondary"> </span>
<app-receiver-email-chip [contacts]="contacts" [email]="receiver.email" [name]="receiver.name" [isContactEncrypted]="userState.settings.is_contacts_encrypted" [composePopover]="false" [mailboxes]="mailboxes"> </app-receiver-email-chip>
<app-receiver-email-chip [contacts]="contacts" [email]="receiver.email" [name]="receiver.name" [isContactEncrypted]="userState.settings.is_contacts_encrypted" [composePopover]="false" [mailboxes]="mailboxes" [blacklist]="userState.blackList" [whitelist]="userState.whiteList"> </app-receiver-email-chip>
<!--Comma as a separator-->
<span *ngIf="i < mail.receiver?.length - 1">, </span>
</ng-container>
Expand All @@ -232,7 +232,7 @@ <h5 class="ui-header-subtitle text-dark mb-0 mail-subject">
Cc:
<ng-container *ngFor="let cc of mail.cc; let i = index">
<span class="text-secondary"> </span>
<app-receiver-email-chip [contacts]="contacts" [email]="cc" [isContactEncrypted]="userState.settings.is_contacts_encrypted" [composePopover]="false" [mailboxes]="mailboxes"> </app-receiver-email-chip>
<app-receiver-email-chip [contacts]="contacts" [email]="cc" [isContactEncrypted]="userState.settings.is_contacts_encrypted" [composePopover]="false" [mailboxes]="mailboxes" [blacklist]="userState.blackList" [whitelist]="userState.whiteList"> </app-receiver-email-chip>
<!--Comma as a separator-->
<span *ngIf="i < mail.cc?.length - 1">, </span>
</ng-container>
Expand All @@ -241,7 +241,7 @@ <h5 class="ui-header-subtitle text-dark mb-0 mail-subject">
Bcc:
<ng-container *ngFor="let bcc of mail.bcc_display; let i = index">
<span class="text-secondary"> </span>
<app-receiver-email-chip [contacts]="contacts" [email]="bcc.email" [isContactEncrypted]="userState.settings.is_contacts_encrypted" [composePopover]="false" [mailboxes]="mailboxes"> </app-receiver-email-chip>
<app-receiver-email-chip [contacts]="contacts" [email]="bcc.email" [isContactEncrypted]="userState.settings.is_contacts_encrypted" [composePopover]="false" [mailboxes]="mailboxes" [blacklist]="userState.blackList" [whitelist]="userState.whiteList"> </app-receiver-email-chip>
<!--Comma as a separator-->
<span *ngIf="i < mail.bcc_display?.length - 1">, </span>
</ng-container>
Expand Down Expand Up @@ -441,7 +441,7 @@ <h5 class="ui-header-subtitle text-dark mb-0 mail-subject">
<li id="{{ childMail.id }}-mail-from" class="font-weight-bold">
<span>{{ 'settings.compose.from' | translate }}</span>
<span class="text-secondary"> </span>
<app-receiver-email-chip [contacts]="contacts" [email]="childMail.sender_display.email" [name]="childMail.sender_display.name" [isContactEncrypted]="userState.settings.is_contacts_encrypted" [composePopover]="false" [mailboxes]="mailboxes"> </app-receiver-email-chip>
<app-receiver-email-chip [contacts]="contacts" [email]="childMail.sender_display.email" [name]="childMail.sender_display.name" [isContactEncrypted]="userState.settings.is_contacts_encrypted" [composePopover]="false" [mailboxes]="mailboxes" [blacklist]="userState.blackList" [whitelist]="userState.whiteList"> </app-receiver-email-chip>
<span class="position-relative">
<i *ngIf="childMail.last_action" class="fas fa-{{ childMail.last_action | lastAction }} last-action"></i>
</span>
Expand All @@ -450,7 +450,7 @@ <h5 class="ui-header-subtitle text-dark mb-0 mail-subject">
<span>{{ 'settings.compose.to' | translate }}</span>
<ng-container *ngFor="let receiver of childMail.receiver_display; let i = index">
<span class="text-secondary"> </span>
<app-receiver-email-chip [contacts]="contacts" [email]="receiver.email" [name]="receiver.name" [isContactEncrypted]="userState.settings.is_contacts_encrypted" [composePopover]="false" [mailboxes]="mailboxes"> </app-receiver-email-chip>
<app-receiver-email-chip [contacts]="contacts" [email]="receiver.email" [name]="receiver.name" [isContactEncrypted]="userState.settings.is_contacts_encrypted" [composePopover]="false" [mailboxes]="mailboxes" [blacklist]="userState.blackList" [whitelist]="userState.whiteList"> </app-receiver-email-chip>
<!--Comma as a separator-->
<span *ngIf="i < childMail.receiver?.length - 1">, </span>
</ng-container>
Expand All @@ -459,7 +459,7 @@ <h5 class="ui-header-subtitle text-dark mb-0 mail-subject">
Cc:
<ng-container *ngFor="let cc of childMail.cc; let i = index">
<span class="text-secondary"> </span>
<app-receiver-email-chip [contacts]="contacts" [email]="cc" [isContactEncrypted]="userState.settings.is_contacts_encrypted" [composePopover]="false" [mailboxes]="mailboxes"> </app-receiver-email-chip>
<app-receiver-email-chip [contacts]="contacts" [email]="cc" [isContactEncrypted]="userState.settings.is_contacts_encrypted" [composePopover]="false" [mailboxes]="mailboxes" [blacklist]="userState.blackList" [whitelist]="userState.whiteList"> </app-receiver-email-chip>
<!--Comma as a separator-->
<span *ngIf="i < childMail.cc?.length - 1">, </span>
</ng-container>
Expand All @@ -468,7 +468,7 @@ <h5 class="ui-header-subtitle text-dark mb-0 mail-subject">
Bcc:
<ng-container *ngFor="let bcc of childMail.bcc_display; let i = index">
<span class="text-secondary"> </span>
<app-receiver-email-chip [contacts]="contacts" [email]="bcc.email" [isContactEncrypted]="userState.settings.is_contacts_encrypted" [composePopover]="false" [mailboxes]="mailboxes"> </app-receiver-email-chip>
<app-receiver-email-chip [contacts]="contacts" [email]="bcc.email" [isContactEncrypted]="userState.settings.is_contacts_encrypted" [composePopover]="false" [mailboxes]="mailboxes" [blacklist]="userState.blackList" [whitelist]="userState.whiteList"> </app-receiver-email-chip>
<span *ngIf="i < childMail.bcc_display?.length - 1">, </span>
</ng-container>
</li>
Expand Down
1 change: 0 additions & 1 deletion src/app/mail/mail-list/mail-folder/generic-folder/generic-folder.component.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -372,7 +372,6 @@ export class GenericFolderComponent implements OnInit, AfterViewInit, OnDestroy
}

decryptAllSubjects() {
// debugger
this.queueForDecryptSubject = this.queueForDecryptSubject.filter((decryptingMail: number) => {
// Item on queue would be removed when the following condition is matched
// 1. decrypting is finished
Expand Down
3 changes: 3 additions & 0 deletions src/app/mail/mail-settings/mail-autoresponder/mail-autoresponder.component.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,9 @@ <h5 class="ui-header-subtitle text-dark mb-0">
</header>
<div class="mailbox-section-body mailbox-section-body-sm">
<div class="form-content-holder">
<div class="form-group col">
<label class="font-weight-bold m-0">Timezone: {{ settings.timezone }}</label>
</div>
<div class="form-group col">
<div class="toggle-switcher">
<input class="d-none toggle-switcher-control" id="autoresponder" name="autoresponder" type="checkbox" [(ngModel)]="autoresponder.autoresponder_active" />
Expand Down
Loading

0 comments on commit 048c74d

Please sign in to comment.