mirror of
https://github.com/Foundry376/Mailspring.git
synced 2025-12-12 20:36:29 +01:00
Replace references to Nylas in many places
This commit is contained in:
2
.gitignore
vendored
2
.gitignore
vendored
@@ -37,7 +37,7 @@ certs
|
||||
# Built cloud files
|
||||
n1_cloud_dist
|
||||
|
||||
# Built Nylas Mail client
|
||||
# Built client
|
||||
app/dist
|
||||
|
||||
# Tests
|
||||
|
||||
@@ -1,17 +1,17 @@
|
||||
# Filing an Issue
|
||||
|
||||
Thanks for checking out Nylas Mail! If you have a feature request, be sure to check out the [open source roadmap](http://trello.com/b/hxsqB6vx/n1-open-source-roadmap). If someone has already requested
|
||||
Thanks for checking out Merani! If you have a feature request, be sure to check out the [open source roadmap](http://trello.com/b/hxsqB6vx/n1-open-source-roadmap). If someone has already requested
|
||||
the feature you have in mind, you can upvote the card on Trello—to keep things organized, we
|
||||
often close feature requests on GitHub after creating Trello cards.
|
||||
|
||||
If you've found a bug, try searching for similars issue before filing a new one. Please include
|
||||
the version of Nylas Mail you're using, the platform you're using (Mac / Windows / Linux), and the
|
||||
the version of Merani you're using, the platform you're using (Mac / Windows / Linux), and the
|
||||
type of email account. (Gmail, Outlook 365, etc.)
|
||||
|
||||
# Pull requests
|
||||
|
||||
We require all authors sign our [Contributor License
|
||||
Agreement](https://www.nylas.com/cla.html) before pull requests (even
|
||||
Agreement](https://www.getmerani.com/cla.html) before pull requests (even
|
||||
minor ones) can be accepted. (It's similar to other projects, like NodeJS
|
||||
Meteor, or React). I'm really sorry, but Legal made us do it.
|
||||
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
<!--
|
||||
Thanks for taking the time to file an issue! If you have general question or a problem with your email account, take a quick look at the Nylas Mail Knowledge Base to see if you question is addressed there:
|
||||
Thanks for taking the time to file an issue! If you have general question or a problem with your email account, take a quick look at the Merani Knowledge Base to see if you question is addressed there:
|
||||
|
||||
https://support.nylas.com/hc/en-us/sections/203638587-N1_
|
||||
|
||||
@@ -8,13 +8,13 @@ actionable, try to include the following information:
|
||||
-->
|
||||
|
||||
##### Are there any related issues?
|
||||
<!-- Try searching for both open and closed issues here: https://github.com/nylas/nylas-mail/issues?q=is%3Aissue. Keep in mind that email features are often described differently on different platforms. (Conversations == threads, shortcuts == hotkeys, etc.) -->
|
||||
<!-- Try searching for both open and closed issues here: https://github.com/Foundry376/Merani/issues?q=is%3Aissue. Keep in mind that email features are often described differently on different platforms. (Conversations == threads, shortcuts == hotkeys, etc.) -->
|
||||
...
|
||||
|
||||
##### What operating system are you using?
|
||||
...
|
||||
|
||||
##### What version of Nylas Mail are you using?
|
||||
##### What version of Merani are you using?
|
||||
...
|
||||
|
||||
--
|
||||
|
||||
49
README.md
49
README.md
@@ -29,36 +29,35 @@ See [ROADMAP.md](https://github.com/Foundry376/Merani/blob/master/ROADMAP.md)
|
||||
|
||||
----------------
|
||||
|
||||
**Nylas Mail is an open-source mail client built on the modern web with [Electron](https://github.com/atom/electron), [React](https://facebook.github.io/react/), and [Flux](https://facebook.github.io/flux/).** It is designed to be extensible, so it's easy to create new experiences and workflows around email. Want to learn more? Check out the [full documentation](https://nylas.github.io/nylas-mail/).
|
||||
**Merani is an open-source mail client built on the modern web with [Electron](https://github.com/atom/electron), [React](https://facebook.github.io/react/), and [Flux](https://facebook.github.io/flux/).** It is designed to be extensible, so it's easy to create new experiences and workflows around email. Want to learn more? Check out the [full documentation](https://Foundry376.github.io/Merani/).
|
||||
|
||||
[](http://slack-invite.nylas.com)
|
||||
[](http://slack-invite.getmerani.com)
|
||||
|
||||
#### Want to help build the future of email? [Nylas is hiring](https://jobs.lever.co/nylas)!
|
||||
|
||||
## Download Nylas Mail
|
||||
## Download Merani
|
||||
|
||||
You can download compiled versions of Nylas Mail for Windows, Mac OS X, and Linux (.deb) from [https://nylas.com/download](https://nylas.com/download). You can also build and run Nylas Mail (Previously N1) on Fedora. On Arch Linux, you can install **[n1](https://aur.archlinux.org/packages/n1/)** or **[n1-git](https://aur.archlinux.org/packages/n1-git/)** from the aur.
|
||||
You can download compiled versions of Merani for Windows, Mac OS X, and Linux (.deb) from [https://getmerani.com/download](https://getmerani.com/download). You can also build and run Merani (Previously N1) on Fedora. On Arch Linux, you can install **[n1](https://aur.archlinux.org/packages/n1/)** or **[n1-git](https://aur.archlinux.org/packages/n1-git/)** from the aur.
|
||||
|
||||
## Build A Plugin
|
||||
|
||||
Plugins lie at the heart of Nylas Mail and give it its powerful features. Building your own plugins allows you to integrate the app with other tools, experiment with new workflows, and more. Follow the [Getting Started guide](https://nylas.github.io/nylas-mail/) to write your first plugin in five minutes. To create your own theme, go to our [Theme Starter guide](https://github.com/nylas/N1-theme-starter).
|
||||
Plugins lie at the heart of Merani and give it its powerful features. Building your own plugins allows you to integrate the app with other tools, experiment with new workflows, and more. Follow the [Getting Started guide](https://Foundry376.github.io/Merani/) to write your first plugin in five minutes. To create your own theme, go to our [Theme Starter guide](https://github.com/nylas/N1-theme-starter).
|
||||
|
||||
If you would like to run the N1 source and contribute, check out our [contributing
|
||||
guide](https://github.com/nylas/nylas-mail/blob/master/CONTRIBUTING.md).
|
||||
guide](https://github.com/Foundry376/Merani/blob/master/CONTRIBUTING.md).
|
||||
|
||||
## Themes
|
||||
|
||||
The Nylas Mail user interface is styled using CSS, which means it's easy to modify and extend. Nylas Mail comes stock with a few beautiful themes, and there are many more which have been built by community developers
|
||||
The Merani user interface is styled using CSS, which means it's easy to modify and extend. Merani comes stock with a few beautiful themes, and there are many more which have been built by community developers
|
||||
|
||||
<center><img width=550 src="http://i.imgur.com/PWQ7NlY.jpg"></center>
|
||||
|
||||
|
||||
#### Bundled Themes
|
||||
- [Dark](https://github.com/nylas/nylas-mail/tree/master/internal_packages/ui-dark)
|
||||
- [Darkside](https://github.com/nylas/nylas-mail/tree/master/internal_packages/ui-darkside) (designed by [Jamie Wilson](https://github.com/jamiewilson))
|
||||
- [Taiga](https://github.com/nylas/nylas-mail/tree/master/internal_packages/ui-taiga) (designed by [Noah Buscher](https://github.com/noahbuscher))
|
||||
- [Ubuntu](https://github.com/nylas/nylas-mail/tree/master/internal_packages/ui-ubuntu) (designed by [Ahmed Elhanafy](https://github.com/ahmedlhanafy))
|
||||
- [Less Is More](https://github.com/nylas/nylas-mail/tree/master/internal_packages/ui-less-is-more) (designed by [Alexander Adkins](https://github.com/P0WW0W))
|
||||
- [Dark](https://github.com/Foundry376/Merani/tree/master/internal_packages/ui-dark)
|
||||
- [Darkside](https://github.com/Foundry376/Merani/tree/master/internal_packages/ui-darkside) (designed by [Jamie Wilson](https://github.com/jamiewilson))
|
||||
- [Taiga](https://github.com/Foundry376/Merani/tree/master/internal_packages/ui-taiga) (designed by [Noah Buscher](https://github.com/noahbuscher))
|
||||
- [Ubuntu](https://github.com/Foundry376/Merani/tree/master/internal_packages/ui-ubuntu) (designed by [Ahmed Elhanafy](https://github.com/ahmedlhanafy))
|
||||
- [Less Is More](https://github.com/Foundry376/Merani/tree/master/internal_packages/ui-less-is-more) (designed by [Alexander Adkins](https://github.com/P0WW0W))
|
||||
|
||||
|
||||
|
||||
@@ -94,8 +93,8 @@ The Nylas Mail user interface is styled using CSS, which means it's easy to modi
|
||||
#### To install community themes:
|
||||
|
||||
1. Download and unzip the repo
|
||||
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-mail` folder for your convinence
|
||||
2. In Merani, 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 Merani settings folder for your convinence
|
||||
5. Select `Change Theme...` from the top level menu, and you'll see the newly installed theme. That's it!
|
||||
|
||||
|
||||
@@ -103,21 +102,21 @@ Want to dive in more? Try [creating your own theme](https://github.com/nylas/nyl
|
||||
|
||||
|
||||
## Plugin List
|
||||
We're working on building a plugin index that makes it super easy to add them to Nylas Mail. For now, check out the list below! (Feel free to submit a PR if you build a plugin and want it featured here.)
|
||||
We're working on building a plugin index that makes it super easy to add them to Merani. For now, check out the list below! (Feel free to submit a PR if you build a plugin and want it featured here.)
|
||||
|
||||
|
||||
#### Bundled Plugins
|
||||
Great starting points for creating your own plugins!
|
||||
- [Translate](https://github.com/nylas/nylas-mail/tree/master/internal_packages/composer-translate)—Works with 10 languages
|
||||
- [Quick Replies](https://github.com/nylas/nylas-mail/tree/master/internal_packages/composer-templates)—Send emails faster with templates
|
||||
- [Emoji Keyboard](https://github.com/nylas/nylas-mail/tree/master/internal_packages/composer-emoji)—Insert emoji by typing a colon (:) followed by the name of an emoji symbol
|
||||
- [GitHub Sidebar Info](https://github.com/nylas/nylas-mail/tree/master/internal_packages/github-contact-card)
|
||||
- [View on GitHub](https://github.com/nylas/nylas-mail/tree/master/internal_packages/message-view-on-github)
|
||||
- [Personal Level Indicators](https://github.com/nylas/nylas-mail/tree/master/internal_packages/personal-level-indicators)
|
||||
- [Phishing Detection](https://github.com/nylas/nylas-mail/tree/master/internal_packages/phishing-detection)
|
||||
- [Translate](https://github.com/Foundry376/Merani/tree/master/internal_packages/composer-translate)—Works with 10 languages
|
||||
- [Quick Replies](https://github.com/Foundry376/Merani/tree/master/internal_packages/composer-templates)—Send emails faster with templates
|
||||
- [Emoji Keyboard](https://github.com/Foundry376/Merani/tree/master/internal_packages/composer-emoji)—Insert emoji by typing a colon (:) followed by the name of an emoji symbol
|
||||
- [GitHub Sidebar Info](https://github.com/Foundry376/Merani/tree/master/internal_packages/github-contact-card)
|
||||
- [View on GitHub](https://github.com/Foundry376/Merani/tree/master/internal_packages/message-view-on-github)
|
||||
- [Personal Level Indicators](https://github.com/Foundry376/Merani/tree/master/internal_packages/personal-level-indicators)
|
||||
- [Phishing Detection](https://github.com/Foundry376/Merani/tree/master/internal_packages/phishing-detection)
|
||||
|
||||
## Configuration
|
||||
You can configure Nylas Mail in a few ways—for instance, pointing it to your self-hosted instance of the sync engine or changing the interface zoom level. [Learn more about how.](https://github.com/nylas/nylas-mail/blob/master/CONFIGURATION.md)
|
||||
You can configure Merani in a few ways—for instance, pointing it to your self-hosted instance of the sync engine or changing the interface zoom level. [Learn more about how.](https://github.com/Foundry376/Merani/blob/master/CONFIGURATION.md)
|
||||
|
||||
## Feature Requests / Plugin Ideas
|
||||
Have an idea for a package or a feature you'd love to see in Nylas Mail? Search for existing [GitHub issues](https://github.com/nylas/nylas-mail/issues) and join the conversation!
|
||||
Have an idea for a package or a feature you'd love to see in Merani? Search for existing [GitHub issues](https://github.com/Foundry376/Merani/issues) and join the conversation!
|
||||
|
||||
@@ -5,7 +5,7 @@ Target Ship Date: Late September
|
||||
#### C++ MailSync
|
||||
*Goal: Reduce bugginess and battery impact, enable new controls over what mail data is synced, and dramatically improve performance by moving mailsync to a new C++ codebase based on MailCore2.*
|
||||
|
||||
- [x] Build a lightweight C++ command-line application that syncs mail using `MailCore2` and `libcurl` and writes to the same sqlite3 database schema used by Nylas Mail.
|
||||
- [x] Build a lightweight C++ command-line application that syncs mail using `MailCore2` and `libcurl` and writes to the same sqlite3 database schema used by Merani.
|
||||
- [x] Remove the client-sync package and the Activity window and implement `MailsyncProcess`/`MailsyncBridge` wrappers around new C++ codebase. Broadcast database events from the C++ app into the JavaScript app so the UI updates as data changes.
|
||||
- [x] Remove thread and contact search indexing, perform indexing as data is retrieved from IMAP in C++.
|
||||
- [x] Remove migration support from JavaScript. Run the C++ app at launch with `--migrate` to run migrations before the main window is displayed.
|
||||
|
||||
@@ -14,14 +14,14 @@ const config = {
|
||||
outputDirectory: path.join(appDir, 'dist'),
|
||||
appDirectory: path.join(appDir, 'dist', 'merani-win32-ia32'),
|
||||
loadingGif: path.join(appDir, 'build', 'resources', 'win', 'loading.gif'),
|
||||
iconUrl: 'http://edgehill.s3.amazonaws.com/static/nylas.ico',
|
||||
iconUrl: 'http://edgehill.s3.amazonaws.com/static/merani.ico',
|
||||
certificateFile: process.env.CERTIFICATE_FILE,
|
||||
certificatePassword: process.env.WINDOWS_CODESIGN_KEY_PASSWORD,
|
||||
description: "Merani",
|
||||
version: version,
|
||||
title: "merani",
|
||||
authors: 'Foundry 376, LLC',
|
||||
setupIcon: path.join(appDir, 'build', 'resources', 'win', 'nylas.ico'),
|
||||
setupIcon: path.join(appDir, 'build', 'resources', 'win', 'merani.ico'),
|
||||
setupExe: 'MeraniSetup.exe',
|
||||
exe: 'merani.exe',
|
||||
name: 'Merani',
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
# Nylas Mail SDK
|
||||
# Merani SDK
|
||||
|
||||
* Nylas Mail SDK Guides
|
||||
* Merani SDK Guides
|
||||
* [Introduction](/README.md)
|
||||
* [Getting Started](/guides/GettingStarted.md)
|
||||
* [Getting Started Part 2](/guides/GettingStarted-2.md)
|
||||
@@ -8,7 +8,7 @@
|
||||
* [Interface Concepts](/guides/InterfaceConcepts.md)
|
||||
* [UI Components](/guides/React.md)
|
||||
* [Application Architecture](/guides/Architecture.md)
|
||||
* [Debugging Nylas Mail](/guides/Debugging.md)
|
||||
* [Debugging Merani](/guides/Debugging.md)
|
||||
* [Accessing the Database](/guides/Database.md)
|
||||
* [Extending the Composer](/guides/ComposerExtensions.md)
|
||||
* [Writing Tests](/guides/WritingSpecs.md)
|
||||
|
||||
|
Before Width: | Height: | Size: 17 KiB After Width: | Height: | Size: 17 KiB |
|
Before Width: | Height: | Size: 161 KiB After Width: | Height: | Size: 161 KiB |
Binary file not shown.
Binary file not shown.
60
app/build/resources/win/merani-mailto-registration.reg
Executable file
60
app/build/resources/win/merani-mailto-registration.reg
Executable file
@@ -0,0 +1,60 @@
|
||||
Windows Registry Editor Version 5.00
|
||||
|
||||
[{{HKEY_ROOT}}\SOFTWARE\Classes\Merani.Url.mailto]
|
||||
"FriendlyTypeName"="Merani Url"
|
||||
|
||||
[{{HKEY_ROOT}}\SOFTWARE\Classes\Merani.Url.mailto\shell]
|
||||
|
||||
[{{HKEY_ROOT}}\SOFTWARE\Classes\Merani.Url.mailto\shell\open]
|
||||
|
||||
[{{HKEY_ROOT}}\SOFTWARE\Classes\Merani.Url.mailto\shell\open\command]
|
||||
@="\"{{PATH_TO_ROOT_FOLDER}}\\Update.exe\" --processStart merani.exe --process-start-args %1"
|
||||
|
||||
|
||||
[{{HKEY_ROOT}}\SOFTWARE\Clients\Mail\Merani]
|
||||
@="Merani"
|
||||
"LocalizedString"="@{{PATH_TO_ROOT_FOLDER}}\\Update.exe,-123"
|
||||
|
||||
[{{HKEY_ROOT}}\SOFTWARE\Clients\Mail\Merani\DefaultIcon]
|
||||
@="{{PATH_TO_APP_FOLDER}}\\merani.exe,1"
|
||||
|
||||
[{{HKEY_ROOT}}\SOFTWARE\Clients\Mail\Merani\Capabilities]
|
||||
"ApplicationName"="Merani"
|
||||
"ApplicationDescription"="A fast, modern mail client designed to help you boost your productivity."
|
||||
|
||||
[{{HKEY_ROOT}}\SOFTWARE\Clients\Mail\Merani\Capabilities\StartMenu]
|
||||
"Mail"="Merani"
|
||||
|
||||
[{{HKEY_ROOT}}\SOFTWARE\Clients\Mail\Merani\Capabilities\URLAssociations]
|
||||
"mailto"="Merani.Url.mailto"
|
||||
|
||||
[{{HKEY_ROOT}}\SOFTWARE\Clients\Mail\Merani\Protocols]
|
||||
|
||||
[{{HKEY_ROOT}}\SOFTWARE\Clients\Mail\Merani\Protocols\mailto]
|
||||
@="URL:MailTo Protocol"
|
||||
|
||||
[{{HKEY_ROOT}}\SOFTWARE\Clients\Mail\Merani\Protocols\mailto\DefaultIcon]
|
||||
@="{{PATH_TO_APP_FOLDER}}\\merani.exe,1"
|
||||
|
||||
[{{HKEY_ROOT}}\SOFTWARE\Clients\Mail\Merani\Protocols\mailto\shell]
|
||||
|
||||
[{{HKEY_ROOT}}\SOFTWARE\Clients\Mail\Merani\Protocols\mailto\shell\open]
|
||||
|
||||
[{{HKEY_ROOT}}\SOFTWARE\Clients\Mail\Merani\Protocols\mailto\shell\open\command]
|
||||
@="\"{{PATH_TO_ROOT_FOLDER}}\\Update.exe\" --processStart merani.exe --process-start-args %1"
|
||||
|
||||
[{{HKEY_ROOT}}\SOFTWARE\Clients\Mail\Merani\shell]
|
||||
|
||||
[{{HKEY_ROOT}}\SOFTWARE\Clients\Mail\Merani\shell\open]
|
||||
|
||||
[{{HKEY_ROOT}}\SOFTWARE\Clients\Mail\Merani\shell\open\command]
|
||||
@="\"{{PATH_TO_ROOT_FOLDER}}\\Update.exe\" --processStart merani.exe"
|
||||
|
||||
[{{HKEY_ROOT}}\SOFTWARE\RegisteredApplications]
|
||||
"Merani"="Software\\Clients\\Mail\\Merani\\Capabilities"
|
||||
|
||||
|
||||
[HKEY_CURRENT_USER\SOFTWARE\Classes\Local Settings\Software\Microsoft\Windows\Shell\MuiCache]
|
||||
"{{PATH_TO_ROOT_FOLDER}}\\Update.exe"="Merani"
|
||||
"{{PATH_TO_ROOT_FOLDER}}\\Update.exe.FriendlyAppName"="Merani"
|
||||
"{{PATH_TO_ROOT_FOLDER}}\\Update.exe.ApplicationCompany"="Merani"
|
||||
|
Before Width: | Height: | Size: 26 KiB After Width: | Height: | Size: 26 KiB |
@@ -1,60 +0,0 @@
|
||||
Windows Registry Editor Version 5.00
|
||||
|
||||
[{{HKEY_ROOT}}\SOFTWARE\Classes\Nylas.Url.mailto]
|
||||
"FriendlyTypeName"="Nylas Url"
|
||||
|
||||
[{{HKEY_ROOT}}\SOFTWARE\Classes\Nylas.Url.mailto\shell]
|
||||
|
||||
[{{HKEY_ROOT}}\SOFTWARE\Classes\Nylas.Url.mailto\shell\open]
|
||||
|
||||
[{{HKEY_ROOT}}\SOFTWARE\Classes\Nylas.Url.mailto\shell\open\command]
|
||||
@="\"{{PATH_TO_ROOT_FOLDER}}\\Update.exe\" --processStart nylas.exe --process-start-args %1"
|
||||
|
||||
|
||||
[{{HKEY_ROOT}}\SOFTWARE\Clients\Mail\Nylas]
|
||||
@="Nylas"
|
||||
"LocalizedString"="@{{PATH_TO_ROOT_FOLDER}}\\Update.exe,-123"
|
||||
|
||||
[{{HKEY_ROOT}}\SOFTWARE\Clients\Mail\Nylas\DefaultIcon]
|
||||
@="{{PATH_TO_APP_FOLDER}}\\nylas.exe,1"
|
||||
|
||||
[{{HKEY_ROOT}}\SOFTWARE\Clients\Mail\Nylas\Capabilities]
|
||||
"ApplicationName"="Nylas Mail"
|
||||
"ApplicationDescription"="A fast, modern mail client designed to help you boost your productivity."
|
||||
|
||||
[{{HKEY_ROOT}}\SOFTWARE\Clients\Mail\Nylas\Capabilities\StartMenu]
|
||||
"Mail"="Nylas"
|
||||
|
||||
[{{HKEY_ROOT}}\SOFTWARE\Clients\Mail\Nylas\Capabilities\URLAssociations]
|
||||
"mailto"="Nylas.Url.mailto"
|
||||
|
||||
[{{HKEY_ROOT}}\SOFTWARE\Clients\Mail\Nylas\Protocols]
|
||||
|
||||
[{{HKEY_ROOT}}\SOFTWARE\Clients\Mail\Nylas\Protocols\mailto]
|
||||
@="URL:MailTo Protocol"
|
||||
|
||||
[{{HKEY_ROOT}}\SOFTWARE\Clients\Mail\Nylas\Protocols\mailto\DefaultIcon]
|
||||
@="{{PATH_TO_APP_FOLDER}}\\nylas.exe,1"
|
||||
|
||||
[{{HKEY_ROOT}}\SOFTWARE\Clients\Mail\Nylas\Protocols\mailto\shell]
|
||||
|
||||
[{{HKEY_ROOT}}\SOFTWARE\Clients\Mail\Nylas\Protocols\mailto\shell\open]
|
||||
|
||||
[{{HKEY_ROOT}}\SOFTWARE\Clients\Mail\Nylas\Protocols\mailto\shell\open\command]
|
||||
@="\"{{PATH_TO_ROOT_FOLDER}}\\Update.exe\" --processStart nylas.exe --process-start-args %1"
|
||||
|
||||
[{{HKEY_ROOT}}\SOFTWARE\Clients\Mail\Nylas\shell]
|
||||
|
||||
[{{HKEY_ROOT}}\SOFTWARE\Clients\Mail\Nylas\shell\open]
|
||||
|
||||
[{{HKEY_ROOT}}\SOFTWARE\Clients\Mail\Nylas\shell\open\command]
|
||||
@="\"{{PATH_TO_ROOT_FOLDER}}\\Update.exe\" --processStart nylas.exe"
|
||||
|
||||
[{{HKEY_ROOT}}\SOFTWARE\RegisteredApplications]
|
||||
"Nylas"="Software\\Clients\\Mail\\Nylas\\Capabilities"
|
||||
|
||||
|
||||
[HKEY_CURRENT_USER\SOFTWARE\Classes\Local Settings\Software\Microsoft\Windows\Shell\MuiCache]
|
||||
"{{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"
|
||||
@@ -2,14 +2,14 @@ const path = require('path');
|
||||
const createDMG = require('electron-installer-dmg')
|
||||
|
||||
module.exports = (grunt) => {
|
||||
grunt.registerTask('create-mac-dmg', 'Create DMG for Nylas Mail', function pack() {
|
||||
grunt.registerTask('create-mac-dmg', 'Create DMG for Merani', function pack() {
|
||||
const done = this.async();
|
||||
const dmgPath = path.join(grunt.config('outputDir'), "Merani.dmg");
|
||||
createDMG({
|
||||
appPath: path.join(grunt.config('outputDir'), "Merani-darwin-x64", "Merani.app"),
|
||||
name: "Merani",
|
||||
background: path.resolve(grunt.config('appDir'), 'build', 'resources', 'mac', 'Nylas-Mail-DMG-background.png'),
|
||||
icon: path.resolve(grunt.config('appDir'), 'build', 'resources', 'mac', 'nylas.icns'),
|
||||
background: path.resolve(grunt.config('appDir'), 'build', 'resources', 'mac', 'DMG-background.png'),
|
||||
icon: path.resolve(grunt.config('appDir'), 'build', 'resources', 'mac', 'merani.icns'),
|
||||
overwrite: true,
|
||||
out: grunt.config('outputDir'),
|
||||
}, (err) => {
|
||||
|
||||
@@ -95,13 +95,13 @@ module.exports = (grunt) => {
|
||||
linuxShareDir: '/usr/share/merani',
|
||||
arch: arch,
|
||||
section: 'devel',
|
||||
maintainer: 'Nylas Team <support@nylas.com>',
|
||||
maintainer: 'Merani Team <support@getmerani.com>',
|
||||
installedSize: installedSize,
|
||||
}
|
||||
writeFromTemplate(path.join(linuxAssetsDir, 'debian', 'control.in'), data)
|
||||
writeFromTemplate(path.join(linuxAssetsDir, 'merani.desktop.in'), data)
|
||||
|
||||
const icon = path.join(grunt.config('appDir'), 'build', 'resources', 'nylas.png')
|
||||
const icon = path.join(grunt.config('appDir'), 'build', 'resources', 'merani.png')
|
||||
const cmd = path.join(grunt.config('appDir'), 'script', 'mkdeb');
|
||||
const args = [version, arch, icon, linuxAssetsDir, contentsDir, outputDir];
|
||||
spawn({cmd, args}, (spawnError) => {
|
||||
|
||||
@@ -134,8 +134,8 @@ module.exports = (grunt) => {
|
||||
'win32': 'ia32',
|
||||
}[platform],
|
||||
'icon': {
|
||||
darwin: path.resolve(grunt.config('appDir'), 'build', 'resources', 'mac', 'nylas.icns'),
|
||||
win32: path.resolve(grunt.config('appDir'), 'build', 'resources', 'win', 'nylas.ico'),
|
||||
darwin: path.resolve(grunt.config('appDir'), 'build', 'resources', 'mac', 'merani.icns'),
|
||||
win32: path.resolve(grunt.config('appDir'), 'build', 'resources', 'win', 'merani.ico'),
|
||||
linux: undefined,
|
||||
}[platform],
|
||||
'name': {
|
||||
|
||||
@@ -62,7 +62,7 @@ export function autolink(doc, {async} = {}) {
|
||||
exclude: [/\..*[/|?].*@/],
|
||||
}],
|
||||
['tel:', RegExpUtils.phoneRegex()],
|
||||
['', RegExpUtils.nylasCommandRegex()],
|
||||
['', RegExpUtils.meraniCommandRegex()],
|
||||
['', RegExpUtils.urlRegex({matchEntireString: false})],
|
||||
];
|
||||
|
||||
|
||||
@@ -5,7 +5,7 @@ import ModeToggle from './mode-toggle';
|
||||
|
||||
const ToggleWithTutorialTip = HasTutorialTip(ModeToggle, {
|
||||
title: 'Compose with context',
|
||||
instructions: "Nylas Mail shows you everything about your contacts right inside your inbox. See LinkedIn profiles, Twitter bios, message history, and more.",
|
||||
instructions: "Merani 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
|
||||
|
||||
@@ -26,7 +26,7 @@ export default class AccountErrorNotification extends React.Component {
|
||||
}
|
||||
|
||||
_onContactSupport = (erroredAccount) => {
|
||||
let url = 'https://support.nylas.com/hc/en-us/requests/new'
|
||||
let url = 'https://support.getmerani.com/hc/en-us/requests/new'
|
||||
if (erroredAccount) {
|
||||
url += `?email=${encodeURIComponent(erroredAccount.emailAddress)}`
|
||||
const {syncError} = erroredAccount
|
||||
@@ -86,7 +86,7 @@ export default class AccountErrorNotification extends React.Component {
|
||||
} else {
|
||||
const erroredAccount = erroredAccounts[0];
|
||||
if (erroredAccount.hasN1CloudError()) {
|
||||
title = `Cannot authenticate Nylas Mail Cloud Services with ${erroredAccount.emailAddress}`;
|
||||
title = `Cannot authenticate Merani Cloud Services with ${erroredAccount.emailAddress}`;
|
||||
actions = [{
|
||||
label: checkAgainLabel,
|
||||
fn: (e) => this._onCheckAgain(e, erroredAccount),
|
||||
|
||||
@@ -58,7 +58,7 @@ export default class DefaultClientNotification extends React.Component {
|
||||
}
|
||||
return (
|
||||
<Notification
|
||||
title="Would you like to make Nylas Mail your default mail client?"
|
||||
title="Would you like to make Merani your default mail client?"
|
||||
priority="1"
|
||||
icon="volstead-defaultclient.png"
|
||||
actions={[{
|
||||
|
||||
@@ -20,7 +20,7 @@ export default class DevModeNotification extends React.Component {
|
||||
return (
|
||||
<Notification
|
||||
priority="0"
|
||||
title="Nylas Mail is running in dev mode!"
|
||||
title="Merani is running in dev mode!"
|
||||
/>
|
||||
)
|
||||
}
|
||||
|
||||
@@ -13,7 +13,7 @@ function OfflineNotification({isOnline, retryingInSeconds}) {
|
||||
return (
|
||||
<Notification
|
||||
className="offline"
|
||||
title="Nylas Mail is offline"
|
||||
title="Merani is offline"
|
||||
subtitle={subtitle}
|
||||
priority="5"
|
||||
icon="volstead-offline.png"
|
||||
|
||||
@@ -26,7 +26,7 @@ export default class UnstableChannelNotification extends React.Component {
|
||||
}
|
||||
|
||||
_onReportIssue = () => {
|
||||
NylasEnv.windowEventHandler.openLink({href: 'mailto:support@nylas.com'})
|
||||
NylasEnv.windowEventHandler.openLink({href: 'mailto:support@getmerani.com'})
|
||||
}
|
||||
|
||||
render() {
|
||||
|
||||
@@ -34,7 +34,7 @@ export default class UpdateNotification extends React.Component {
|
||||
}
|
||||
|
||||
_onViewChangelog = () => {
|
||||
shell.openExternal('https://github.com/nylas/nylas-mail/releases/latest')
|
||||
shell.openExternal('https://github.com/Foundry376/Merani/releases/latest')
|
||||
}
|
||||
|
||||
render() {
|
||||
@@ -45,7 +45,7 @@ export default class UpdateNotification extends React.Component {
|
||||
return (
|
||||
<Notification
|
||||
priority="4"
|
||||
title={`An update to Nylas Mail is available ${version}`}
|
||||
title={`An update to Merani is available ${version}`}
|
||||
subtitle="View changelog"
|
||||
subtitleAction={this._onViewChangelog}
|
||||
icon="volstead-upgrade.png"
|
||||
|
||||
@@ -115,7 +115,7 @@ const CreatePageForForm = (FormComponent) => {
|
||||
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 Nylas Mail, 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 Merani, then try logging in again.';
|
||||
}
|
||||
if (err.errorType && err.errorType.includes("autodiscover") && (accountInfo.type === 'exchange')) {
|
||||
errorFieldNames.push('eas_server_host')
|
||||
@@ -178,10 +178,10 @@ const CreatePageForForm = (FormComponent) => {
|
||||
let articleURL;
|
||||
if (accountInfo.email.includes("@yahoo.com")) {
|
||||
message = "Have you enabled access through Yahoo?";
|
||||
articleURL = "https://support.nylas.com/hc/en-us/articles/115001076128";
|
||||
articleURL = "https://support.getmerani.com/hc/en-us/articles/115001076128";
|
||||
} else {
|
||||
message = "Some providers require an app password."
|
||||
articleURL = "https://support.nylas.com/hc/en-us/articles/115001056608";
|
||||
articleURL = "https://support.getmerani.com/hc/en-us/articles/115001056608";
|
||||
}
|
||||
// We don't use a FormErrorMessage component because the content
|
||||
// we need to display has HTML.
|
||||
|
||||
@@ -163,7 +163,7 @@ class OnboardingStore extends NylasStore {
|
||||
}
|
||||
} catch (e) {
|
||||
NylasEnv.reportError(e);
|
||||
NylasEnv.showErrorDialog("Unable to Connect Account", "Sorry, something went wrong on the Nylas server. Please try again. If you're still having issues, contact us at support@nylas.com.");
|
||||
NylasEnv.showErrorDialog("Unable to Connect Account", "Sorry, something went wrong on the Nylas server. Please try again. If you're still having issues, contact us at support@getmerani.com.");
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@@ -25,7 +25,7 @@ class AccountOnboardingSuccess extends Component { // eslint-disable-line
|
||||
</div>
|
||||
<div>
|
||||
<h2>Successfully connected to {accountType.displayName}!</h2>
|
||||
<h3>Adding your account to Nylas Mail…</h3>
|
||||
<h3>Adding your account to Merani…</h3>
|
||||
</div>
|
||||
</div>
|
||||
)
|
||||
|
||||
@@ -124,7 +124,7 @@ class InitialPreferencesPage extends React.Component
|
||||
|
||||
render: =>
|
||||
<div className="page opaque" style={width:900, height:620}>
|
||||
<h1 style={paddingTop: 100}>Welcome to Nylas Mail</h1>
|
||||
<h1 style={paddingTop: 100}>Welcome to Merani</h1>
|
||||
<h4 style={marginBottom: 70}>Let's set things up to your liking.</h4>
|
||||
<ConfigPropContainer>
|
||||
<InitialPreferencesOptions account={@state.account} />
|
||||
|
||||
@@ -7,7 +7,7 @@ const Steps = [
|
||||
id: 'people',
|
||||
title: 'Compose with context',
|
||||
image: 'feature-people@2x.png',
|
||||
description: "Nylas Mail shows you everything about your contacts right inside your inbox. See LinkedIn profiles, Twitter bios, message history, and more.",
|
||||
description: "Merani 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? Nylas Mail 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? Merani 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. Nylas Mail 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. Merani 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 Nylas Mail’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 Merani’s powerful composer.",
|
||||
// x: 60.95,
|
||||
// y: 66,
|
||||
// xDot: 60.3,
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
## Phishing Detection
|
||||
|
||||
A sample package for Nylas Mail to detect simple phishing attempts. This package display a simple warning if
|
||||
A sample package for Merani to detect simple phishing attempts. This package display a simple warning if
|
||||
a message's originating address is different from its return address. The warning looks like this:
|
||||
|
||||

|
||||
|
||||
@@ -112,7 +112,7 @@ class PreferencesAccountDetails extends Component {
|
||||
|
||||
_onContactSupport = () => {
|
||||
const {shell} = require("electron");
|
||||
shell.openExternal("https://support.nylas.com/hc/en-us/requests/new");
|
||||
shell.openExternal("https://support.getmerani.com/hc/en-us/requests/new");
|
||||
}
|
||||
|
||||
// Renderers
|
||||
@@ -148,14 +148,14 @@ class PreferencesAccountDetails extends Component {
|
||||
switch (account.syncState) {
|
||||
case Account.N1_Cloud_AUTH_FAILED:
|
||||
return this._renderErrorDetail(
|
||||
`Nylas Mail can no longer authenticate N1 Cloud Services with
|
||||
`Merani can no longer authenticate with Merani cloud services for
|
||||
${account.emailAddress}. The password or authentication may
|
||||
have changed.`,
|
||||
"Reconnect",
|
||||
this._onReconnect);
|
||||
case Account.SYNC_STATE_AUTH_FAILED:
|
||||
return this._renderErrorDetail(
|
||||
`Nylas Mail can no longer authenticate with ${account.emailAddress}. The password or
|
||||
`Merani can no longer authenticate with ${account.emailAddress}. The password or
|
||||
authentication may have changed.`,
|
||||
"Reconnect",
|
||||
this._onReconnect);
|
||||
|
||||
@@ -38,14 +38,14 @@ class PreferencesIdentity extends React.Component {
|
||||
}
|
||||
|
||||
_renderBasic() {
|
||||
const learnMore = () => shell.openExternal("https://nylas.com/nylas-pro")
|
||||
const learnMore = () => shell.openExternal("https://getmerani.com/pro")
|
||||
return (
|
||||
<div className="row padded">
|
||||
<div>
|
||||
You are using <strong>Nylas Mail Basic</strong>. Upgrade to Nylas Mail Pro to unlock a more powerful email experience.
|
||||
You are using <strong>Merani Basic</strong>. Upgrade to Merani Pro to unlock a more powerful email experience.
|
||||
</div>
|
||||
<div className="subscription-actions">
|
||||
<div className="btn btn-emphasis" onClick={this._onUpgrade} style={{verticalAlign: "top"}}>Upgrade to Nylas Mail Pro</div>
|
||||
<div className="btn btn-emphasis" onClick={this._onUpgrade} style={{verticalAlign: "top"}}>Upgrade to Merani Pro</div>
|
||||
<div className="btn minor-width" onClick={learnMore}>Learn More</div>
|
||||
</div>
|
||||
</div>
|
||||
@@ -56,7 +56,7 @@ class PreferencesIdentity extends React.Component {
|
||||
return (
|
||||
<div className="row padded">
|
||||
<div>
|
||||
Thank you for using <strong>Nylas Mail Pro</strong>
|
||||
Thank you for using <strong>Merani Pro</strong>
|
||||
</div>
|
||||
<div className="subscription-actions">
|
||||
<OpenIdentityPageButton label="Manage Billing" path="/dashboard#billing" source="Preferences Billing" campaign="Dashboard" />
|
||||
|
||||
@@ -51,14 +51,6 @@ class UpdateChannelSection extends React.Component {
|
||||
});
|
||||
|
||||
const displayNameForChannel = (channel) => {
|
||||
if (channel.name === 'beta') {
|
||||
return 'Beta (Unstable)';
|
||||
} else if (channel.name === 'nylas-mail') {
|
||||
return 'Nylas Mail (Stable)';
|
||||
} else if (channel.name === 'stable') {
|
||||
return 'Nylas Pro (Stable)';
|
||||
}
|
||||
|
||||
return channel.name[0].toUpperCase() + channel.name.substr(1)
|
||||
}
|
||||
|
||||
|
||||
@@ -43,7 +43,7 @@ class DefaultMailClientItem extends React.Component {
|
||||
checked={this.state.defaultClient}
|
||||
onChange={this.toggleDefaultMailClient}
|
||||
/>
|
||||
<label htmlFor="default-client">Use Nylas Mail as default mail client</label>
|
||||
<label htmlFor="default-client">Use Merani as default mail client</label>
|
||||
</div>
|
||||
);
|
||||
}
|
||||
|
||||
@@ -142,7 +142,7 @@ export function removeTrackingPixels(message) {
|
||||
// Remove Nylas read receipt pixels for the current account. If this is a
|
||||
// reply, our read receipt could still be in the body and could trigger
|
||||
// additional opens. (isFromMe is not sufficient!)
|
||||
if (imageURL.indexOf(`nylas.com/open/${message.accountId}`) >= 0) {
|
||||
if (imageURL.indexOf(`getmerani.com/open/${message.accountId}`) >= 0) {
|
||||
return true;
|
||||
}
|
||||
return false;
|
||||
|
||||
@@ -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?</p><p>Thanks!</p><p>Gleb Polyakov</p><p>Head of
|
||||
Business Development and Growth</p>After Pixel
|
||||
|
||||
<br><br><signature>Sent from <a href="https://nylas.com/n1?ref=n1">Nylas Mail</a>, the extensible, open source mail client.<br/></signature><div class="gmail_quote">
|
||||
<br><br><signature>Sent from <a href="https://getmerani.com/?ref=client">Merani</a>, the extensible, open source mail client.<br/></signature><div class="gmail_quote">
|
||||
On Apr 28 2016, at 2:14 pm, Ben Gotow (Careless) <careless@foundry376.com> wrote:
|
||||
<br>
|
||||
<blockquote class="gmail_quote"
|
||||
style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex;">
|
||||
<body>nother mailA<br /><br />Sent from <a href="https://link.nylas.com/link/b5djvgcuhj6i3x8nm53d0vnjm/local-a84ad76e-006b/0?redirect=https%3A%2F%2Fnylas.com%2Fn1%3Fref%3Dn1">Nylas Mail</a>, the extensible, open source mail client.<br /><img width="0" height="0" style="border:0; width:0; height:0;" src="https://link.nylas.com/open/b5djvgcuhj6i3x8nm53d0vnjm/local-a84ad76e-006b" /><div>
|
||||
<body>nother mailA<br /><br />Sent from <a href="https://link.getmerani.com/link/b5djvgcuhj6i3x8nm53d0vnjm/local-a84ad76e-006b/0?redirect=https%3A%2F%2Fnylas.com%2Fn1%3Fref%3Dn1">Merani</a>, the extensible, open source mail client.<br /><img width="0" height="0" style="border:0; width:0; height:0;" src="https://link.getmerani.com/open/b5djvgcuhj6i3x8nm53d0vnjm/local-a84ad76e-006b" /><div>
|
||||
On Apr 28 2016, at 1:46 pm, Ben Gotow (Careless) <careless@foundry376.com> wrote:
|
||||
<br />
|
||||
<blockquote style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex;">
|
||||
Hi Ben this is just a test.<br /><br />Sent from <a href="https://link.nylas.com/link/b5djvgcuhj6i3x8nm53d0vnjm/local-aa39d95b-b883/0?redirect=https%3A%2F%2Fnylas.com%2Fn1%3Fref%3Dn1">Nylas Mail</a>, the extensible, open source mail client.<br /><img width="0" height="0" style="border:0; width:0; height:0;" src="https://link.nylas.com/open/b5djvgcuhj6i3x8nm53d0vnjm/local-aa39d95b-b883" /><div>
|
||||
Hi Ben this is just a test.<br /><br />Sent from <a href="https://link.getmerani.com/link/b5djvgcuhj6i3x8nm53d0vnjm/local-aa39d95b-b883/0?redirect=https%3A%2F%2Fnylas.com%2Fn1%3Fref%3Dn1">Merani</a>, the extensible, open source mail client.<br /><img width="0" height="0" style="border:0; width:0; height:0;" src="https://link.getmerani.com/open/b5djvgcuhj6i3x8nm53d0vnjm/local-aa39d95b-b883" /><div>
|
||||
On Apr 26 2016, at 6:03 pm, Ben Gotow <bengotow@gmail.com> wrote:
|
||||
<br />
|
||||
<blockquote style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex;">
|
||||
|
||||
@@ -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?</p><p>Thanks!</p><p>Gleb Polyakov</p><p>Head of
|
||||
Business Development and Growth</p><img src="https://sdr.salesloft.com/email_trackers/8c8bea88-af43-4f66-bf78-a97ad73d7aec/open.gif" alt="" width="1" height="1">After Pixel
|
||||
|
||||
<br><br><signature>Sent from <a href="https://nylas.com/n1?ref=n1">Nylas Mail</a>, the extensible, open source mail client.<br/></signature><div class="gmail_quote">
|
||||
<br><br><signature>Sent from <a href="https://getmerani.com/?ref=client">Merani</a>, the extensible, open source mail client.<br/></signature><div class="gmail_quote">
|
||||
On Apr 28 2016, at 2:14 pm, Ben Gotow (Careless) <careless@foundry376.com> wrote:
|
||||
<br>
|
||||
<blockquote class="gmail_quote"
|
||||
style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex;">
|
||||
<body>nother mailA<br /><br />Sent from <a href="https://link.nylas.com/link/b5djvgcuhj6i3x8nm53d0vnjm/local-a84ad76e-006b/0?redirect=https%3A%2F%2Fnylas.com%2Fn1%3Fref%3Dn1">Nylas Mail</a>, the extensible, open source mail client.<br /><img width="0" height="0" style="border:0; width:0; height:0;" src="https://link.nylas.com/open/b5djvgcuhj6i3x8nm53d0vnjm/local-a84ad76e-006b" /><div>
|
||||
<body>nother mailA<br /><br />Sent from <a href="https://link.getmerani.com/link/b5djvgcuhj6i3x8nm53d0vnjm/local-a84ad76e-006b/0?redirect=https%3A%2F%2Fnylas.com%2Fn1%3Fref%3Dn1">Merani</a>, the extensible, open source mail client.<br /><img width="0" height="0" style="border:0; width:0; height:0;" src="https://link.getmerani.com/open/b5djvgcuhj6i3x8nm53d0vnjm/local-a84ad76e-006b" /><div>
|
||||
On Apr 28 2016, at 1:46 pm, Ben Gotow (Careless) <careless@foundry376.com> wrote:
|
||||
<br />
|
||||
<blockquote style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex;">
|
||||
Hi Ben this is just a test.<br /><br />Sent from <a href="https://link.nylas.com/link/b5djvgcuhj6i3x8nm53d0vnjm/local-aa39d95b-b883/0?redirect=https%3A%2F%2Fnylas.com%2Fn1%3Fref%3Dn1">Nylas Mail</a>, the extensible, open source mail client.<br /><img width="0" height="0" style="border:0; width:0; height:0;" src="https://link.nylas.com/open/b5djvgcuhj6i3x8nm53d0vnjm/local-aa39d95b-b883" /><div>
|
||||
Hi Ben this is just a test.<br /><br />Sent from <a href="https://link.getmerani.com/link/b5djvgcuhj6i3x8nm53d0vnjm/local-aa39d95b-b883/0?redirect=https%3A%2F%2Fnylas.com%2Fn1%3Fref%3Dn1">Merani</a>, the extensible, open source mail client.<br /><img width="0" height="0" style="border:0; width:0; height:0;" src="https://link.getmerani.com/open/b5djvgcuhj6i3x8nm53d0vnjm/local-aa39d95b-b883" /><div>
|
||||
On Apr 26 2016, at 6:03 pm, Ben Gotow <bengotow@gmail.com> wrote:
|
||||
<br />
|
||||
<blockquote style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex;">
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
<meta http-equiv="Content-Type" content="text/html; charset=utf-8"><p>Hey Ben,</p><p>
|
||||
This is the reply! This tracking pixel should not be removed.
|
||||
<img src="https://nylas.com/open/abcd/zza1231231" />
|
||||
<img src="https://getmerani.com/open/abcd/zza1231231" />
|
||||
<blockquote>
|
||||
This is the email I sent!
|
||||
|
||||
|
||||
@@ -1,8 +1,8 @@
|
||||
<meta http-equiv="Content-Type" content="text/html; charset=utf-8"><p>Hey Ben,</p><p>
|
||||
This is the reply! This tracking pixel should not be removed.
|
||||
<img src="https://nylas.com/open/abcd/zza1231231" />
|
||||
<img src="https://getmerani.com/open/abcd/zza1231231" />
|
||||
<blockquote>
|
||||
This is the email I sent!
|
||||
<img src="https://nylas.com/open/1234/12zxczxc123" />
|
||||
<img src="https://getmerani.com/open/1234/12zxczxc123" />
|
||||
</blockquote>
|
||||
</div>
|
||||
|
||||
@@ -1,29 +1,10 @@
|
||||
# Darkside
|
||||
**An dark sidebar theme for [Nylas Mail](https://nylas.com/n1). Created by [Jamie Wilson](http://jamiewilson.io)**
|
||||
**An dark sidebar theme for [Merani](https://getmerani.com). Created by [Jamie Wilson](http://jamiewilson.io)**
|
||||
|
||||
## Activation
|
||||
Darkside comes [pre-installed](https://github.com/nylas/nylas-mail/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.
|
||||
|
||||
#### 1. Download the `ui-darkside` folder.
|
||||
|
||||
> **Download Option 1:**
|
||||
> [Download just the 'ui-darkside' folder](https://kinolien.github.io/gitzip/?download=https://github.com/nylas/nylas-mail/tree/master/internal_packages/ui-darkside) thanks to the service [gitzip by @kinolien](https://kinolien.github.io/gitzip/).
|
||||
|
||||
|
||||
> **Download Option 2:**
|
||||
> [Download the entire N1 repo](https://github.com/nylas/nylas-mail/archive/master.zip) or `git clone https://github.com/nylas/nylas-mail.git`. Then grab the folder from `N1/internal_packages/ui-darkside`.
|
||||
|
||||
#### 2. Manual Install
|
||||
|
||||
> 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
|
||||
#### Customize
|
||||
|
||||
> **Open the theme directory**
|
||||
> If you're on a Mac, you can find the theme files at `~/.nylas-mail/packages`. To get there quickly, use the key command <kbd>Cmd</kbd> + <kbd>Shift</kbd> + <kbd>G</kbd> and enter `~/.nylas-mail/packages`.
|
||||
> If you're on a Mac, you can find the theme files at `/Library/Application Support/Merani/packages`. To get there quickly, use the key command <kbd>Cmd</kbd> + <kbd>Shift</kbd> + <kbd>G</kbd> and enter `/Library/Application Support/Merani/packages`.
|
||||
|
||||
> **Change package.json**
|
||||
> In order to avoid conflicts between your custom theme and the pre-installed version, change `name` and `displayName` in `package.json` to:
|
||||
|
||||
@@ -3,7 +3,7 @@
|
||||
"displayName": "Darkside",
|
||||
"theme": "ui",
|
||||
"version": "1.0.0",
|
||||
"description": "A customizable, dark sidebar theme for Nylas Mail.",
|
||||
"description": "A customizable, dark sidebar theme for Merani.",
|
||||
"license": "MIT",
|
||||
"engines": {
|
||||
"nylas": "*"
|
||||
|
||||
@@ -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 Mail",
|
||||
"description": "A minimal approach to email in Merani",
|
||||
"license": "MIT",
|
||||
"engines": {
|
||||
"nylas": "*"
|
||||
|
||||
@@ -3,11 +3,3 @@
|
||||
Taiga is a clean, simple, Mailbox-inspired theme for N1 that allows you to focus on what matters most: your emails.
|
||||
|
||||

|
||||
|
||||
## Installing
|
||||
|
||||
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
|
||||
|
||||
Profit! :money_with_wings:
|
||||
|
||||
@@ -3,7 +3,7 @@
|
||||
"displayName": "Taiga",
|
||||
"theme": "ui",
|
||||
"version": "0.2.8",
|
||||
"description": "A clean, Mailbox-inspired theme for Nylas Mail.",
|
||||
"description": "A clean, Mailbox-inspired theme for Merani.",
|
||||
"license": "GPL-3.0",
|
||||
"engines": {
|
||||
"nylas": "*"
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
# Ubuntu Theme for Nylas Mail #
|
||||
# Ubuntu Theme for Merani #
|
||||
|
||||

|
||||
|
||||
|
||||
@@ -61,15 +61,15 @@ export function activate() {
|
||||
]
|
||||
}
|
||||
|
||||
const msg = `We recommend that you move Nylas Mail to your Applications folder to get updates correctly and keep this folder uncluttered.`
|
||||
const msg = `We recommend that you move Merani to your Applications folder to get updates correctly and keep this folder uncluttered.`
|
||||
|
||||
const CANCEL_ID = 0;
|
||||
|
||||
remote.dialog.showMessageBox({
|
||||
type: "warning",
|
||||
buttons: buttons,
|
||||
title: "A Better Place to Install Nylas Mail",
|
||||
message: "Please move Nylas Mail to your Applications folder",
|
||||
title: "A Better Place to Install Merani",
|
||||
message: "Please move Merani to your Applications folder",
|
||||
detail: msg,
|
||||
defaultId: 0,
|
||||
cancelId: CANCEL_ID,
|
||||
|
||||
@@ -70,7 +70,7 @@ class TabInstalled extends React.Component {
|
||||
{`You don't have any packages installed in ~/.nylas-mail/dev/packages. `}
|
||||
These plugins are only loaded when you run the app with debug flags
|
||||
enabled (via the Developer menu).<br /><br />Learn more about building
|
||||
plugins with <a href="https://nylas.github.io/N1/docs/">our docs</a>.
|
||||
plugins with <a href="http://Foundry376.github.io/Merani/">our docs</a>.
|
||||
</span>);
|
||||
devCTA = (<div className="btn btn-small" onClick={this._onCreatePackage}>Create New Plugin...</div>);
|
||||
}
|
||||
|
||||
@@ -1,9 +1,9 @@
|
||||
{
|
||||
"menu": [
|
||||
{
|
||||
"label": "Nylas Mail",
|
||||
"label": "Merani",
|
||||
"submenu": [
|
||||
{ "label": "About Nylas Mail", "command": "application:about" },
|
||||
{ "label": "About Merani", "command": "application:about" },
|
||||
{ "type": "separator" },
|
||||
{ "label": "Preferences", "command": "application:open-preferences" },
|
||||
{ "label": "Change Theme...", "command": "window:launch-theme-picker" },
|
||||
@@ -18,7 +18,7 @@
|
||||
{ "type": "separator" },
|
||||
{ "label": "Services", "submenu": [] },
|
||||
{ "type": "separator" },
|
||||
{ "label": "Hide Nylas Mail", "command": "application:hide" },
|
||||
{ "label": "Hide Merani", "command": "application:hide" },
|
||||
{ "label": "Hide Others", "command": "application:hide-other-applications" },
|
||||
{ "label": "Show All", "command": "application:unhide-all-applications" },
|
||||
{ "type": "separator" },
|
||||
@@ -117,7 +117,7 @@
|
||||
{
|
||||
"label": "Help",
|
||||
"submenu": [
|
||||
{ "label": "Nylas Mail Help", "command": "application:view-help" }
|
||||
{ "label": "Merani Help", "command": "application:view-help" }
|
||||
]
|
||||
}
|
||||
]
|
||||
|
||||
@@ -96,7 +96,7 @@
|
||||
"submenu": [
|
||||
{ "label": "VERSION", "enabled": false },
|
||||
{ "type": "separator" },
|
||||
{ "label": "Nylas Mail Help", "command": "application:view-help" }
|
||||
{ "label": "Merani Help", "command": "application:view-help" }
|
||||
]
|
||||
}
|
||||
]
|
||||
|
||||
8
app/spec/fixtures/emails/email_1.html
vendored
8
app/spec/fixtures/emails/email_1.html
vendored
@@ -24,7 +24,7 @@ Karim</span></font></pre>
|
||||
<span style="font-weight:bold">Date: </span>jeudi 28 mai 2015 20:21<br>
|
||||
<span style="font-weight:bold">To: </span>Jeff Meister <<a href="mailto:jeff@esper.com">jeff@esper.com</a>><br>
|
||||
<span style="font-weight:bold">Cc: </span>Jennie Lees <<a href="mailto:jennie@nylas.com">jennie@nylas.com</a>>, Andrew Lee <<a href="mailto:andrew@esper.com">andrew@esper.com</a>>, Mackenzie Dallas <<a href="mailto:mackenzie@esper.com">mackenzie@esper.com</a>>,
|
||||
support <<a href="mailto:support@nylas.com">support@nylas.com</a>>, Karim Hamidou <<a href="mailto:karim@nylas.com">karim@nylas.com</a>>, Christine Spang <<a href="mailto:spang@nylas.com">spang@nylas.com</a>><br>
|
||||
support <<a href="mailto:support@getmerani.com">support@getmerani.com</a>>, Karim Hamidou <<a href="mailto:karim@nylas.com">karim@nylas.com</a>>, Christine Spang <<a href="mailto:spang@nylas.com">spang@nylas.com</a>><br>
|
||||
<span style="font-weight:bold">Subject: </span>Re: Esper <-> Nilas<br>
|
||||
</div>
|
||||
<div><br>
|
||||
@@ -182,7 +182,7 @@ We will be running a script today to back-fix recurring events created before la
|
||||
<div>
|
||||
<div><br>
|
||||
<span style="font-weight:bold">To: </span>Karim Hamidou <<a href="mailto:karim@nylas.com" target="_blank">karim@nylas.com</a>>, Christine Spang <<a href="mailto:spang@nylas.com" target="_blank">spang@nylas.com</a>>, Jeff Meister <<a href="mailto:jeff@esper.com" target="_blank">jeff@esper.com</a>><br>
|
||||
<span style="font-weight:bold">Cc: </span>Kavya Joshi <<a href="mailto:kavya@nylas.com" target="_blank">kavya@nylas.com</a>>, support <<a href="mailto:support@nylas.com" target="_blank">support@nylas.com</a>>, Mackenzie Dallas <<a href="mailto:mackenzie@esper.com" target="_blank">mackenzie@esper.com</a>>,
|
||||
<span style="font-weight:bold">Cc: </span>Kavya Joshi <<a href="mailto:kavya@nylas.com" target="_blank">kavya@nylas.com</a>>, support <<a href="mailto:support@getmerani.com" target="_blank">support@getmerani.com</a>>, Mackenzie Dallas <<a href="mailto:mackenzie@esper.com" target="_blank">mackenzie@esper.com</a>>,
|
||||
Jennie Lees <<a href="mailto:jennie@nylas.com" target="_blank">jennie@nylas.com</a>><br>
|
||||
<span style="font-weight:bold">Subject: </span>Re: Esper <-> Nilas<br>
|
||||
</div>
|
||||
@@ -219,7 +219,7 @@ We will be running a script today to back-fix recurring events created before la
|
||||
<span style="font-weight:bold">From: </span>Andrew Lee <<a href="mailto:andrew@esper.com" target="_blank">andrew@esper.com</a>><br>
|
||||
<span style="font-weight:bold">Date: </span>lundi 18 mai 2015 19:20<br>
|
||||
<span style="font-weight:bold">To: </span>Karim Hamidou <<a href="mailto:karim@nylas.com" target="_blank">karim@nylas.com</a>>, Christine Spang <<a href="mailto:spang@nylas.com" target="_blank">spang@nylas.com</a>>, Jeff Meister <<a href="mailto:jeff@esper.com" target="_blank">jeff@esper.com</a>><br>
|
||||
<span style="font-weight:bold">Cc: </span>Kavya Joshi <<a href="mailto:kavya@nylas.com" target="_blank">kavya@nylas.com</a>>, support <<a href="mailto:support@nylas.com" target="_blank">support@nylas.com</a>>, Mackenzie Dallas <<a href="mailto:mackenzie@esper.com" target="_blank">mackenzie@esper.com</a>>,
|
||||
<span style="font-weight:bold">Cc: </span>Kavya Joshi <<a href="mailto:kavya@nylas.com" target="_blank">kavya@nylas.com</a>>, support <<a href="mailto:support@getmerani.com" target="_blank">support@getmerani.com</a>>, Mackenzie Dallas <<a href="mailto:mackenzie@esper.com" target="_blank">mackenzie@esper.com</a>>,
|
||||
Jennie Lees <<a href="mailto:jennie@nylas.com" target="_blank">jennie@nylas.com</a>></div>
|
||||
</span></div>
|
||||
<div style="word-wrap:break-word; color:rgb(0,0,0); font-size:14px; font-family:Calibri,sans-serif">
|
||||
@@ -278,7 +278,7 @@ We will be running a script today to back-fix recurring events created before la
|
||||
<span style="font-weight:bold">From: </span>Andrew Lee <<a href="mailto:andrew@esper.com" target="_blank">andrew@esper.com</a>><br>
|
||||
<span style="font-weight:bold">Date: </span>mercredi 13 mai 2015 20:08<br>
|
||||
<span style="font-weight:bold">To: </span>Christine Spang <<a href="mailto:spang@nylas.com" target="_blank">spang@nylas.com</a>>, Jeff Meister <<a href="mailto:jeff@esper.com" target="_blank">jeff@esper.com</a>><br>
|
||||
<span style="font-weight:bold">Cc: </span>Kavya Joshi <<a href="mailto:kavya@nylas.com" target="_blank">kavya@nylas.com</a>>, support <<a href="mailto:support@nylas.com" target="_blank">support@nylas.com</a>>, Mackenzie Dallas <<a href="mailto:mackenzie@esper.com" target="_blank">mackenzie@esper.com</a>>,
|
||||
<span style="font-weight:bold">Cc: </span>Kavya Joshi <<a href="mailto:kavya@nylas.com" target="_blank">kavya@nylas.com</a>>, support <<a href="mailto:support@getmerani.com" target="_blank">support@getmerani.com</a>>, Mackenzie Dallas <<a href="mailto:mackenzie@esper.com" target="_blank">mackenzie@esper.com</a>>,
|
||||
Karim Hamidou <<a href="mailto:karim@nylas.com" target="_blank">karim@nylas.com</a>>, Jennie Lees <<a href="mailto:jennie@nylas.com" target="_blank">jennie@nylas.com</a>></div>
|
||||
</span></div>
|
||||
<div style="word-wrap:break-word; color:rgb(0,0,0); font-size:14px; font-family:Calibri,sans-serif">
|
||||
|
||||
12
app/spec/fixtures/emails/email_19.html
vendored
12
app/spec/fixtures/emails/email_19.html
vendored
@@ -9,7 +9,7 @@ and again<br>
|
||||
<signature>Sent from <a href=3D"https://link.nylas.com/link/aoi4q8bqixxd59z=
|
||||
vuog74b15d/local-1b7450ec-1444/0?redirect=3Dhttps%3A%2F%2Fnylas.com%2Fn1%3F=
|
||||
ref%3Dn1">
|
||||
Nylas Mail</a>, the extensible, open source mail client.</signature><img clas=
|
||||
Merani</a>, the extensible, open source mail client.</signature><img clas=
|
||||
s=3D"n1-open" width=3D"0" height=3D"0" style=3D"border:0; width:0; height:0=
|
||||
;" src=3D"https://link.nylas.com/open/aoi4q8bqixxd59zvuog74b15d/local-1b745=
|
||||
0ec-1444">
|
||||
@@ -22,7 +22,7 @@ hey evan sorry to spam you so much<br>
|
||||
<br>
|
||||
Sent from <a href=3D"https://link.nylas.com/link/aoi4q8bqixxd59zvuog74b15d/=
|
||||
local-038a4c1f-8bd7/0?redirect=3Dhttps%3A%2F%2Fnylas.com%2Fn1%3Fref%3Dn1">
|
||||
Nylas Mail</a>, the extensible, open source mail client. <img width=3D"0" hei=
|
||||
Merani</a>, the extensible, open source mail client. <img width=3D"0" hei=
|
||||
ght=3D"0" style=3D"border:0; width:0; height:0;" src=3D"https://link.nylas.=
|
||||
com/open/aoi4q8bqixxd59zvuog74b15d/local-038a4c1f-8bd7">
|
||||
<div><br>
|
||||
@@ -33,7 +33,7 @@ wat<br>
|
||||
<br>
|
||||
Sent from <a href=3D"https://link.nylas.com/link/aoi4q8bqixxd59zvuog74b15d/=
|
||||
local-fa431492-4362/0?redirect=3Dhttps%3A%2F%2Fnylas.com%2Fn1%3Fref%3Dn1">
|
||||
Nylas Mail</a>, the extensible, open source mail client.<img width=3D"0" heig=
|
||||
Merani</a>, the extensible, open source mail client.<img width=3D"0" heig=
|
||||
ht=3D"0" style=3D"border:0; width:0; height:0;" src=3D"https://link.nylas.c=
|
||||
om/open/aoi4q8bqixxd59zvuog74b15d/local-fa431492-4362">
|
||||
<div><br>
|
||||
@@ -44,7 +44,7 @@ this should only happen once<br>
|
||||
<br>
|
||||
Sent from <a href=3D"https://link.nylas.com/link/aoi4q8bqixxd59zvuog74b15d/=
|
||||
local-7e7f9d5f-73ac/0?redirect=3Dhttps%3A%2F%2Fnylas.com%2Fn1%3Fref%3Dn1">
|
||||
Nylas Mail</a>, the extensible, open source mail client.<img width=3D"0" heig=
|
||||
Merani</a>, the extensible, open source mail client.<img width=3D"0" heig=
|
||||
ht=3D"0" style=3D"border:0; width:0; height:0;" src=3D"https://link.nylas.c=
|
||||
om/open/aoi4q8bqixxd59zvuog74b15d/local-7e7f9d5f-73ac">
|
||||
<div><br>
|
||||
@@ -55,7 +55,7 @@ and again<br>
|
||||
<br>
|
||||
Sent from <a href=3D"https://link.nylas.com/link/aoi4q8bqixxd59zvuog74b15d/=
|
||||
local-da59d244-e3f8/0?redirect=3Dhttps%3A%2F%2Fnylas.com%2Fn1%3Fref%3Dn1">
|
||||
Nylas Mail</a>, the extensible, open source mail client.<img width=3D"0" heig=
|
||||
Merani</a>, the extensible, open source mail client.<img width=3D"0" heig=
|
||||
ht=3D"0" style=3D"border:0; width:0; height:0;" src=3D"https://link.nylas.c=
|
||||
om/open/aoi4q8bqixxd59zvuog74b15d/local-da59d244-e3f8">
|
||||
<div><br>
|
||||
@@ -64,7 +64,7 @@ On Nov 4 2016, at 1:13 pm, Juan Tejada <juan@nylas.com> wrote: <br>
|
||||
eft:1ex;">
|
||||
and some other stuff<br>
|
||||
<br>
|
||||
Sent from <a href=3D"https://nylas.com/n1?ref=3Dn1">Nylas Mail</a>, the exten=
|
||||
Sent from <a href=3D"https://nylas.com/n1?ref=3Dn1">Merani</a>, the exten=
|
||||
sible, open source mail client.
|
||||
</blockquote>
|
||||
</div>
|
||||
|
||||
@@ -5,7 +5,7 @@
|
||||
and again<br>
|
||||
<br>
|
||||
<signature>Sent from <a href="3D"https://link.nylas.com/link/aoi4q8bqixxd59z=" vuog74b15d="" local-1b7450ec-1444="" 0?redirect="3Dhttps%3A%2F%2Fnylas.com%2Fn1%3F=" ref%3dn1"="">
|
||||
Nylas Mail</a>, the extensible, open source mail client.</signature><img clas="s=3D"n1-open"" width="3D"0"" height="3D"0"" style="3D"border:0;" width:0;="" height:0=";"" src="3D"https://link.nylas.com/open/aoi4q8bqixxd59zvuog74b15d/local-1b745=" 0ec-1444"="">
|
||||
Merani</a>, the extensible, open source mail client.</signature><img clas="s=3D"n1-open"" width="3D"0"" height="3D"0"" style="3D"border:0;" width:0;="" height:0=";"" src="3D"https://link.nylas.com/open/aoi4q8bqixxd59zvuog74b15d/local-1b745=" 0ec-1444"="">
|
||||
<div class="3D"gmail_quote" nylas-quote="" nylas-quote-id-12zz9ff2coj10pe2e6g23i="ib4""><br><br>
|
||||
|
||||
</div>
|
||||
|
||||
8
app/spec/fixtures/emails/email_23.html
vendored
8
app/spec/fixtures/emails/email_23.html
vendored
@@ -172,7 +172,7 @@ On Oct 24 2016, at 11:54 pm, Last, Name <<a href="mailto:name_wu@brown.edu" t
|
||||
<div><a value="+18585311718">(858) 531-1718</a></div>
|
||||
<br>
|
||||
<u></u>Sent from <a href="https://link.nylas.com/link/e7pdeb1ninvdy61tg6liermf8/local-d0981f11-53c7/0?redirect=https%3A%2F%2Fnylas.com%2Fn1%3Fref%3Dn1" target="_blank">
|
||||
Nylas Mail</a>, the extensible, open source mail client.<u></u></span></div>
|
||||
Merani</a>, the extensible, open source mail client.<u></u></span></div>
|
||||
<img width="0" height="0" style="border:0;width:0;height:0" src="https://link.nylas.com/open/e7pdeb1ninvdy61tg6liermf8/local-d0981f11-53c7">
|
||||
<div>
|
||||
<div>
|
||||
@@ -202,7 +202,7 @@ On Oct 18 2016, at 7:21 pm, Last, Name <<a href="mailto:name_wu@brown.edu" ta
|
||||
<div>Evan</div>
|
||||
<span><br>
|
||||
<u></u>Sent from <a href="https://link.nylas.com/link/e7pdeb1ninvdy61tg6liermf8/local-aee34b8e-af74/0?redirect=https%3A%2F%2Fnylas.com%2Fn1%3Fref%3Dn1" target="_blank">
|
||||
Nylas Mail</a>, the extensible, open source mail client.<u></u></span></div>
|
||||
Merani</a>, the extensible, open source mail client.<u></u></span></div>
|
||||
<img width="0" height="0" style="border:0;width:0;height:0" src="https://link.nylas.com/open/e7pdeb1ninvdy61tg6liermf8/local-aee34b8e-af74">
|
||||
<div>
|
||||
<div>
|
||||
@@ -237,7 +237,7 @@ On Oct 18 2016, at 2:03 pm, Last, Name <<a href="mailto:name_wu@brown.edu" ta
|
||||
<div><a value="+18585311718">(858) 531-1718</a></div>
|
||||
<br>
|
||||
<u></u>Sent from <a href="https://link.nylas.com/link/e7pdeb1ninvdy61tg6liermf8/local-8427e727-d342/0?redirect=https%3A%2F%2Fnylas.com%2Fn1%3Fref%3Dn1" target="_blank">
|
||||
Nylas Mail</a>, the extensible, open source mail client.<u></u></span></div>
|
||||
Merani</a>, the extensible, open source mail client.<u></u></span></div>
|
||||
<img width="0" height="0" style="border:0;width:0;height:0" src="https://link.nylas.com/open/e7pdeb1ninvdy61tg6liermf8/local-8427e727-d342">
|
||||
<div>
|
||||
<div>
|
||||
@@ -277,7 +277,7 @@ On Oct 7 2016, at 9:17 am, Last, Name <<a href="mailto:name_wu@brown.edu" tar
|
||||
<div><a value="+18585311718">(858) 531-1718</a></div>
|
||||
<br>
|
||||
<u></u>Sent from <a href="https://link.nylas.com/link/e7pdeb1ninvdy61tg6liermf8/local-87ed2e6b-3158/0?redirect=https%3A%2F%2Fnylas.com%2Fn1%3Fref%3Dn1" target="_blank">
|
||||
Nylas Mail</a>, the extensible, open source mail client.<u></u></div>
|
||||
Merani</a>, the extensible, open source mail client.<u></u></div>
|
||||
<img width="0" height="0" style="border:0;width:0;min-height:0" src="https://link.nylas.com/open/e7pdeb1ninvdy61tg6liermf8/local-87ed2e6b-3158">
|
||||
</div>
|
||||
</blockquote>
|
||||
|
||||
4
app/spec/fixtures/emails/email_5.html
vendored
4
app/spec/fixtures/emails/email_5.html
vendored
@@ -14,8 +14,8 @@ class="gmail_sendername">Jeff Meister</b> <span dir="ltr"><<a
|
||||
href="mailto:jeff@esper.com"
|
||||
target="_blank">jeff@esper.com</a>></span><br>Date: Mon, Jun 22, 2015 at
|
||||
4:00 PM<br>Subject: Nylas bug reports<br>To: support <<a
|
||||
href="mailto:support@nylas.com"
|
||||
target="_blank">support@nylas.com</a>><br>Cc: Michael Grinich <<a
|
||||
href="mailto:support@getmerani.com"
|
||||
target="_blank">support@getmerani.com</a>><br>Cc: Michael Grinich <<a
|
||||
href="mailto:mg@nilas.com" target="_blank">mg@nilas.com</a>>, Christine
|
||||
Spang <<a href="mailto:spang@nylas.com"
|
||||
target="_blank">spang@nylas.com</a>>, Kavya Joshi <<a
|
||||
|
||||
12
app/spec/fixtures/sample-deltas-clustered.json
vendored
12
app/spec/fixtures/sample-deltas-clustered.json
vendored
@@ -87,7 +87,7 @@
|
||||
"to": [
|
||||
{
|
||||
"name": "",
|
||||
"email": "support@nylas.com"
|
||||
"email": "support@getmerani.com"
|
||||
}
|
||||
],
|
||||
"folder": {
|
||||
@@ -121,7 +121,7 @@
|
||||
"to": [
|
||||
{
|
||||
"name": "",
|
||||
"email": "support@nylas.com"
|
||||
"email": "support@getmerani.com"
|
||||
}
|
||||
],
|
||||
"folder": {
|
||||
@@ -155,7 +155,7 @@
|
||||
"to": [
|
||||
{
|
||||
"name": "",
|
||||
"email": "support@nylas.com"
|
||||
"email": "support@getmerani.com"
|
||||
}
|
||||
],
|
||||
"folder": {
|
||||
@@ -252,7 +252,7 @@
|
||||
"participants": [
|
||||
{
|
||||
"name": "",
|
||||
"email": "support@nylas.com"
|
||||
"email": "support@getmerani.com"
|
||||
},
|
||||
{
|
||||
"name": "Ismail Pelaseyed",
|
||||
@@ -361,7 +361,7 @@
|
||||
"participants": [
|
||||
{
|
||||
"name": "",
|
||||
"email": "support@nylas.com"
|
||||
"email": "support@getmerani.com"
|
||||
},
|
||||
{
|
||||
"name": "Ismail Pelaseyed",
|
||||
@@ -407,7 +407,7 @@
|
||||
"participants": [
|
||||
{
|
||||
"name": "",
|
||||
"email": "support@nylas.com"
|
||||
"email": "support@getmerani.com"
|
||||
},
|
||||
{
|
||||
"name": "Ismail Pelaseyed",
|
||||
|
||||
12
app/spec/fixtures/sample-deltas.json
vendored
12
app/spec/fixtures/sample-deltas.json
vendored
@@ -240,7 +240,7 @@
|
||||
"participants": [
|
||||
{
|
||||
"name": "",
|
||||
"email": "support@nylas.com"
|
||||
"email": "support@getmerani.com"
|
||||
},
|
||||
{
|
||||
"name": "Ismail Pelaseyed",
|
||||
@@ -277,7 +277,7 @@
|
||||
"to": [
|
||||
{
|
||||
"name": "",
|
||||
"email": "support@nylas.com"
|
||||
"email": "support@getmerani.com"
|
||||
}
|
||||
],
|
||||
"folder": {
|
||||
@@ -334,7 +334,7 @@
|
||||
"participants": [
|
||||
{
|
||||
"name": "",
|
||||
"email": "support@nylas.com"
|
||||
"email": "support@getmerani.com"
|
||||
},
|
||||
{
|
||||
"name": "Ismail Pelaseyed",
|
||||
@@ -371,7 +371,7 @@
|
||||
"to": [
|
||||
{
|
||||
"name": "",
|
||||
"email": "support@nylas.com"
|
||||
"email": "support@getmerani.com"
|
||||
}
|
||||
],
|
||||
"folder": {
|
||||
@@ -428,7 +428,7 @@
|
||||
"participants": [
|
||||
{
|
||||
"name": "",
|
||||
"email": "support@nylas.com"
|
||||
"email": "support@getmerani.com"
|
||||
},
|
||||
{
|
||||
"name": "Ismail Pelaseyed",
|
||||
@@ -465,7 +465,7 @@
|
||||
"to": [
|
||||
{
|
||||
"name": "",
|
||||
"email": "support@nylas.com"
|
||||
"email": "support@getmerani.com"
|
||||
}
|
||||
],
|
||||
"folder": {
|
||||
|
||||
@@ -31,7 +31,7 @@ describe "Message", ->
|
||||
{
|
||||
itMsg: "has plain br's and a signature"
|
||||
body: """
|
||||
<div class="contenteditable no-open-link-events" contenteditable="true" spellcheck="false"><br><br><signature>Sent from <a href="https://nylas.com/n1?ref=n1">Nylas Mail</a>, the extensible, open source mail client.</signature></div>
|
||||
<div class="contenteditable no-open-link-events" contenteditable="true" spellcheck="false"><br><br><signature>Sent from <a href="https://getmerani.com/?ref=client">Merani</a>, the extensible, open source mail client.</signature></div>
|
||||
"""
|
||||
isEmpty: true
|
||||
},
|
||||
@@ -53,14 +53,14 @@ describe "Message", ->
|
||||
{
|
||||
itMsg: "has empty tags"
|
||||
body: """
|
||||
<div class="contenteditable no-open-link-events" contenteditable="true" spellcheck="false"><br><div><p> </p></div>\n\n\n\n<br><signature>Sent from <a href="https://nylas.com/n1?ref=n1">Nylas Mail</a>, the extensible, open source mail client.</signature></div>
|
||||
<div class="contenteditable no-open-link-events" contenteditable="true" spellcheck="false"><br><div><p> </p></div>\n\n\n\n<br><signature>Sent from <a href="https://getmerani.com/?ref=client">Merani</a>, the extensible, open source mail client.</signature></div>
|
||||
"""
|
||||
isEmpty: true
|
||||
},
|
||||
{
|
||||
itMsg: "has nested characters"
|
||||
body: """
|
||||
<div class="contenteditable no-open-link-events" contenteditable="true" spellcheck="false"><br><div><p> 1</p></div>\n\n\n\n<br><signature>Sent from <a href="https://nylas.com/n1?ref=n1">Nylas Mail</a>, the extensible, open source mail client.</signature></div>
|
||||
<div class="contenteditable no-open-link-events" contenteditable="true" spellcheck="false"><br><div><p> 1</p></div>\n\n\n\n<br><signature>Sent from <a href="https://getmerani.com/?ref=client">Merani</a>, the extensible, open source mail client.</signature></div>
|
||||
"""
|
||||
isEmpty: false
|
||||
},
|
||||
|
||||
@@ -77,7 +77,7 @@ describe("IdentityStore", function identityStoreSpec() {
|
||||
const opts = NylasAPIRequest.makeRequest.calls[0].args[0]
|
||||
expect(opts).toEqual({
|
||||
method: "POST",
|
||||
url: "https://billing.nylas.com/api/feature_usage_event",
|
||||
url: "https://identity.getmerani.com/api/feature_usage_event",
|
||||
body: {
|
||||
feature_name: 'snooze',
|
||||
},
|
||||
|
||||
@@ -180,7 +180,7 @@ export default class Application extends EventEmitter {
|
||||
this.windowManager.ensureWindow(WindowManager.MAIN_WINDOW);
|
||||
} else {
|
||||
this.windowManager.ensureWindow(WindowManager.ONBOARDING_WINDOW, {
|
||||
title: "Welcome to Nylas Mail",
|
||||
title: "Welcome to Merani",
|
||||
});
|
||||
}
|
||||
}
|
||||
@@ -383,8 +383,8 @@ export default class Application extends EventEmitter {
|
||||
|
||||
app.on('ready', () => {
|
||||
crashReporter.start({
|
||||
productName: 'Nylas Mail',
|
||||
companyName: 'Nylas, Inc.',
|
||||
productName: 'Merani',
|
||||
companyName: 'Foundry 376, LLC',
|
||||
submitURL: 'https://nylas-breakpad-sentry.herokuapp.com/crashreport',
|
||||
autoSubmit: true,
|
||||
});
|
||||
|
||||
@@ -14,7 +14,7 @@ const UpdateAvailableState = 'update-available';
|
||||
const NoUpdateAvailableState = 'no-update-available';
|
||||
const UnsupportedState = 'unsupported';
|
||||
const ErrorState = 'error';
|
||||
const preferredChannel = 'nylas-mail'
|
||||
const preferredChannel = 'stable';
|
||||
|
||||
export default class AutoUpdateManager extends EventEmitter {
|
||||
|
||||
@@ -60,9 +60,9 @@ export default class AutoUpdateManager extends EventEmitter {
|
||||
updateFeedURL = () => {
|
||||
const params = this.parameters();
|
||||
|
||||
let host = `edgehill.nylas.com`;
|
||||
let host = `updates.getmerani.com`;
|
||||
if (this.config.get('env') === 'staging') {
|
||||
host = `edgehill-staging.nylas.com`;
|
||||
host = `updates-staging.getmerani.com`;
|
||||
}
|
||||
|
||||
if (process.platform === 'win32') {
|
||||
@@ -178,7 +178,7 @@ export default class AutoUpdateManager extends EventEmitter {
|
||||
}
|
||||
|
||||
iconURL() {
|
||||
const url = path.join(process.resourcesPath, 'app', 'nylas.png');
|
||||
const url = path.join(process.resourcesPath, 'app', 'merani.png');
|
||||
if (!fs.existsSync(url)) {
|
||||
return undefined;
|
||||
}
|
||||
@@ -193,7 +193,7 @@ export default class AutoUpdateManager extends EventEmitter {
|
||||
icon: this.iconURL(),
|
||||
message: 'No update available.',
|
||||
title: 'No Update Available',
|
||||
detail: `You're running the latest version of Nylas Mail (${this.version}).`,
|
||||
detail: `You're running the latest version of Merani (${this.version}).`,
|
||||
});
|
||||
};
|
||||
|
||||
|
||||
@@ -49,17 +49,17 @@ const setupErrorLogger = (args = {}) => {
|
||||
const declareOptions = (argv) => {
|
||||
const optimist = require('optimist');
|
||||
const options = optimist(argv);
|
||||
options.usage("Nylas Mail v" + (app.getVersion()) + "\n\nUsage: nylas-mail [options]\n\nRun Nylas Mail: The open source extensible email client\n\n`nylas-mail --dev` to start the client in dev mode.\n\n`n1 --test` to run unit tests.");
|
||||
options.usage("Merani v" + (app.getVersion()) + "\n\nUsage: nylas-mail [options]\n\nRun Merani: The open source extensible email client\n\n`nylas-mail --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-mail/packages or ~/.nylas/dev/packages.');
|
||||
options.alias('h', 'help').boolean('h').describe('h', 'Print this usage message.');
|
||||
options.alias('l', 'log-file').string('l').describe('l', 'Log all test output to file.');
|
||||
options.alias('c', 'config-dir-path').string('c').describe('c', 'Override the path to the Nylas Mail configuration directory');
|
||||
options.alias('c', 'config-dir-path').string('c').describe('c', 'Override the path to the Merani configuration directory');
|
||||
options.alias('s', 'spec-directory').string('s').describe('s', 'Override the directory from which to run package specs');
|
||||
options.alias('f', 'spec-file-pattern').string('f').describe('f', 'Override the default file regex to determine which tests should run (defaults to "-spec\.(coffee|js|jsx|cjsx|es6|es)$" )');
|
||||
options.alias('v', 'version').boolean('v').describe('v', 'Print the version.');
|
||||
options.alias('b', 'background').boolean('b').describe('b', 'Start Nylas Mail in the background');
|
||||
options.alias('b', 'background').boolean('b').describe('b', 'Start Merani in the background');
|
||||
return options;
|
||||
};
|
||||
|
||||
|
||||
@@ -46,7 +46,7 @@ class NylasWindow
|
||||
|
||||
browserWindowOptions =
|
||||
show: false
|
||||
title: title ? 'Nylas Mail'
|
||||
title: title ? 'Merani'
|
||||
frame: frame
|
||||
width: width
|
||||
height: height
|
||||
@@ -68,9 +68,9 @@ class NylasWindow
|
||||
# taskbar's icon. See https://github.com/atom/atom/issues/4811 for more.
|
||||
if process.platform is 'linux'
|
||||
unless WindowIconPath
|
||||
WindowIconPath = path.resolve(__dirname, '..', '..', 'nylas.png')
|
||||
WindowIconPath = path.resolve(__dirname, '..', '..', 'merani.png')
|
||||
unless fs.existsSync(WindowIconPath)
|
||||
WindowIconPath = path.resolve(__dirname, '..', '..', 'build', 'resources', 'nylas.png')
|
||||
WindowIconPath = path.resolve(__dirname, '..', '..', 'build', 'resources', 'merani.png')
|
||||
browserWindowOptions.icon = WindowIconPath
|
||||
|
||||
@browserWindow = new BrowserWindow(browserWindowOptions)
|
||||
@@ -190,7 +190,7 @@ class NylasWindow
|
||||
chosen = dialog.showMessageBox @browserWindow,
|
||||
type: 'warning'
|
||||
buttons: ['Close', 'Keep Waiting']
|
||||
message: 'Nylas Mail is not responding'
|
||||
message: 'Merani is not responding'
|
||||
detail: 'Would you like to force close it or keep waiting?'
|
||||
@browserWindow.destroy() if chosen is 0
|
||||
|
||||
@@ -209,8 +209,8 @@ class NylasWindow
|
||||
chosen = dialog.showMessageBox @browserWindow,
|
||||
type: 'warning'
|
||||
buttons: ['Close Window', 'Reload', 'Keep It Open']
|
||||
message: 'Nylas Mail has crashed'
|
||||
detail: 'Please report this issue to us at support@nylas.com.'
|
||||
message: 'Merani has crashed'
|
||||
detail: 'Please report this issue to us at support@getmerani.com.'
|
||||
switch chosen
|
||||
when 0 then @browserWindow.destroy()
|
||||
when 1 then @browserWindow.reload()
|
||||
|
||||
@@ -15,7 +15,7 @@ function _getMenuTemplate(platform, application) {
|
||||
type: 'separator',
|
||||
},
|
||||
{
|
||||
label: 'Quit Nylas Mail',
|
||||
label: 'Quit Merani',
|
||||
click: () => application.emit('application:quit'),
|
||||
},
|
||||
];
|
||||
|
||||
@@ -5,7 +5,7 @@
|
||||
* Read: https://github.com/electron-archive/grunt-electron-installer#handling-squirrel-events
|
||||
* Read: https://github.com/electron/electron/blob/master/docs/api/auto-updater.md#windows
|
||||
*
|
||||
* When Nylas Mail gets installed on a Windows machine it gets put in:
|
||||
* When Merani gets installed on a Windows machine it gets put in:
|
||||
* C:\Users\<USERNAME>\AppData\Local\NylasMail\app-x.x.x
|
||||
*
|
||||
* The `process.execPath` is:
|
||||
@@ -112,7 +112,7 @@ function createRegistryEntries({allowEscalation, registerDefaultIfPossible}, cal
|
||||
spawnArgs = [regPath];
|
||||
}
|
||||
|
||||
fs.readFile(path.join(appFolder, 'resources', 'nylas-mailto-registration.reg'), (err, data) => {
|
||||
fs.readFile(path.join(appFolder, 'resources', 'merani-mailto-registration.reg'), (err, data) => {
|
||||
if (err || !data) {
|
||||
callback(err);
|
||||
return;
|
||||
@@ -126,7 +126,7 @@ function createRegistryEntries({allowEscalation, registerDefaultIfPossible}, cal
|
||||
importContents = importContents.replace(/{{HKEY_ROOT}}/g, 'HKEY_CURRENT_USER');
|
||||
}
|
||||
|
||||
const importTempPath = path.join(os.tmpdir(), `nylas-reg-${Date.now()}.reg`);
|
||||
const importTempPath = path.join(os.tmpdir(), `merani-reg-${Date.now()}.reg`);
|
||||
|
||||
fs.writeFile(importTempPath, importContents, (writeErr) => {
|
||||
if (writeErr) {
|
||||
@@ -136,7 +136,7 @@ function createRegistryEntries({allowEscalation, registerDefaultIfPossible}, cal
|
||||
|
||||
spawn(spawnPath, spawnArgs.concat(['import', escapeBackticks(importTempPath)]), (spawnErr) => {
|
||||
if (isWindows7 && registerDefaultIfPossible) {
|
||||
const defaultReg = path.join(appFolder, 'resources', 'nylas-mailto-default.reg')
|
||||
const defaultReg = path.join(appFolder, 'resources', 'merani-mailto-default.reg')
|
||||
spawn(spawnPath, spawnArgs.concat(['import', escapeBackticks(defaultReg)]), (spawnDefaultErr) => {
|
||||
callback(spawnDefaultErr, true);
|
||||
});
|
||||
|
||||
@@ -58,7 +58,7 @@ export default class BillingModal extends React.Component {
|
||||
webview.executeJavaScript(receiveUserInfo, false, async (result) => {
|
||||
if (!result) return;
|
||||
if (result !== IdentityStore.identityId()) {
|
||||
NylasEnv.reportError(new Error("billing.nylas.com/payment_success did not have a valid #payment-success-data field"))
|
||||
NylasEnv.reportError(new Error("identity.getmerani.com/payment_success did not have a valid #payment-success-data field"))
|
||||
}
|
||||
const listenForContinue = `
|
||||
var el = document.querySelector('#continue-btn');
|
||||
|
||||
@@ -29,7 +29,7 @@ export default class FeatureUsedUpModal extends React.Component {
|
||||
}
|
||||
|
||||
render() {
|
||||
const gotoFeatures = () => shell.openExternal("https://nylas.com/nylas-pro");
|
||||
const gotoFeatures = () => shell.openExternal("https://getmerani.com/pro");
|
||||
|
||||
const upgrade = (e) => {
|
||||
e.stopPropagation();
|
||||
|
||||
@@ -29,7 +29,7 @@ export default class OAuthSignInPage extends React.Component {
|
||||
* Once we have the token, we can use that to retrieve the full
|
||||
* account credentials or establish a direct connection ourselves.
|
||||
* Some Nylas backends vend all account credentials along with the
|
||||
* token making this function unnecessary and a no-op. Nylas Mail
|
||||
* token making this function unnecessary and a no-op. Merani
|
||||
* local sync needs to use the returned OAuth token to establish an
|
||||
* IMAP connection directly that may have its own set of failure
|
||||
* cases.
|
||||
@@ -141,7 +141,7 @@ export default class OAuthSignInPage extends React.Component {
|
||||
return (
|
||||
<div>
|
||||
<h2>Successfully connected to {this.props.serviceName}!</h2>
|
||||
<h3>Adding your account to Nylas Mail…</h3>
|
||||
<h3>Adding your account to Merani…</h3>
|
||||
</div>
|
||||
)
|
||||
}
|
||||
@@ -151,7 +151,7 @@ export default class OAuthSignInPage extends React.Component {
|
||||
<h2>Sorry, we had trouble logging you in</h2>
|
||||
<div className="error-region">
|
||||
<p className="message error error-message">{this.state.errorMessage}</p>
|
||||
<p className="extra">Please <a onClick={this.props.onTryAgain}>try again</a>. If you continue to see this error contact support@nylas.com</p>
|
||||
<p className="extra">Please <a onClick={this.props.onTryAgain}>try again</a>. If you continue to see this error contact support@getmerani.com</p>
|
||||
</div>
|
||||
</div>)
|
||||
}
|
||||
|
||||
@@ -137,7 +137,7 @@ export default class Webview extends React.Component {
|
||||
if (httpResponseCode >= 400) {
|
||||
const error = `
|
||||
Could not reach Nylas. Please try again or contact
|
||||
support@nylas.com if the issue persists.
|
||||
support@getmerani.com if the issue persists.
|
||||
(${originalURL}: ${httpResponseCode})
|
||||
`;
|
||||
this.setState({ready: false, error: error, webviewLoading: false});
|
||||
|
||||
@@ -32,7 +32,7 @@ class Windows {
|
||||
type: 'info',
|
||||
buttons: ['Learn More'],
|
||||
message: "Visit Windows Settings to change your default mail client",
|
||||
detail: "You'll find Nylas Mail, along with other options, listed in Default Apps > Mail.",
|
||||
detail: "You'll find Merani, along with other options, listed in Default Apps > Mail.",
|
||||
}, () => {
|
||||
shell.openExternal('https://support.nylas.com/hc/en-us/articles/229277648');
|
||||
});
|
||||
@@ -58,7 +58,7 @@ class Windows {
|
||||
type: 'info',
|
||||
buttons: ['Learn More'],
|
||||
defaultId: 1,
|
||||
message: "Visit Windows Settings to finish making Nylas Mail your mail client",
|
||||
message: "Visit Windows Settings to finish making Merani 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');
|
||||
|
||||
@@ -10,9 +10,6 @@ let Contact = null
|
||||
* Every object on the Nylas platform exists within a Account, which typically represents
|
||||
* an email account.
|
||||
*
|
||||
* For more information about Accounts on the Nylas Platform, read the
|
||||
* [Account API Documentation](https://nylas.com/cloud/docs#account)
|
||||
*
|
||||
* ## Attributes
|
||||
*
|
||||
* `name`: {AttributeString} The name of the Account.
|
||||
|
||||
@@ -2,10 +2,7 @@ import Model from './model';
|
||||
import Attributes from '../attributes';
|
||||
|
||||
/**
|
||||
Public: The Calendar model represents a Calendar object served by the
|
||||
Nylas Platform API. For more information about Calendar on the Nylas
|
||||
Platform, read the [Calendar API
|
||||
Documentation](https://nylas.com/cloud/docs#calendars)
|
||||
Public: The Calendar model represents a Calendar object.
|
||||
|
||||
## Attributes
|
||||
|
||||
|
||||
@@ -20,9 +20,7 @@ const nameSuffixes = {};
|
||||
});
|
||||
|
||||
/*
|
||||
Public: The Contact model represents a Contact object served by the Nylas Platform API.
|
||||
For more information about Contacts on the Nylas Platform, read the
|
||||
[Contacts API Documentation](https://nylas.com/cloud/docs#contacts)
|
||||
Public: The Contact model represents a Contact object.
|
||||
|
||||
Attributes
|
||||
|
||||
|
||||
@@ -5,9 +5,7 @@ import Attributes from '../attributes';
|
||||
let RegExpUtils = null
|
||||
|
||||
/**
|
||||
Public: File model represents a File object served by the Nylas Platform API.
|
||||
For more information about Files on the Nylas Platform, read the
|
||||
[Files API Documentation](https://nylas.com/cloud/docs#files)
|
||||
Public: File model represents an email attachment.
|
||||
|
||||
#// Attributes
|
||||
|
||||
|
||||
@@ -10,9 +10,7 @@ import Attributes from '../attributes'
|
||||
import ModelWithMetadata from './model-with-metadata'
|
||||
|
||||
/*
|
||||
Public: The Message model represents a Message object served by the Nylas Platform API.
|
||||
For more information about Messages on the Nylas Platform, read the
|
||||
[Messages API Documentation](https://nylas.com/cloud/docs#messages)
|
||||
Public: The Message model represents an email message or draft.
|
||||
|
||||
Messages are a sub-object of threads. The content of a message === immutable (with the
|
||||
exception being drafts). Nylas does not support operations such as move || delete on
|
||||
@@ -335,7 +333,7 @@ export default class Message extends ModelWithMetadata {
|
||||
return (
|
||||
this.to.length === 1 && this.from.length === 1 &&
|
||||
this.to[0].email === this.from[0].email &&
|
||||
(this.snippet || "").startsWith('Nylas Mail Reminder:')
|
||||
(this.snippet || "").startsWith('Merani Reminder:')
|
||||
)
|
||||
}
|
||||
}
|
||||
|
||||
@@ -8,9 +8,7 @@ import DatabaseStore from '../stores/database-store'
|
||||
import ModelWithMetadata from './model-with-metadata'
|
||||
|
||||
/*
|
||||
Public: The Thread model represents a Thread object served by the Nylas Platform API.
|
||||
For more information about Threads on the Nylas Platform, read the
|
||||
[Threads API Documentation](https://nylas.com/cloud/docs#threads)
|
||||
Public: The Thread model represents an email thread.
|
||||
|
||||
Attributes
|
||||
|
||||
|
||||
@@ -21,15 +21,15 @@ export function rootURLForServer(server) {
|
||||
if (server === 'identity') {
|
||||
return {
|
||||
development: "http://localhost:5101",
|
||||
staging: "https://id-staging.nylas.com",
|
||||
production: "https://id.nylas.com",
|
||||
staging: "https://id-staging.getmerani.com",
|
||||
production: "https://id.getmerani.com",
|
||||
}[env];
|
||||
}
|
||||
if (server === 'accounts') {
|
||||
return {
|
||||
development: "http://localhost:5100",
|
||||
staging: "https://accounts-staging.nylas.com",
|
||||
production: "https://accounts.nylas.com",
|
||||
staging: "https://accounts-staging.getmerani.com",
|
||||
production: "https://accounts.getmerani.com",
|
||||
}[env];
|
||||
}
|
||||
|
||||
|
||||
@@ -157,7 +157,7 @@ class AccountStore extends NylasStore {
|
||||
}
|
||||
|
||||
/**
|
||||
* When an account is removed from Nylas Mail, the AccountStore
|
||||
* When an account is removed from Merani, the AccountStore
|
||||
* triggers. The local-sync/src/local-sync-worker/index.js listens to
|
||||
* the AccountStore and runs `ensureK2Consistency`. This will actually
|
||||
* delete the Account on the local sync side.
|
||||
|
||||
@@ -2,7 +2,7 @@ import {Utils, Actions, AccountStore} from 'nylas-exports';
|
||||
import NylasStore from 'nylas-store'
|
||||
import _ from 'underscore'
|
||||
|
||||
const DefaultSignatureText = "Sent from <a href=\"https://nylas.com?ref=n1\">Nylas Mail</a>, the best free email app for work";
|
||||
const DefaultSignatureText = "Sent from <a href=\"https://getmerani.com?ref=client\">Merani</a>, the best free email app for work";
|
||||
|
||||
class SignatureStore extends NylasStore {
|
||||
|
||||
|
||||
@@ -16,11 +16,11 @@ class KeyManager {
|
||||
* the names of these keys. If you change them be sure that old N1 is
|
||||
* fully deprecated or updated as well.
|
||||
*/
|
||||
this.SERVICE_NAME = "Nylas Mail";
|
||||
this.SERVICE_NAME = "Merani";
|
||||
if (NylasEnv.inDevMode()) {
|
||||
this.SERVICE_NAME = "Nylas Mail Dev";
|
||||
this.SERVICE_NAME = "Merani Dev";
|
||||
}
|
||||
this.KEY_NAME = "Nylas Mail Keys"
|
||||
this.KEY_NAME = "Merani Keys"
|
||||
}
|
||||
|
||||
extractAccountSecrets(accountJSON, cloudToken) {
|
||||
@@ -82,7 +82,7 @@ class KeyManager {
|
||||
}
|
||||
|
||||
_try(fn) {
|
||||
const ERR_MSG = "We couldn't store your password securely! For more information, visit https://support.nylas.com/hc/en-us/articles/223790028";
|
||||
const ERR_MSG = "We couldn't store your password securely! For more information, visit https://support.getmerani.com/hc/en-us/articles/223790028";
|
||||
try {
|
||||
if (!fn()) {
|
||||
remote.dialog.showErrorBox("Password Management Error", ERR_MSG)
|
||||
|
||||
@@ -201,9 +201,9 @@ export default class NylasEnvConstructor {
|
||||
// the window starts loading.
|
||||
require('nylas-exports');
|
||||
|
||||
process.title = `Nylas Mail ${this.getWindowType()}`;
|
||||
process.title = `Merani ${this.getWindowType()}`;
|
||||
return this.onWindowPropsReceived(() => {
|
||||
process.title = `Nylas Mail ${this.getWindowType()}`;
|
||||
process.title = `Merani ${this.getWindowType()}`;
|
||||
return process.title;
|
||||
});
|
||||
}
|
||||
@@ -383,7 +383,7 @@ export default class NylasEnvConstructor {
|
||||
return this.getLoadSettings().isSpec;
|
||||
}
|
||||
|
||||
// Public: Get the version of Nylas Mail.
|
||||
// Public: Get the version of Merani.
|
||||
//
|
||||
// Returns the version text {String}.
|
||||
getVersion() {
|
||||
@@ -395,7 +395,7 @@ export default class NylasEnvConstructor {
|
||||
return !/\w{7}/.test(this.getVersion()); // Check if the release is a 7-character SHA prefix
|
||||
}
|
||||
|
||||
// Public: Get the directory path to Nylas Mail's configuration area.
|
||||
// Public: Get the directory path to Merani's configuration area.
|
||||
getConfigDirPath() { return this.getLoadSettings().configDirPath; }
|
||||
|
||||
// Public: Get the time taken to completely load the current window.
|
||||
|
||||
@@ -36,7 +36,7 @@ RegExpUtils =
|
||||
# https://www.safaribooksonline.com/library/view/regular-expressions-cookbook/9780596802837/ch07s16.html
|
||||
ipAddressRegex: -> new RegExp(/^(?:[0-9]{1,3}\.){3}[0-9]{1,3}$/i)
|
||||
|
||||
nylasCommandRegex: -> new RegExp(/nylas:\S+/i)
|
||||
meraniCommandRegex: -> new RegExp(/merani:\S+/i)
|
||||
|
||||
# Test cases: https://regex101.com/r/pD7iS5/3
|
||||
urlRegex: ({matchEntireString} = {}) ->
|
||||
@@ -48,10 +48,10 @@ RegExpUtils =
|
||||
'('
|
||||
# This OR block matches any TLD if the URL includes a scheme, and only
|
||||
# the top ten TLDs if the scheme is omitted.
|
||||
# YES - https://nylas.ai
|
||||
# YES - https://getmerani.ai
|
||||
# YES - https://10.2.3.1
|
||||
# YES - nylas.com
|
||||
# NO - nylas.ai
|
||||
# YES - getmerani.com
|
||||
# NO - getmerani.ai
|
||||
'('
|
||||
# scheme, ala https:// (mandatory)
|
||||
'([A-Za-z]{3,9}:(?:\\/\\/))'
|
||||
@@ -141,12 +141,12 @@ RegExpUtils =
|
||||
imageTagRegex: -> /<img\s+[^>]*src="([^"]*)"[^>]*>/g
|
||||
|
||||
# Regex that matches our link tracking urls, surrounded by quotes
|
||||
# ("link.nylas.com...?redirect=")
|
||||
# ("link.getmerani.com...?redirect=")
|
||||
# Test cases: https://regex101.com/r/rB4fO4/3
|
||||
# Returns the following capturing groups
|
||||
# 1.The redirect url: the actual url you want to visit by clicking a url
|
||||
# that matches this regex
|
||||
trackedLinkRegex: -> /[\"|\']https:\/\/link\.nylas\.com\/link\/.*?\?.*?redirect=([^&\"\']*).*?[\"|\']/g
|
||||
trackedLinkRegex: -> /[\"|\']https:\/\/link\.getmerani\.com\/link\/.*?\?.*?redirect=([^&\"\']*).*?[\"|\']/g
|
||||
|
||||
punctuation: ({exclude}={}) ->
|
||||
exclude ?= []
|
||||
|
||||
@@ -286,11 +286,11 @@ export default class WindowEventHandler {
|
||||
}
|
||||
|
||||
if (!NylasEnv.inDevMode()) {
|
||||
console.log(`%c Welcome to Nylas Mail! If you're exploring the source or building a
|
||||
console.log(`%c Welcome to Merani! If you're exploring the source or building a
|
||||
plugin, you should enable debug flags. It's slower, but
|
||||
gives you better exceptions, the debug version of React,
|
||||
and more. Choose %c Developer > Run with Debug Flags %c
|
||||
from the menu. Also, check out https://nylas.github.io/N1/docs/
|
||||
from the menu. Also, check out http://Foundry376.github.io/Merani/
|
||||
for documentation and sample code!`,
|
||||
"background-color: antiquewhite;",
|
||||
"background-color: antiquewhite; font-weight:bold;",
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
<!DOCTYPE html>
|
||||
<html style="background: #fff">
|
||||
<head>
|
||||
<title>Nylas Mail</title>
|
||||
<title>Merani</title>
|
||||
|
||||
<meta http-equiv="Content-Security-Policy" content="default-src * nylas:; script-src 'self' 'unsafe-eval' chrome-extension://react-developer-tools; style-src * 'unsafe-inline' nylas:; img-src * data: nylas: file:;">
|
||||
|
||||
|
||||
@@ -71,7 +71,7 @@ function getFormattedLogs(mainLog) {
|
||||
function getChangelogHeader(nextVersion) {
|
||||
const date = new Date().toLocaleDateString()
|
||||
return (
|
||||
`# Nylas Mail Changelog
|
||||
`# Merani Changelog
|
||||
|
||||
### ${nextVersion} (${date})
|
||||
|
||||
@@ -208,7 +208,7 @@ async function main(args) {
|
||||
await spawn('cp', ['-r', '../n1-keys-and-certificates', 'app/build/resources/certs'])
|
||||
await spawn('npm', ['install'], {env: {}})
|
||||
await spawn('npm', ['run', 'build-client'], {env: {SIGN_BUILD: true}})
|
||||
await spawn('codesign', ['--verify', '--deep', '--verbose=2', '"app/dist/Nylas Mail-darwin-x64/Nylas Mail.app"'])
|
||||
await spawn('codesign', ['--verify', '--deep', '--verbose=2', '"app/dist/Merani-darwin-x64/Merani.app"'])
|
||||
// await spawn('npm', ['run', 'upload-client'])
|
||||
} catch (err) {
|
||||
console.error('Errored while running build')
|
||||
|
||||
Reference in New Issue
Block a user