Foundry376/Mailspring
1
1
Fork 0
mirror of https://github.com/Foundry376/Mailspring.git synced 2024-09-20 23:36:21 +08:00
Code Issues Packages Projects Releases Wiki Activity

bump(*): Electron 0.36.7, version to 0.4.6

Browse source
This commit is contained in:
Ben Gotow 2016-02-08 18:35:23 -08:00
parent 52681baade
commit fbb7a4b40c
8 changed files with 19 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
internal_packages/plugins/lib/package-set.cjsx
View file

@ -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) -> <Package package={pkg} />
packages = @props.packages.map (pkg) -> <Package key={pkg.name} package={pkg} />
count = <span>({@props.packages.length})</span>
if packages.length is 0
count = []
packages.push(
<div className="empty">{@props.emptyText ? "No plugins to display."}</div>
<div key="empty" className="empty">{@props.emptyText ? "No plugins to display."}</div>
)
<div className="package-set">

4
package.json
View file

@ -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",

2
script/bootstrap
View file

@ -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() {

2
spec/spec-bootstrap.coffee
View file

@ -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'

2
src/flux/attributes/matcher.coffee
View file

@ -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

1
src/native-notifications.coffee
View file

@ -4,6 +4,7 @@ class NativeNotifications
displayNotification: ({title, subtitle, body, tag, canReply, onActivate} = {}) =>
n = new Notification(title, {
silent: true
body: subtitle
tag: tag
})

2
static/index.html
View file

@ -3,7 +3,7 @@
<head>
<title></title>
<meta http-equiv="Content-Security-Policy" content="default-src *; script-src 'self'; style-src * 'unsafe-inline';">
<meta http-equiv="Content-Security-Policy" content="default-src * nylas:; script-src 'self'; style-src * 'unsafe-inline' nylas:; img-src 'self' data: blob: filesystem: nylas:;">
<script src="index.js"></script>
</head>

14
static/index.js
View file

@ -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())