Unified Window #323
Merged
Unified Window #323
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
perry-mitchell
requested changes
Aug 23, 2017
app/package.json
Outdated
| @@ -1,13 +1,14 @@ | |||
| { | |||
| "name": "buttercup", | |||
| "version": "0.18.2", | |||
| "version": "0.19.0", | |||
package.json
Outdated
| @@ -126,7 +126,7 @@ | |||
| "babel-register": "^6.18.0", | |||
| "babili-webpack-plugin": "^0.1.1", | |||
| "buttercup-importer": "~0.9.2", | |||
| "buttercup-web": "~0.32.0", | |||
| "buttercup-web": "^0.32.1", | |||
There was a problem hiding this comment.
Probably best to keep this locked to patches.
There was a problem hiding this comment.
Ah sure this was a merge conflict
src/renderer/index.js
Outdated
| const unhandled = require('electron-unhandled'); | ||
| unhandled(); | ||
| // const unhandled = require('electron-unhandled'); | ||
| // unhandled(); |
There was a problem hiding this comment.
Should we bin this? Or was this kind of a pending item..?
There was a problem hiding this comment.
I commented this out temporarily. uncommenting again :)
perry-mitchell
approved these changes
Aug 23, 2017
|
@sallar I was thinking that we might consider making this beta already.. and perhaps leap to version |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Fixes #319
Fixes #81
Fixes #310
Fixes #293
Fixes #302
Fixes #308
Fixes #309
Fixes #322