Skip to content

Commit

Permalink
Merge branch 'release/0.3.4'
Browse files Browse the repository at this point in the history
  • Loading branch information
Matthew Mulholland committed Oct 3, 2017
2 parents 19f841a + 883c364 commit b35bbbc
Show file tree
Hide file tree
Showing 61 changed files with 664 additions and 895 deletions.
4 changes: 2 additions & 2 deletions .github/ISSUE_TEMPLATE.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,5 +22,5 @@
### Your Environment
> Include details about the environment you experienced the problem - this will help us fix the bug quicker.
* Data Curator version X.Y.Z
* Operating System and version (e.g. macOS Sierra 10.12.6, Windows 7)
* Data Curator version 0.Y.Z
* Operating System and version (e.g. macOS High Sierra 10.13, Windows 7)
26 changes: 14 additions & 12 deletions README.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -79,16 +79,17 @@ We acknowledge the great work of others. We are:

Data Curator proudly includes the following open source software:

software | organisation | licence | support
-------------------------------------------------------------------- | -------------------------------------------------------------------- | -------------------------------------------------------------------------------- | ------------------------------------------------------------------------------
[Comma Chameleon](https://github.com/theodi/comma-chameleon) | [The Open Data Institute](https://theodi.org) | [MIT](https://github.com/theodi/comma-chameleon/blob/master/LICENSE.md) | [join](https://theodi.org/membership)
[datapackage.js](https://github.com/frictionlessdata/datapackage-js) | [Open Knowledge](https://okfn.org) | [MIT](https://github.com/frictionlessdata/datapackage-js/blob/master/LICENSE.md) | [donate](https://okfn.org/donate/)
[tableschema-js](https://github.com/frictionlessdata/tableschema-js) | [Open Knowledge](https://okfn.org) | [MIT](https://github.com/frictionlessdata/tableschema-js/blob/master/LICENSE.md) | [donate](https://okfn.org/donate/)
[Electron](https://electron.atom.io) | [GitHub](https://github.com) | [MIT](https://github.com/electron/electron/blob/master/LICENSE) | [contribute](https://github.com/electron/electron/blob/master/CONTRIBUTING.md)
[Node.js](https://nodejs.org/en/download/) | [Node.js](https://nodejs.org/en/) | [licence](https://raw.githubusercontent.com/nodejs/node/master/LICENSE) | [contribute](https://nodejs.org/en/get-involved/)
[Chromium](http://www.chromium.org/Home) | [The Chromium Authors](https://cs.chromium.org/chromium/src/AUTHORS) | [licence](https://cs.chromium.org/chromium/src/LICENSE) | [contribute](http://www.chromium.org/getting-involved)
[Vue.js](https://vuejs.org) | Yuxi (Evan) You | [MIT](https://github.com/vuejs/vue/blob/dev/LICENSE) | [donate](https://vuejs.org/support-vuejs/)
[electron-vue](https://github.com/SimulatedGREG/electron-vue) | SimulatedGREG (Greg Holguin) | [MIT](https://github.com/SimulatedGREG/electron-vue/blob/master/LICENSE.md) | [donate](https://vuejs.org/support-vuejs/)
software | organisation | licence | support
-------------------------------------------------------------------- | -------------------------------------------------------------------- | -------------------------------------------------------------------------------- | ------------------------------------------------------------------------------
[Comma Chameleon](https://github.com/theodi/comma-chameleon) | [The Open Data Institute](https://theodi.org) | [MIT](https://github.com/theodi/comma-chameleon/blob/master/LICENSE.md) | [join](https://theodi.org/membership)
[datapackage.js](https://github.com/frictionlessdata/datapackage-js) | [Open Knowledge](https://okfn.org) | [MIT](https://github.com/frictionlessdata/datapackage-js/blob/master/LICENSE.md) | [donate](https://okfn.org/donate/)
[tableschema-js](https://github.com/frictionlessdata/tableschema-js) | [Open Knowledge](https://okfn.org) | [MIT](https://github.com/frictionlessdata/tableschema-js/blob/master/LICENSE.md) | [donate](https://okfn.org/donate/)
[Electron](https://electron.atom.io) | [GitHub](https://github.com) | [MIT](https://github.com/electron/electron/blob/master/LICENSE) | [contribute](https://github.com/electron/electron/blob/master/CONTRIBUTING.md)
[Node.js](https://nodejs.org/en/download/) | [Node.js](https://nodejs.org/en/) | [licence](https://raw.githubusercontent.com/nodejs/node/master/LICENSE) | [contribute](https://nodejs.org/en/get-involved/)
[Chromium](http://www.chromium.org/Home) | [The Chromium Authors](https://cs.chromium.org/chromium/src/AUTHORS) | [licence](https://cs.chromium.org/chromium/src/LICENSE) | [contribute](http://www.chromium.org/getting-involved)
[Vue.js](https://vuejs.org) | Yuxi (Evan) You | [MIT](https://github.com/vuejs/vue/blob/dev/LICENSE) | [donate](https://vuejs.org/support-vuejs/)
[electron-vue](https://github.com/SimulatedGREG/electron-vue) | SimulatedGREG (Greg Holguin) | [MIT](https://github.com/SimulatedGREG/electron-vue/blob/master/LICENSE.md) | [donate](https://vuejs.org/support-vuejs/)
[Handsontable](https://github.com/handsontable/handsontable) | [Handsontable](https://handsontable.com) | [MIT](https://github.com/handsontable/handsontable/blob/master/LICENSE) | [Buy Pro](https://handsontable.com/pricing.html)

## Download and Install Data Curator

Expand All @@ -103,6 +104,7 @@ If you encounter a warning message informing you the application cannot be opene
- then option + click on Open.

This occurs due to macOS quarantining applications when it cannot determine the certificate used to sign the application.
We're planning to sign the application so this goes away.

--------------------------------------------------------------------------------

Expand Down Expand Up @@ -178,7 +180,7 @@ We're considering:

### Building a new package

To build Data Curator for macOS locally:
To build Data Curator locally:

`yarn run build`

Expand All @@ -192,4 +194,4 @@ To automate deployment, we are using:
Changes are recorded in the [Change Log][changelog].

[changelog]: ./CHANGELOG.md
[version-badge]: https://img.shields.io/badge/version-0.3.2-blue.svg
[version-badge]: https://img.shields.io/badge/version-0.3.3-blue.svg
2 changes: 1 addition & 1 deletion help-tags.csv
View file
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ License,Data Package Property,"The Open <a href=""http://specs.frictionlessdata.
Title,Data Package Property,"A <a href=""http://specs.frictionlessdata.io/data-package/#title"">Title</a> or one sentence description for this Data Package"
Description,Data Package Property,"The first paragraph of the <a href=""http://specs.frictionlessdata.io/data-package/#description"">Description</a> should be usable as summary information for the package. Markdown formatting allowed."
Home Page,Data Package Property,"The <a href=""http://specs.frictionlessdata.io/data-package/#homepage"">Home Page</a>"
Version,Data Package Property,"The <a href=""http://specs.frictionlessdata.io/data-package/#version"">Version</a> of the package. It should conform to the [Semantic Versioning](???) requirements."
Version,Data Package Property,"The <a href=""http://specs.frictionlessdata.io/data-package/#version"">Version</a> of the data package. It should conform to the [Data Package Version Pattern](http://specs.frictionlessdata.io/patterns/#data-package-version)."
Sources,Data Package Property,"A list of <a href=""http://specs.frictionlessdata.io/data-package/#sources"">Sources</a> for this Data Package. Each Source MUST have a title and MAY have path and/or email address."
Contributors,Data Package Property,"A list of <a href=""http://specs.frictionlessdata.io/data-package/#contributors"">Contributors</a> (people or organisations) who contributed to this Data Package"
Keywords,Data Package Property,"A list of <a href=""http://specs.frictionlessdata.io/data-package/#keywords"">Keywords</a> to assist users searching for the package in catalogs"
Expand Down
5 changes: 3 additions & 2 deletions package.json
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "data-curator",
"version": "0.3.3",
"name": "DataCurator",
"version": "0.3.4",
"author": " <matt@redboxresearchdata.com.au>",
"description": "Data Curator is a simple desktop CSV editor to help describe, validate and share usable open data",
"license": "MIT",
Expand Down Expand Up @@ -77,6 +77,7 @@
"bootstrap": "^3.3.7",
"bootstrap-tagsinput": "^0.7.1",
"bootstrap-webpack": "^0.0.6",
"bootstrap.native": "^2.0.15",
"components-font-awesome": "^4.7.0",
"datapackage": "^1.0.0",
"electron-prebuilt-compile": "^1.6.11",
Expand Down
19 changes: 6 additions & 13 deletions src/main/help.js
View file
Original file line number Diff line number Diff line change
@@ -1,27 +1,20 @@
electron = require('electron')

BrowserWindow = electron.BrowserWindow
Dialog = electron.dialog
Menu = electron.Menu
import {BrowserWindow} from 'electron'

function getKeyboardShorcutsMenu() {
let helpMenu = Menu.getApplicationMenu().items.find(x => x.role === 'help')
let keyboardShortcutsSubMenu = helpMenu.submenu.items.find(x => x.label === 'Keyboard Shortcuts')
return keyboardShortcutsSubMenu
}

var showKeyboardHelp = function() {
export function showKeyboardHelp() {
let keyboardShortcutsSubMenu = getKeyboardShorcutsMenu()
keyboardShortcutsSubMenu.enabled = false
var keyboardHelpWindow = new BrowserWindow({width: 760, height: 400})

let keyboardHelpWindow = new BrowserWindow({width: 760, height: 400})
keyboardHelpWindow.setMenu(null)
keyboardHelpWindow.loadURL(`http://localhost:9080/#/keyboardhelp`)

keyboardHelpWindow.on('closed', function() {
keyboardShortcutsSubMenu.enabled = true
showKeyboardHelp = null
keyboardHelpWindow = null
})
}

module.exports = {
showKeyboardHelp: showKeyboardHelp
}
Loading

0 comments on commit b35bbbc

Please sign in to comment.