Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Changed webmail to mail #888

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,12 +2,12 @@

<h4 align="center">
<br><a href="https://runbox.com/app"><img src="src/assets/runbox7_blue_dark.png" alt="Runbox 7" width="400"></a>
<br>Building the fastest webmail app on the planet<br><br>
<br>Building the fastest mail app on the planet<br><br>
</h4>

Welcome to the Runbox 7 project!

Runbox 7 is a next generation webmail app that combines the instant experience of email clients with the versatility of web browsers.
Runbox 7 is a next generation mail app that combines the instant experience of email clients with the versatility of web browsers.

The app is written in Angular 2+ and HTML5 Canvas, using a Perl backend with MySQL storage. This project was generated with [Angular CLI](https://github.com/angular/angular-cli) version 1.6.8.

Expand Down
6 changes: 3 additions & 3 deletions e2e/cypress/integration/login.ts
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ describe('Login', () => {
cy.get('div.loginSection mat-progress-bar').should('exist');
}

function expectWebmail() {
function expectmail() {
cy.get('#sidenavGreeting').should('contain', '[email protected]');
cy.get('confirm-dialog').should('contain', 'Welcome to Runbox 7');
cy.get('confirm-dialog .mat-dialog-actions button mat-icon[svgIcon="cancel"]').click().should(() => {
Expand All @@ -32,7 +32,7 @@ describe('Login', () => {
enterCredentials();
clickLogin();

expectWebmail();
expectmail();
});

it('should log in with 2fa', () => {
Expand All @@ -47,6 +47,6 @@ describe('Login', () => {
cy.get('input[data-placeholder="Timed one-time password"]').type('123456');
clickLogin();

expectWebmail();
expectmail();
});
});
2 changes: 1 addition & 1 deletion src/app/app-settings.ts
Original file line number Diff line number Diff line change
Expand Up @@ -62,6 +62,6 @@ export class AppSettingsService {
}

public store(): void {
this.storage.set('webmailSettings', this.settings);
this.storage.set('mailSettings', this.settings);
}
}
2 changes: 1 addition & 1 deletion src/app/app.component.html
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@
</p>
</div>
<div>
<button mat-icon-button [matMenuTriggerFor]="settingsMenu" matTooltip="Show webmail settings">
<button mat-icon-button [matMenuTriggerFor]="settingsMenu" matTooltip="Show mail settings">
<mat-icon svgIcon="cog"></mat-icon>
</button>
</div>
Expand Down
2 changes: 1 addition & 1 deletion src/app/app.component.ts
Original file line number Diff line number Diff line change
Expand Up @@ -1127,7 +1127,7 @@ export class AppComponent implements OnInit, AfterViewInit, CanvasTableSelectLis
const dialogRef = this.dialog.open(ConfirmDialog);
dialogRef.componentInstance.title = 'Welcome to Runbox 7!';
dialogRef.componentInstance.question =
`Runbox 7 will now synchronize with your device to give you an optimal webmail experience.
`Runbox 7 will now synchronize with your device to give you an optimal mail experience.
If you'd later like to remove the data from your device, use the synchronization controls at the bottom of the folder pane.`;
dialogRef.componentInstance.yesOptionTitle = `Sounds good, let's go!`;
dialogRef.componentInstance.noOptionTitle = `Don't synchronize with this device.`;
Expand Down
20 changes: 10 additions & 10 deletions src/app/changelog/changes.ts
Original file line number Diff line number Diff line change
Expand Up @@ -1296,7 +1296,7 @@ const changes = [
"fe0693f",
"1574956692",
"refactor",
"webmail",
"mail",
"remove unused column widths code from AppComponent"
],
[
Expand Down Expand Up @@ -1387,7 +1387,7 @@ const changes = [
"163d88f",
"1574346008",
"style",
"webmail",
"mail",
"Hide nav submenu in mobile view"
],
[
Expand Down Expand Up @@ -1464,7 +1464,7 @@ const changes = [
"f69af60",
"1573848492",
"style",
"webmail",
"mail",
"Omit \"Deleting...\" feedback message when deleting messages."
],
[
Expand Down Expand Up @@ -1549,7 +1549,7 @@ const changes = [
"1573486468",
"feat",
"menu",
"Add buttons to navigate between calendar and webmail"
"Add buttons to navigate between calendar and mail"
],
[
"85ea2fa",
Expand Down Expand Up @@ -1751,35 +1751,35 @@ const changes = [
"1a21270",
"1572351944",
"fix",
"webmail",
"mail",
"don't keep the message pane open when in mobile view"
],
[
"d2969db",
"1572351280",
"style",
"webmail",
"mail",
"adjust preview pane wording"
],
[
"9c4e9b6",
"1572280164",
"fix",
"webmail",
"mail",
"Display viewMode menu even when no local index exists"
],
[
"5a30155",
"1572279479",
"feat",
"webmail",
"mail",
"add an option to toggle the message pane openness"
],
[
"09a3fa1",
"1572277440",
"feat",
"webmail",
"mail",
"Add an option to hide the message pane"
],
[
Expand Down Expand Up @@ -2010,7 +2010,7 @@ const changes = [
"4670c0a",
"1569425925",
"refactor",
"webmail",
"mail",
"remove deprecated MediaQueryList APIs"
],
[
Expand Down
8 changes: 4 additions & 4 deletions src/app/contacts-app/contacts.service.spec.ts
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ describe('ContactsService', () => {

it('should allow looking up avatars according to settings', async () => {
const storage = new StorageService(rmmapi);
storage.set('webmailSettings', { avatars: 'remote' });
storage.set('mailSettings', { avatars: 'remote' });
const sut = new ContactsService(rmmapi, new AppSettingsService(storage), storage);
await new Promise(resolve => setTimeout(resolve, 0));

Expand All @@ -52,7 +52,7 @@ describe('ContactsService', () => {
avatarUrl = await sut.lookupAvatar('[email protected]');
expect(avatarUrl).toBeFalsy();

storage.set('webmailSettings', { avatars: 'local' });
storage.set('mailSettings', { avatars: 'local' });
await new Promise(resolve => setTimeout(resolve, 0));

avatarUrl = await sut.lookupAvatar('[email protected]');
Expand All @@ -61,14 +61,14 @@ describe('ContactsService', () => {
avatarUrl = await sut.lookupAvatar('[email protected]');
expect(avatarUrl).toBeFalsy();

storage.set('webmailSettings', { avatars: 'none' });
storage.set('mailSettings', { avatars: 'none' });
await new Promise(resolve => setTimeout(resolve, 0));

avatarUrl = await sut.lookupAvatar('[email protected]');
expect(avatarUrl).toBeFalsy();

// can enable it back again
storage.set('webmailSettings', { avatars: 'remote' });
storage.set('mailSettings', { avatars: 'remote' });
await new Promise(resolve => setTimeout(resolve, 0));
avatarUrl = await sut.lookupAvatar('[email protected]');
expect(avatarUrl).toMatch(/gravatar/);
Expand Down
2 changes: 1 addition & 1 deletion src/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@

<meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
<meta name="description" content="Fast, secure, and sustainable email services provided by email professionals. Powerful Email, Domain, and Web Hosting for businesses." />
<meta name="keywords" content="email, email hosting, email address, web hosting, professional, secure, privacy, fast, webmail, mobile, iPhone, POP, SMTP, IMAP, filter, Outlook, Thunderbird" />
<meta name="keywords" content="email, email hosting, email address, web hosting, professional, secure, privacy, fast, mail, mobile, iPhone, POP, SMTP, IMAP, filter, Outlook, Thunderbird" />
<meta name="copyright" content="Copyright &copy; 2016-2018 Runbox" />
<meta name="robots" content="NOODP" />
<meta name="viewport" content="width=device-width, initial-scale=1" />
Expand Down