diff --git a/internal_packages/plugins/lib/package-set.cjsx b/internal_packages/plugins/lib/package-set.cjsx
index a43229f32..eba01c7f9 100644
--- a/internal_packages/plugins/lib/package-set.cjsx
+++ b/internal_packages/plugins/lib/package-set.cjsx
@@ -3,19 +3,19 @@ Package = require './package'
class PackageSet extends React.Component
@propTypes:
- 'title': React.PropTypes.string.isRequired
- 'packages': React.PropTypes.array.isRequired
- 'emptyText': React.PropTypes.string
+ title: React.PropTypes.string.isRequired
+ packages: React.PropTypes.array.isRequired
+ emptyText: React.PropTypes.string
render: ->
return false unless @props.packages
- packages = @props.packages.map (pkg) ->
+ packages = @props.packages.map (pkg) ->
count = ({@props.packages.length})
if packages.length is 0
count = []
packages.push(
-
{@props.emptyText ? "No plugins to display."}
+ {@props.emptyText ? "No plugins to display."}
)
diff --git a/package.json b/package.json
index 8c6111558..4f7922b56 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
{
"name": "nylas",
"productName": "Nylas N1",
- "version": "0.4.2",
+ "version": "0.4.6",
"description": "An extensible, open-source mail client built on the modern web.",
"main": "./src/browser/main.js",
"repository": {
@@ -11,7 +11,7 @@
"bugs": {
"url": "https://github.com/nylas/N1/issues"
},
- "electronVersion": "0.35.4",
+ "electronVersion": "0.36.7",
"dependencies": {
"async": "^0.9",
"atom-keymap": "^6.1.1",
diff --git a/script/bootstrap b/script/bootstrap
index 8d045b7d4..11bf19469 100755
--- a/script/bootstrap
+++ b/script/bootstrap
@@ -48,7 +48,7 @@ function makeSqlite3Command() {
// Use our local version of npm (npm 3x) to build sqlite
var npmPath = '"' + path.resolve(__dirname, '..', 'build', 'node_modules', '.bin', 'npm') + '"';
- return npmPath + " install https://github.com/bengotow/node-sqlite3/archive/bengotow/usleep.tar.gz --ignore-scripts && cd node_modules/sqlite3 && "+nodeGypPath+" configure rebuild --target="+targetElectronVersion+" --arch="+targetArch+" --target_platform="+targetPlatform+" --dist-url=https://atom.io/download/atom-shell --module_name=node_sqlite3 --module_path=../lib/binding/node-v46-"+targetPlatform+"-"+targetArch
+ return npmPath + " install https://github.com/bengotow/node-sqlite3/archive/bengotow/usleep.tar.gz --ignore-scripts && cd node_modules/sqlite3 && "+nodeGypPath+" configure rebuild --target="+targetElectronVersion+" --arch="+targetArch+" --target_platform="+targetPlatform+" --dist-url=https://atom.io/download/atom-shell --module_name=node_sqlite3 --module_path=../lib/binding/node-v47-"+targetPlatform+"-"+targetArch
}
function bootstrap() {
diff --git a/spec/spec-bootstrap.coffee b/spec/spec-bootstrap.coffee
index 4ccccee80..a5821399a 100644
--- a/spec/spec-bootstrap.coffee
+++ b/spec/spec-bootstrap.coffee
@@ -1,5 +1,5 @@
# Start the crash reporter before anything else.
-require('crash-reporter').start(productName: 'N1', companyName: 'Nylas')
+# require('crash-reporter').start(productName: 'N1', companyName: 'Nylas')
path = require 'path'
diff --git a/src/flux/attributes/matcher.coffee b/src/flux/attributes/matcher.coffee
index 9c64c102a..153068c42 100644
--- a/src/flux/attributes/matcher.coffee
+++ b/src/flux/attributes/matcher.coffee
@@ -13,7 +13,7 @@ attribute, a comparator and a value.
isUnread = Thread.attributes.unread.equal(true)
-hasLabel = Thread.attributes.lables.contains('label-id-123')
+hasLabel = Thread.attributes.categories.contains('label-id-123')
# Using Matchers in Database Queries
diff --git a/src/native-notifications.coffee b/src/native-notifications.coffee
index 8297262cc..f241e4c55 100644
--- a/src/native-notifications.coffee
+++ b/src/native-notifications.coffee
@@ -4,6 +4,7 @@ class NativeNotifications
displayNotification: ({title, subtitle, body, tag, canReply, onActivate} = {}) =>
n = new Notification(title, {
+ silent: true
body: subtitle
tag: tag
})
diff --git a/static/index.html b/static/index.html
index 6e53a881c..af1a80f5e 100644
--- a/static/index.html
+++ b/static/index.html
@@ -3,7 +3,7 @@
-
+
diff --git a/static/index.js b/static/index.js
index 03e53cc1f..711a4a7ef 100644
--- a/static/index.js
+++ b/static/index.js
@@ -53,13 +53,13 @@ function setupWindow (loadSettings) {
ModuleCache.add(loadSettings.resourcePath)
// Start the crash reporter before anything else.
- require('crash-reporter').start({
- productName: 'N1',
- companyName: 'Nylas',
- // By explicitly passing the app version here, we could save the call
- // of "require('remote').require('app').getVersion()".
- extra: {_version: loadSettings.appVersion}
- })
+ // require('crash-reporter').start({
+ // productName: 'N1',
+ // companyName: 'Nylas',
+ // // By explicitly passing the app version here, we could save the call
+ // // of "require('remote').require('app').getVersion()".
+ // extra: {_version: loadSettings.appVersion}
+ // })
setupVmCompatibility()
setupCsonCache(CompileCache.getCacheDirectory())