diff --git a/ISSUE_TEMPLATE.md b/ISSUE_TEMPLATE.md index 381c3f9db..4c56ac4ce 100644 --- a/ISSUE_TEMPLATE.md +++ b/ISSUE_TEMPLATE.md @@ -1,8 +1,8 @@ @@ -14,7 +14,7 @@ actionable, try to include the following information: ##### What operating system are you using? ... -##### What version of N1 are you using? +##### What version of Nylas Mail are you using? ... -- diff --git a/README.md b/README.md index 215582974..4e90e117c 100644 --- a/README.md +++ b/README.md @@ -23,7 +23,7 @@ guide](https://github.com/nylas/N1/blob/master/CONTRIBUTING.md). # Themes -The Nylas N1 user interface is styled using CSS, which means it's easy to modify and extend. N1 comes stock with a few beautiful themes, and there are many more which have been built by community developers +The Nylas Mail user interface is styled using CSS, which means it's easy to modify and extend. N1 comes stock with a few beautiful themes, and there are many more which have been built by community developers
@@ -69,7 +69,7 @@ The Nylas N1 user interface is styled using CSS, which means it's easy to modify #### To install community themes: 1. Download and unzip the repo -2. In Nylas N1, select `Developer > Install a Package Manually... ` +2. In Nylas Mail, select `Developer > Install a Package Manually... ` 3. Navigate to where you downloaded the theme and select the root folder. The theme is copied into the `~/.nylas` folder for your convinence 5. Select `Change Theme...` from the top level menu, and you'll see the newly installed theme. That's it! diff --git a/apm/README.md b/apm/README.md index 4efa7890c..1b22ac5fd 100644 --- a/apm/README.md +++ b/apm/README.md @@ -1,2 +1,2 @@ -N1 ships a copy of [apm](https://github.com/atom/apm) to build packages +Nylas Mail ships a copy of [apm](https://github.com/atom/apm) to build packages when users choose to install them. This won't be true much longer. diff --git a/build/resources/linux/nylas.sh b/build/resources/linux/nylas.sh index c85ffb33a..59c77fd9b 100755 --- a/build/resources/linux/nylas.sh +++ b/build/resources/linux/nylas.sh @@ -49,21 +49,21 @@ if [ $EXPECT_OUTPUT ]; then fi if [ $OS == 'Mac' ]; then - NYLAS_APP_NAME="Nylas N1.app" + NYLAS_APP_NAME="Nylas Mail.app" if [ -z "${NYLAS_PATH}" ]; then - # If NYLAS_PATH isnt set, check /Applications and then ~/Applications for Nylas N1.app + # If NYLAS_PATH isnt set, check /Applications and then ~/Applications for Nylas Mail.app if [ -x "/Applications/$NYLAS_APP_NAME" ]; then NYLAS_PATH="/Applications" elif [ -x "$HOME/Applications/$NYLAS_APP_NAME" ]; then NYLAS_PATH="$HOME/Applications" else - # We havent found an Nylas N1.app, use spotlight to search for N1 + # We havent found an Nylas Mail.app, use spotlight to search for N1 NYLAS_PATH="$(mdfind "kMDItemCFBundleIdentifier == 'com.nylas.nylas-mail'" | grep -v ShipIt | head -1 | xargs -0 dirname)" # Exit if N1 can't be found if [ ! -x "$NYLAS_PATH/$NYLAS_APP_NAME" ]; then - echo "Cannot locate 'Nylas N1.app', it is usually located in /Applications. Set the NYLAS_PATH environment variable to the directory containing 'Nylas N1.app'." + echo "Cannot locate 'Nylas Mail.app', it is usually located in /Applications. Set the NYLAS_PATH environment variable to the directory containing 'Nylas Mail.app'." exit 1 fi fi diff --git a/build/resources/win/nylas-mailto-registration.reg b/build/resources/win/nylas-mailto-registration.reg index 2d30a85db..64a437f73 100755 --- a/build/resources/win/nylas-mailto-registration.reg +++ b/build/resources/win/nylas-mailto-registration.reg @@ -19,7 +19,7 @@ Windows Registry Editor Version 5.00 @="{{PATH_TO_APP_FOLDER}}\\nylas.exe,1" [{{HKEY_ROOT}}\SOFTWARE\Clients\Mail\Nylas\Capabilities] -"ApplicationName"="Nylas N1" +"ApplicationName"="Nylas Mail" "ApplicationDescription"="A fast, modern mail client designed to help you boost your productivity." [{{HKEY_ROOT}}\SOFTWARE\Clients\Mail\Nylas\Capabilities\StartMenu] @@ -55,6 +55,6 @@ Windows Registry Editor Version 5.00 [HKEY_CURRENT_USER\SOFTWARE\Classes\Local Settings\Software\Microsoft\Windows\Shell\MuiCache] -"{{PATH_TO_ROOT_FOLDER}}\\Update.exe"="Nylas N1" -"{{PATH_TO_ROOT_FOLDER}}\\Update.exe.FriendlyAppName"="Nylas N1" +"{{PATH_TO_ROOT_FOLDER}}\\Update.exe"="Nylas Mail" +"{{PATH_TO_ROOT_FOLDER}}\\Update.exe.FriendlyAppName"="Nylas Mail" "{{PATH_TO_ROOT_FOLDER}}\\Update.exe.ApplicationCompany"="Nylas" diff --git a/build/tasks/installer-mac-task.js b/build/tasks/installer-mac-task.js index 24505b1d4..6caec01ce 100644 --- a/build/tasks/installer-mac-task.js +++ b/build/tasks/installer-mac-task.js @@ -6,20 +6,20 @@ const path = require('path'); module.exports = (grunt) => { const {spawn} = require('./task-helpers')(grunt); - grunt.registerTask('create-mac-installer', 'Zip up N1', function pack() { + grunt.registerTask('create-mac-installer', 'Zip up Nylas Mail', function pack() { const done = this.async(); - const zipPath = path.join(grunt.config('outputDir'), 'N1.zip'); + const zipPath = path.join(grunt.config('outputDir'), 'NylasMail.zip'); if (grunt.file.exists(zipPath)) { grunt.file.delete(zipPath, {force: true}); } const orig = process.cwd(); - process.chdir(path.join(grunt.config('outputDir'), 'Nylas N1-darwin-x64')); + process.chdir(path.join(grunt.config('outputDir'), 'Nylas Mail-darwin-x64')); spawn({ cmd: "zip", - args: ["-9", "-y", "-r", "-9", "-X", zipPath, 'Nylas N1.app'], + args: ["-9", "-y", "-r", "-9", "-X", zipPath, 'Nylas Mail.app'], }, (error) => { process.chdir(orig); diff --git a/build/tasks/installer-windows-task.js b/build/tasks/installer-windows-task.js index a2daf6cff..6fe3e9cc2 100644 --- a/build/tasks/installer-windows-task.js +++ b/build/tasks/installer-windows-task.js @@ -18,7 +18,7 @@ module.exports = (grunt) => { title: appPackageJSON.productName, authors: 'Nylas Inc.', setupIcon: path.join(grunt.config('appDir'), 'build', 'resources', 'win', 'nylas.ico'), - setupExe: 'N1Setup.exe', + setupExe: 'NylasMailSetup.exe', exe: 'nylas.exe', name: 'Nylas', }, diff --git a/build/tasks/package-task.js b/build/tasks/package-task.js index d9183b071..371301de2 100644 --- a/build/tasks/package-task.js +++ b/build/tasks/package-task.js @@ -150,7 +150,7 @@ module.exports = (grunt) => { linux: undefined, }[platform], 'name': { - darwin: 'Nylas N1', + darwin: 'Nylas Mail', win32: 'nylas', linux: 'nylas', }[platform], @@ -230,7 +230,7 @@ module.exports = (grunt) => { CompanyName: 'Nylas, Inc.', FileDescription: 'The best email app for people and teams at work', LegalCopyright: `Copyright (C) 2014-${new Date().getFullYear()} Nylas, Inc. All rights reserved.`, - ProductName: 'Nylas N1', + ProductName: 'Nylas Mail', }, // NOTE: The following plist keys can NOT be set in the // nylas-Info.plist since they are manually overridden by @@ -261,7 +261,7 @@ module.exports = (grunt) => { }, }) - grunt.registerTask('packager', 'Package build of N1', function pack() { + grunt.registerTask('packager', 'Package build of Nylas Mail', function pack() { const done = this.async(); console.log('---> Running build with options:'); diff --git a/build/tasks/publish-task.js b/build/tasks/publish-task.js index 88879ef29..d6725f20c 100644 --- a/build/tasks/publish-task.js +++ b/build/tasks/publish-task.js @@ -87,7 +87,7 @@ module.exports = (grunt) => { function uploadToS3(filepath, key) { grunt.log.writeln(`>> Uploading ${filepath} to ${key}…`); return put(filepath, key).then((data) => { - const msg = `N1 release asset uploaded: <${data.Location}|${key}>`; + const msg = `Nylas Mail release asset uploaded: <${data.Location}|${key}>`; return postToSlack(msg).then(() => Promise.resolve(data)); }); } @@ -104,8 +104,8 @@ module.exports = (grunt) => { if (process.platform === 'darwin') { uploads.push({ - source: `${outputDir}/N1.zip`, - key: `${fullVersion}/${process.platform}/${process.arch}/N1.zip`, + source: `${outputDir}/NylasMail.zip`, + key: `${fullVersion}/${process.platform}/${process.arch}/NylasMail.zip`, }); } else if (process.platform === 'win32') { uploads.push({ @@ -113,8 +113,8 @@ module.exports = (grunt) => { key: `${fullVersion}/${process.platform}/${process.arch}/RELEASES`, }); uploads.push({ - source: `${outputDir}/N1Setup.exe`, - key: `${fullVersion}/${process.platform}/${process.arch}/N1Setup.exe`, + source: `${outputDir}/NylasMailSetup.exe`, + key: `${fullVersion}/${process.platform}/${process.arch}/NylasMailSetup.exe`, }); uploads.push({ source: `${outputDir}/Nylas-${packageVersion}-full.nupkg`, @@ -126,14 +126,14 @@ module.exports = (grunt) => { if (path.extname(file) === '.deb') { uploads.push({ source: `${outputDir}/${file}`, - key: `${fullVersion}/${process.platform}-deb/${process.arch}/N1.deb`, + key: `${fullVersion}/${process.platform}-deb/${process.arch}/NylasMail.deb`, options: {ContentType: "application/x-deb"}, }); } if (path.extname(file) === '.rpm') { uploads.push({ source: `${outputDir}/${file}`, - key: `${fullVersion}/${process.platform}-rpm/${process.arch}/N1.rpm`, + key: `${fullVersion}/${process.platform}-rpm/${process.arch}/NylasMail.rpm`, options: {ContentType: "application/x-rpm"}, }); } diff --git a/docs/Windows.md b/docs/Windows.md index c04cdb54b..c3d16ddcb 100644 --- a/docs/Windows.md +++ b/docs/Windows.md @@ -27,7 +27,7 @@ to a compilation error, it is likely a Visual Studio configuration issue. ## Visual Studio There are several versions of Visual Studio. `node-gyp` is designed to detect -the current version installed on your system. Nylas N1 only officially supports +the current version installed on your system. Nylas Mail only officially supports Visual Studio 2013. If you are using Visual Studio 2015, be sure you chose to install the C++ features in the Visual Studio installer. diff --git a/internal_packages/message-autoload-images/spec/fixtures/marketing-email-in.html b/internal_packages/message-autoload-images/spec/fixtures/marketing-email-in.html index 9f211b212..64628496a 100644 --- a/internal_packages/message-autoload-images/spec/fixtures/marketing-email-in.html +++ b/internal_packages/message-autoload-images/spec/fixtures/marketing-email-in.html @@ -940,7 +940,7 @@ div{color:#202020}.logo div a{color:#202020}.logo div a:hover{color:#202020 !imp -

It's been almost 2 months since we released Nylas N1. Our team has been hard at work on this latest update, including awesome new plugins, a beautiful Windows version, and details of our roadmap. Read on for full details!

+

It's been almost 2 months since we released Nylas Mail. Our team has been hard at work on this latest update, including awesome new plugins, a beautiful Windows version, and details of our roadmap. Read on for full details!

diff --git a/internal_packages/message-autoload-images/spec/fixtures/marketing-email-out.html b/internal_packages/message-autoload-images/spec/fixtures/marketing-email-out.html index 6bc4703bf..bd82c446f 100644 --- a/internal_packages/message-autoload-images/spec/fixtures/marketing-email-out.html +++ b/internal_packages/message-autoload-images/spec/fixtures/marketing-email-out.html @@ -940,7 +940,7 @@ div{color:#202020}.logo div a{color:#202020}.logo div a:hover{color:#202020 !imp -

It's been almost 2 months since we released Nylas N1. Our team has been hard at work on this latest update, including awesome new plugins, a beautiful Windows version, and details of our roadmap. Read on for full details!

+

It's been almost 2 months since we released Nylas Mail. Our team has been hard at work on this latest update, including awesome new plugins, a beautiful Windows version, and details of our roadmap. Read on for full details!

diff --git a/internal_packages/mode-switch/lib/main.es6 b/internal_packages/mode-switch/lib/main.es6 index 72d254475..d92eaa5e7 100644 --- a/internal_packages/mode-switch/lib/main.es6 +++ b/internal_packages/mode-switch/lib/main.es6 @@ -5,7 +5,7 @@ import ModeToggle from './mode-toggle'; const ToggleWithTutorialTip = HasTutorialTip(ModeToggle, { title: 'Compose with context', - instructions: "N1 shows you everything about your contacts right inside your inbox. See LinkedIn profiles, Twitter bios, message history, and more.", + instructions: "Nylas Mail shows you everything about your contacts right inside your inbox. See LinkedIn profiles, Twitter bios, message history, and more.", }); // NOTE: this is a hack to allow ComponentRegistry diff --git a/internal_packages/notifications/lib/items/account-error-notif.jsx b/internal_packages/notifications/lib/items/account-error-notif.jsx index c93f45818..d09535460 100644 --- a/internal_packages/notifications/lib/items/account-error-notif.jsx +++ b/internal_packages/notifications/lib/items/account-error-notif.jsx @@ -67,7 +67,7 @@ export default class AccountErrorNotification extends React.Component { const erroredAccount = erroredAccounts[0]; switch (erroredAccount.syncState) { case Account.SYNC_STATE_N1_CLOUD_AUTH_FAILED: - title = `Cannot authenticate N1 Cloud Services with ${erroredAccount.emailAddress}`; + title = `Cannot authenticate Nylas Mail Cloud Services with ${erroredAccount.emailAddress}`; actions = [{ label: "Check Again", fn: () => this._onCheckAgain(erroredAccount), diff --git a/internal_packages/notifications/lib/items/default-client-notif.jsx b/internal_packages/notifications/lib/items/default-client-notif.jsx index 0730a6a30..30e33333b 100644 --- a/internal_packages/notifications/lib/items/default-client-notif.jsx +++ b/internal_packages/notifications/lib/items/default-client-notif.jsx @@ -58,7 +58,7 @@ export default class DefaultClientNotification extends React.Component { } return ( ) } diff --git a/internal_packages/notifications/lib/items/offline-notification.jsx b/internal_packages/notifications/lib/items/offline-notification.jsx index 0814209e4..f95e3b7b7 100644 --- a/internal_packages/notifications/lib/items/offline-notification.jsx +++ b/internal_packages/notifications/lib/items/offline-notification.jsx @@ -67,7 +67,7 @@ export default class OfflineNotification extends React.Component { return ( { const errorStatusCode = err.statusCode if (err.errorType === "setting_update_error") { - errorMessage = 'The IMAP/SMTP servers for this account do not match our records. Please verify that any server names you entered are correct. If your IMAP/SMTP server has changed, first remove this account from N1, then try logging in again.'; + errorMessage = 'The IMAP/SMTP servers for this account do not match our records. Please verify that any server names you entered are correct. If your IMAP/SMTP server has changed, first remove this account from Nylas Mail, then try logging in again.'; } if (err.errorType && err.errorType.includes("autodiscover") && (accountInfo.type === 'exchange')) { errorFieldNames.push('eas_server_host') diff --git a/internal_packages/onboarding/lib/page-initial-preferences.cjsx b/internal_packages/onboarding/lib/page-initial-preferences.cjsx index 5f7c0341c..7b52a6f1c 100644 --- a/internal_packages/onboarding/lib/page-initial-preferences.cjsx +++ b/internal_packages/onboarding/lib/page-initial-preferences.cjsx @@ -124,7 +124,7 @@ class InitialPreferencesPage extends React.Component render: =>
-

Welcome to N1

+

Welcome to Nylas Mail

Let's set things up to your liking.

diff --git a/internal_packages/onboarding/lib/page-tutorial.jsx b/internal_packages/onboarding/lib/page-tutorial.jsx index 73fd8eac2..c0df12997 100644 --- a/internal_packages/onboarding/lib/page-tutorial.jsx +++ b/internal_packages/onboarding/lib/page-tutorial.jsx @@ -7,7 +7,7 @@ const Steps = [ id: 'people', title: 'Compose with context', image: 'feature-people@2x.png', - description: "N1 shows you everything about your contacts right inside your inbox. See LinkedIn profiles, Twitter bios, message history, and more.", + description: "Nylas Mail shows you everything about your contacts right inside your inbox. See LinkedIn profiles, Twitter bios, message history, and more.", x: 96.6, y: 1.3, xDot: 93.5, @@ -18,7 +18,7 @@ const Steps = [ id: 'activity', title: 'Track opens and clicks', image: 'feature-activity@2x.png', - description: "With activity tracking, you’ll know as soon as someone reads your message. Sending to a group? N1 shows you which recipients opened your email so you can follow up with precision.", + description: "With activity tracking, you’ll know as soon as someone reads your message. Sending to a group? Nylas Mail shows you which recipients opened your email so you can follow up with precision.", x: 12.8, y: 1, xDot: 15, @@ -29,7 +29,7 @@ const Steps = [ // id: 'snooze', // title: 'Send on your own schedule', // image: 'feature-snooze@2x.png', - // description: "Snooze emails to return at any time that suits you. Schedule messages to send at the ideal time. N1 makes it easy to control the fabric of spacetime!", + // description: "Snooze emails to return at any time that suits you. Schedule messages to send at the ideal time. Nylas Mail makes it easy to control the fabric of spacetime!", // x: 5.5, // y: 23.3, // xDot: 10, @@ -40,7 +40,7 @@ const Steps = [ // id: 'composer', // title: 'Eliminate hacky extensions', // image: 'feature-composer@2x.png', - // description: "Embed calendar invitations, propose meeting times, use quick reply templates, send mass emails with mail merge, and more—all directly from N1’s powerful composer.", + // description: "Embed calendar invitations, propose meeting times, use quick reply templates, send mass emails with mail merge, and more—all directly from Nylas Mail’s powerful composer.", // x: 60.95, // y: 66, // xDot: 60.3, diff --git a/internal_packages/onboarding/lib/page-welcome.jsx b/internal_packages/onboarding/lib/page-welcome.jsx index d234f7146..4471afdd3 100644 --- a/internal_packages/onboarding/lib/page-welcome.jsx +++ b/internal_packages/onboarding/lib/page-welcome.jsx @@ -24,7 +24,7 @@ export default class WelcomePage extends React.Component {
-

Welcome to Nylas N1

+

Welcome to Nylas Mail

diff --git a/internal_packages/preferences/lib/tabs/preferences-account-details.jsx b/internal_packages/preferences/lib/tabs/preferences-account-details.jsx index e551c047d..a25197ab7 100644 --- a/internal_packages/preferences/lib/tabs/preferences-account-details.jsx +++ b/internal_packages/preferences/lib/tabs/preferences-account-details.jsx @@ -148,14 +148,14 @@ class PreferencesAccountDetails extends Component { switch (account.syncState) { case Account.N1_Cloud_AUTH_FAILED: return this._renderErrorDetail( - `Nylas N1 can no longer authenticate N1 Cloud Services with + `Nylas Mail can no longer authenticate N1 Cloud Services with ${account.emailAddress}. The password or authentication may have changed.`, "Reconnect", this._onReconnect); case Account.SYNC_STATE_AUTH_FAILED: return this._renderErrorDetail( - `Nylas N1 can no longer authenticate with ${account.emailAddress}. The password or + `Nylas Mail can no longer authenticate with ${account.emailAddress}. The password or authentication may have changed.`, "Reconnect", this._onReconnect); diff --git a/internal_packages/preferences/lib/tabs/preferences-identity.jsx b/internal_packages/preferences/lib/tabs/preferences-identity.jsx index 494d9e691..38aa557d4 100644 --- a/internal_packages/preferences/lib/tabs/preferences-identity.jsx +++ b/internal_packages/preferences/lib/tabs/preferences-identity.jsx @@ -121,7 +121,7 @@ class PreferencesIdentity extends React.Component { return (
- Your subscription is valid until {new Date(identity.valid_until * 1000).toLocaleDateString()}. Enjoy N1! + Your subscription is valid until {new Date(identity.valid_until * 1000).toLocaleDateString()}. Enjoy Nylas Mail!
) diff --git a/internal_packages/preferences/lib/tabs/workspace-section.jsx b/internal_packages/preferences/lib/tabs/workspace-section.jsx index 71d9dd66a..0262e0660 100644 --- a/internal_packages/preferences/lib/tabs/workspace-section.jsx +++ b/internal_packages/preferences/lib/tabs/workspace-section.jsx @@ -43,7 +43,7 @@ class DefaultMailClientItem extends React.Component { checked={this.state.defaultClient} onChange={this.toggleDefaultMailClient} /> - +
); } diff --git a/internal_packages/remove-tracking-pixels/spec/fixtures/a-after.txt b/internal_packages/remove-tracking-pixels/spec/fixtures/a-after.txt index cdfc350e8..15028cd7a 100644 --- a/internal_packages/remove-tracking-pixels/spec/fixtures/a-after.txt +++ b/internal_packages/remove-tracking-pixels/spec/fixtures/a-after.txt @@ -5,16 +5,16 @@ could you please put me in touch with them, so that we can get you guys set up correctly as soon as possible?

Thanks!

Gleb Polyakov

Head of Business Development and Growth

After Pixel -

Sent from Nylas N1, the extensible, open source mail client.
+

Sent from Nylas Mail, the extensible, open source mail client.
On Apr 28 2016, at 2:14 pm, Ben Gotow (Careless) <careless@foundry376.com> wrote:
- nother mailA

Sent from Nylas N1, the extensible, open source mail client.
+ nother mailA

Sent from Nylas Mail, the extensible, open source mail client.
On Apr 28 2016, at 1:46 pm, Ben Gotow (Careless) <careless@foundry376.com> wrote:
- Hi Ben this is just a test.

Sent from Nylas N1, the extensible, open source mail client.
+ Hi Ben this is just a test.

Sent from Nylas Mail, the extensible, open source mail client.
On Apr 26 2016, at 6:03 pm, Ben Gotow <bengotow@gmail.com> wrote:
diff --git a/internal_packages/remove-tracking-pixels/spec/fixtures/a-before.txt b/internal_packages/remove-tracking-pixels/spec/fixtures/a-before.txt index fe1cb1371..a5ea939db 100644 --- a/internal_packages/remove-tracking-pixels/spec/fixtures/a-before.txt +++ b/internal_packages/remove-tracking-pixels/spec/fixtures/a-before.txt @@ -5,16 +5,16 @@ could you please put me in touch with them, so that we can get you guys set up correctly as soon as possible?

Thanks!

Gleb Polyakov

Head of Business Development and Growth

After Pixel -

Sent from Nylas N1, the extensible, open source mail client.
+

Sent from Nylas Mail, the extensible, open source mail client.
On Apr 28 2016, at 2:14 pm, Ben Gotow (Careless) <careless@foundry376.com> wrote:
- nother mailA

Sent from Nylas N1, the extensible, open source mail client.
+ nother mailA

Sent from Nylas Mail, the extensible, open source mail client.
On Apr 28 2016, at 1:46 pm, Ben Gotow (Careless) <careless@foundry376.com> wrote:
- Hi Ben this is just a test.

Sent from Nylas N1, the extensible, open source mail client.
+ Hi Ben this is just a test.

Sent from Nylas Mail, the extensible, open source mail client.
On Apr 26 2016, at 6:03 pm, Ben Gotow <bengotow@gmail.com> wrote:
diff --git a/internal_packages/ui-darkside/README.md b/internal_packages/ui-darkside/README.md index bb4c6f301..7c5465cb1 100644 --- a/internal_packages/ui-darkside/README.md +++ b/internal_packages/ui-darkside/README.md @@ -1,8 +1,8 @@ # Darkside -**An dark sidebar theme for [Nylas N1](https://nylas.com/n1). Created by [Jamie Wilson](http://jamiewilson.io)** +**An dark sidebar theme for [Nylas Mail](https://nylas.com/n1). Created by [Jamie Wilson](http://jamiewilson.io)** ## Activation -Darkside comes [pre-installed](https://github.com/nylas/N1/tree/master/internal_packages/ui-darkside) with N1. To change themes, go to `Nylas N1 > Change Theme…` in the menu bar, then select `Darkside`. Learn more at [support.nylas.com](https://support.nylas.com/hc/en-us/articles/217557858-How-do-I-change-my-theme-). +Darkside comes [pre-installed](https://github.com/nylas/N1/tree/master/internal_packages/ui-darkside) with N1. To change themes, go to `Nylas Mail > Change Theme…` in the menu bar, then select `Darkside`. Learn more at [support.nylas.com](https://support.nylas.com/hc/en-us/articles/217557858-How-do-I-change-my-theme-). ## Customization In order to customize Darkside, you'll need to manually install it. @@ -18,7 +18,7 @@ In order to customize Darkside, you'll need to manually install it. #### 2. Manual Install -> To manually install a theme, go to `Nylas N1 > Install Theme…` in the menu bar. Select the `ui-darkside` folder you just downloaded. This will copy the folder into your N1 packages directory so you can delete the orginal download if you want to. +> To manually install a theme, go to `Nylas Mail > Install Theme…` in the menu bar. Select the `ui-darkside` folder you just downloaded. This will copy the folder into your N1 packages directory so you can delete the orginal download if you want to. #### 3. Customize diff --git a/internal_packages/ui-darkside/package.json b/internal_packages/ui-darkside/package.json index 679c4293d..afff44c62 100644 --- a/internal_packages/ui-darkside/package.json +++ b/internal_packages/ui-darkside/package.json @@ -3,7 +3,7 @@ "displayName": "Darkside", "theme": "ui", "version": "1.0.0", - "description": "A customizable, dark sidebar theme for Nylas N1.", + "description": "A customizable, dark sidebar theme for Nylas Mail.", "license": "MIT", "engines": { "nylas": "*" diff --git a/internal_packages/ui-less-is-more/package.json b/internal_packages/ui-less-is-more/package.json index 1390968ed..4d6b4dbc7 100644 --- a/internal_packages/ui-less-is-more/package.json +++ b/internal_packages/ui-less-is-more/package.json @@ -3,7 +3,7 @@ "displayName": "Less Is More", "theme": "ui-less-is-more", "version": "1.0.7", - "description": "A minimal approach to email in Nylas N1", + "description": "A minimal approach to email in Nylas Mail", "license": "MIT", "engines": { "nylas": "*" diff --git a/internal_packages/ui-taiga/README.md b/internal_packages/ui-taiga/README.md index e29fd6da8..80df74b07 100644 --- a/internal_packages/ui-taiga/README.md +++ b/internal_packages/ui-taiga/README.md @@ -6,7 +6,7 @@ Taiga is a clean, simple, Mailbox-inspired theme for N1 that allows you to focus ## Installing -1. [Download](https://nylas.com/n1) Nylas N1 email client if you have not yet +1. [Download](https://nylas.com/n1) Nylas Mail email client if you have not yet 2. [Grab](https://github.com/noahbuscher/N1-Taiga/releases) the latest release of Taiga 3. Open `N1>Preferences>General>Select theme` and select `Install new theme...` from the dropdown diff --git a/internal_packages/ui-taiga/package.json b/internal_packages/ui-taiga/package.json index a8c74ef60..4f6865cb7 100644 --- a/internal_packages/ui-taiga/package.json +++ b/internal_packages/ui-taiga/package.json @@ -3,7 +3,7 @@ "displayName": "Taiga", "theme": "ui", "version": "0.2.8", - "description": "A clean, Mailbox-inspired theme for Nylas N1.", + "description": "A clean, Mailbox-inspired theme for Nylas Mail.", "license": "GPL-3.0", "engines": { "nylas": "*" diff --git a/internal_packages/ui-ubuntu/README.md b/internal_packages/ui-ubuntu/README.md index 60fa28101..7a46ce0d7 100644 --- a/internal_packages/ui-ubuntu/README.md +++ b/internal_packages/ui-ubuntu/README.md @@ -1,4 +1,4 @@ -# Ubuntu Theme for Nylas N1 # +# Ubuntu Theme for Nylas Mail # ![img](https://raw.githubusercontent.com/ahmedlhanafy/Ubuntu-Ui-Theme-for-Nylas-N1/master/Screenshot.png) diff --git a/internal_packages/verify-install-location/lib/main.es6 b/internal_packages/verify-install-location/lib/main.es6 index bce1af692..f88f10fc1 100644 --- a/internal_packages/verify-install-location/lib/main.es6 +++ b/internal_packages/verify-install-location/lib/main.es6 @@ -61,14 +61,14 @@ export function activate() { ] } - const msg = `We recommend that you move N1 to your Applications folder to get updates correctly and keep this folder uncluttered.` + const msg = `We recommend that you move Nylas Mail to your Applications folder to get updates correctly and keep this folder uncluttered.` const CANCEL_ID = 3; remote.dialog.showMessageBox({ type: "question", buttons: buttons, - title: "A Better Place to Install N1", + title: "A Better Place to Install Nylas Mail", message: "Move to Applications folder?", detail: msg, defaultId: 0, diff --git a/menus/darwin.json b/menus/darwin.json index cf3144cc3..30794e20b 100644 --- a/menus/darwin.json +++ b/menus/darwin.json @@ -1,9 +1,9 @@ { "menu": [ { - "label": "Nylas N1", + "label": "Nylas Mail", "submenu": [ - { "label": "About Nylas N1", "command": "application:about" }, + { "label": "About Nylas Mail", "command": "application:about" }, { "type": "separator" }, { "label": "Preferences", "command": "application:open-preferences" }, { "label": "Change Theme...", "command": "window:launch-theme-picker" }, @@ -19,7 +19,7 @@ { "type": "separator" }, { "label": "Services", "submenu": [] }, { "type": "separator" }, - { "label": "Hide Nylas N1", "command": "application:hide" }, + { "label": "Hide Nylas Mail", "command": "application:hide" }, { "label": "Hide Others", "command": "application:hide-other-applications" }, { "label": "Show All", "command": "application:unhide-all-applications" }, { "type": "separator" }, @@ -100,7 +100,7 @@ { "label": "Install a Plugin...", "command": "application:install-package" }, { "type": "separator" }, { "label": "Run Plugin Specs...", "command": "application:run-package-specs" }, - { "label": "Run N1 Specs", "command": "application:run-all-specs" }, + { "label": "Run Nylas Mail Specs", "command": "application:run-all-specs" }, { "type": "separator" }, { "label": "Open Detailed Logs", "command": "window:open-errorlogger-logs" } ] @@ -119,7 +119,7 @@ { "label": "Help", "submenu": [ - { "label": "Nylas N1 Help", "command": "application:view-help" } + { "label": "Nylas Mail Help", "command": "application:view-help" } ] } ] diff --git a/menus/linux.json b/menus/linux.json index d230cac6c..de262ea07 100644 --- a/menus/linux.json +++ b/menus/linux.json @@ -99,7 +99,7 @@ "submenu": [ { "label": "VERSION", "enabled": false }, { "type": "separator" }, - { "label": "Nylas N1 Help", "command": "application:view-help" } + { "label": "Nylas Mail Help", "command": "application:view-help" } ] } ] diff --git a/package.json b/package.json index d278e2c52..4e5e7c0be 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "nylas", - "productName": "Nylas N1", + "productName": "Nylas Mail", "version": "0.5.9", "description": "The best email app for people and teams at work", "license": "GPL-3.0", diff --git a/spec/fixtures/emails/email_19.html b/spec/fixtures/emails/email_19.html index 178fee660..8c9363b9f 100644 --- a/spec/fixtures/emails/email_19.html +++ b/spec/fixtures/emails/email_19.html @@ -9,7 +9,7 @@ and again
Sent from -Nylas N1, the extensible, open source mail client., the extensible, open source mail client. @@ -22,7 +22,7 @@ hey evan sorry to spam you so much

Sent from -Nylas N1, the extensible, open source mail client. , the extensible, open source mail client.

@@ -33,7 +33,7 @@ wat

Sent from -Nylas N1, the extensible, open source mail client., the extensible, open source mail client.

@@ -44,7 +44,7 @@ this should only happen once

Sent from -Nylas N1, the extensible, open source mail client., the extensible, open source mail client.

@@ -55,7 +55,7 @@ and again

Sent from -Nylas N1, the extensible, open source mail client., the extensible, open source mail client.

@@ -64,7 +64,7 @@ On Nov 4 2016, at 1:13 pm, Juan Tejada <juan@nylas.com> wrote:
eft:1ex;"> and some other stuff

-Sent from Nylas N1, the exten= +Sent from Nylas Mail, the exten= sible, open source mail client.
diff --git a/spec/fixtures/emails/email_19_stripped.html b/spec/fixtures/emails/email_19_stripped.html index 12d8da810..b65f3d72b 100644 --- a/spec/fixtures/emails/email_19_stripped.html +++ b/spec/fixtures/emails/email_19_stripped.html @@ -5,7 +5,7 @@ and again

Sent from -Nylas N1, the extensible, open source mail client. +Nylas Mail, the extensible, open source mail client.


diff --git a/spec/fixtures/emails/email_23.html b/spec/fixtures/emails/email_23.html index 68db4e81d..d32689316 100644 --- a/spec/fixtures/emails/email_23.html +++ b/spec/fixtures/emails/email_23.html @@ -172,7 +172,7 @@ On Oct 24 2016, at 11:54 pm, Last, Name <(858) 531-1718

Sent from -Nylas N1, the extensible, open source mail client.
+Nylas Mail, the extensible, open source mail client.
@@ -202,7 +202,7 @@ On Oct 18 2016, at 7:21 pm, Last, Name <Evan

Sent from -Nylas N1, the extensible, open source mail client.
+Nylas Mail, the extensible, open source mail client.
@@ -237,7 +237,7 @@ On Oct 18 2016, at 2:03 pm, Last, Name <(858) 531-1718

Sent from -Nylas N1, the extensible, open source mail client.
+Nylas Mail, the extensible, open source mail client.
@@ -277,7 +277,7 @@ On Oct 7 2016, at 9:17 am, Last, Name <(858) 531-1718

Sent from -Nylas N1, the extensible, open source mail client.
+Nylas Mail, the extensible, open source mail client.
diff --git a/spec/models/message-spec.coffee b/spec/models/message-spec.coffee index b1a6e22bb..beabfb069 100644 --- a/spec/models/message-spec.coffee +++ b/spec/models/message-spec.coffee @@ -31,7 +31,7 @@ describe "Message", -> { itMsg: "has plain br's and a signature" body: """ -


Sent from Nylas N1, the extensible, open source mail client.
+


Sent from Nylas Mail, the extensible, open source mail client.
""" isEmpty: true }, @@ -53,14 +53,14 @@ describe "Message", -> { itMsg: "has empty tags" body: """ -

\n\n\n\n
Sent from Nylas N1, the extensible, open source mail client.
+

\n\n\n\n
Sent from Nylas Mail, the extensible, open source mail client.
""" isEmpty: true }, { itMsg: "has nested characters" body: """ -

1

\n\n\n\n
Sent from Nylas N1, the extensible, open source mail client.
+

1

\n\n\n\n
Sent from Nylas Mail, the extensible, open source mail client.
""" isEmpty: false }, diff --git a/src/K2 b/src/K2 index 8bbf18373..69aaff86b 160000 --- a/src/K2 +++ b/src/K2 @@ -1 +1 @@ -Subproject commit 8bbf18373b2726cdccd8ac030af5dc23d4577b3e +Subproject commit 69aaff86bf7f0d8f92d80e7d27b5de165b3a0edf diff --git a/src/browser/application.es6 b/src/browser/application.es6 index 7fc813dce..2ba8fe445 100644 --- a/src/browser/application.es6 +++ b/src/browser/application.es6 @@ -180,7 +180,7 @@ export default class Application extends EventEmitter { this.windowManager.ensureWindow(WindowManager.WORK_WINDOW); } else { this.windowManager.ensureWindow(WindowManager.ONBOARDING_WINDOW, { - title: "Welcome to N1", + title: "Welcome to Nylas Mail", }); this.windowManager.ensureWindow(WindowManager.WORK_WINDOW); } diff --git a/src/browser/main.js b/src/browser/main.js index 1e1518edd..28ab2ee4a 100644 --- a/src/browser/main.js +++ b/src/browser/main.js @@ -50,7 +50,7 @@ const setupErrorLogger = (args = {}) => { const declareOptions = (argv) => { const optimist = require('optimist'); const options = optimist(argv); - options.usage("Nylas N1 v" + (app.getVersion()) + "\n\nUsage: n1 [options]\n\nRun N1: The open source extensible email client\n\n`n1 --dev` to start the client in dev mode.\n\n`n1 --test` to run unit tests."); + options.usage("Nylas Mail v" + (app.getVersion()) + "\n\nUsage: n1 [options]\n\nRun N1: The open source extensible email client\n\n`n1 --dev` to start the client in dev mode.\n\n`n1 --test` to run unit tests."); options.alias('d', 'dev').boolean('d').describe('d', 'Run in development mode.'); options.alias('t', 'test').boolean('t').describe('t', 'Run the specified specs and exit with error code on failures.'); options.boolean('safe').describe('safe', 'Do not load packages from ~/.nylas/packages or ~/.nylas/dev/packages.'); diff --git a/src/browser/nylas-window.coffee b/src/browser/nylas-window.coffee index afa8ee6f0..fd50151ff 100644 --- a/src/browser/nylas-window.coffee +++ b/src/browser/nylas-window.coffee @@ -46,7 +46,7 @@ class NylasWindow browserWindowOptions = show: false - title: title ? 'Nylas N1' + title: title ? 'Nylas Mail' frame: frame width: width height: height diff --git a/src/default-client-helper.coffee b/src/default-client-helper.coffee index bf14bcd57..8313040c4 100644 --- a/src/default-client-helper.coffee +++ b/src/default-client-helper.coffee @@ -23,7 +23,7 @@ class Windows type: 'info', buttons: ['Learn More'], message: "Visit Windows Settings to change your default mail client", - detail: "You'll find Nylas N1, along with other options, listed in Default Apps > Mail.", + detail: "You'll find Nylas Mail, along with other options, listed in Default Apps > Mail.", }, -> shell.openExternal('https://support.nylas.com/hc/en-us/articles/229277648') @@ -47,7 +47,7 @@ class Windows type: 'info', buttons: ['Learn More'], defaultId: 1, - message: "Visit Windows Settings to finish making Nylas N1 your mail client", + message: "Visit Windows Settings to finish making Nylas Mail your mail client", detail: "Click 'Learn More' to view instructions in our knowledge base.", }, -> shell.openExternal('https://support.nylas.com/hc/en-us/articles/229277648') diff --git a/src/error-logger.js b/src/error-logger.js index 30ba8e0e2..9e0e31a93 100644 --- a/src/error-logger.js +++ b/src/error-logger.js @@ -172,7 +172,7 @@ module.exports = ErrorLogger = (function() { if (process.type === 'renderer') { logpid = remote.process.pid + "." + process.pid; } - return path.join(tmpPath, 'Nylas-N1-' + logpid + '.log'); + return path.join(tmpPath, 'Nylas-Mail-' + logpid + '.log'); } // If we're the browser process, remove log files that are more than @@ -187,7 +187,7 @@ module.exports = ErrorLogger = (function() { return; } - var logFilter = new RegExp("Nylas-N1-[.0-9]*.log$"); + var logFilter = new RegExp("Nylas-Mail-[.0-9]*.log$"); files.forEach(function(file) { if (logFilter.test(file) === true) { var filepath = path.join(tmpPath, file); diff --git a/src/flux/models/message.es6 b/src/flux/models/message.es6 index f0992967c..2d310a823 100644 --- a/src/flux/models/message.es6 +++ b/src/flux/models/message.es6 @@ -406,7 +406,7 @@ Message(date DESC) WHERE draft = 1`, return ( this.to.length === 1 && this.from.length === 1 && this.to[0].email === this.from[0].email && - (this.snippet || "").startsWith('Nylas N1 Reminder:') + (this.snippet || "").startsWith('Nylas Mail Reminder:') ) } } diff --git a/src/flux/stores/signature-store.es6 b/src/flux/stores/signature-store.es6 index c8865fbeb..1e390c925 100644 --- a/src/flux/stores/signature-store.es6 +++ b/src/flux/stores/signature-store.es6 @@ -2,7 +2,7 @@ import {Utils, Actions, AccountStore} from 'nylas-exports'; import NylasStore from 'nylas-store' import _ from 'underscore' -const DefaultSignatureText = "Sent from Nylas N1, the extensible, open source mail client."; +const DefaultSignatureText = "Sent from Nylas Mail, the extensible, open source mail client."; class SignatureStore extends NylasStore { diff --git a/src/key-manager.es6 b/src/key-manager.es6 index 46131b93e..cbebad664 100644 --- a/src/key-manager.es6 +++ b/src/key-manager.es6 @@ -11,8 +11,8 @@ import keytar from 'keytar' */ class KeyManager { constructor() { - this.SERVICE_NAME = "Nylas N1"; - this.KEY_NAME = "Nylas N1 Keys" + this.SERVICE_NAME = "Nylas Mail"; + this.KEY_NAME = "Nylas Mail Keys" this._alreadyMigrated = new Set() } diff --git a/src/system-start-service.es6 b/src/system-start-service.es6 index 2f2755e92..f22dc87e4 100644 --- a/src/system-start-service.es6 +++ b/src/system-start-service.es6 @@ -52,7 +52,7 @@ class SystemStartServiceDarwin extends SystemStartServiceBase { } _launcherPath() { - return path.join("/", "Applications", "Nylas N1.app", "Contents", + return path.join("/", "Applications", "Nylas Mail.app", "Contents", "MacOS", "Nylas") } @@ -149,7 +149,7 @@ class SystemStartServiceLinux extends SystemStartServiceBase { _shortcutPath() { const configDir = process.env.XDG_CONFIG_HOME || path.join(os.homedir(), '.config'); - return path.join(configDir, 'autostart', 'nylas-n1.desktop'); + return path.join(configDir, 'autostart', 'nylas-mail.desktop'); } } diff --git a/src/task.coffee b/src/task.coffee index 89819f424..fa49cbf4b 100644 --- a/src/task.coffee +++ b/src/task.coffee @@ -77,7 +77,7 @@ class Task taskPath = require.resolve(taskPath) taskPath = taskPath.replace(/\\/g, "\\\\") - env = _.extend({}, process.env, {taskPath, userAgent: 'NylasN1'}) + env = _.extend({}, process.env, {taskPath, userAgent: 'NylasMail'}) @childProcess = ChildProcess.fork '--eval', [bootstrap], {env, silent: true} @on "task:log", -> console.log(arguments...) diff --git a/static/index.html b/static/index.html index ebefc2642..d405a5b58 100644 --- a/static/index.html +++ b/static/index.html @@ -1,7 +1,7 @@ - Nylas N1 + Nylas Mail @@ -24,7 +24,7 @@

- +