Skip to content

Commit

Permalink
12.0.1 (#991)
Browse files Browse the repository at this point in the history
* feat: support openfin-layouts
* feat: disable tabbing on all windows
* feat: disable toggle compact / full view when windows are snapped together
* feat: add undock button on window toolbar when snapped
* fix: use QUANDL API key as environment variable in development mode
* chore: update build tools
  • Loading branch information
msuperina authored Nov 29, 2018
1 parent 8b768a6 commit 73bc661
Show file tree
Hide file tree
Showing 37 changed files with 33,671 additions and 125 deletions.
2 changes: 1 addition & 1 deletion .babelrc
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"presets": ["es2015", "react"],
"presets": ["@babel/preset-env", "@babel/preset-react"],
"env": {
"test": {
"plugins": ["rewire"]
Expand Down
17 changes: 10 additions & 7 deletions .eslintrc
Original file line number Diff line number Diff line change
Expand Up @@ -5,12 +5,12 @@
"browser": true,
"es6": true
},
"parserOptions": {
"ecmaVersion": 6,
"sourceType": "module",
"ecmaFeatures": {
"jsx": true
}
"parserOptions": {
"ecmaVersion": 2017,
"sourceType": "module",
"ecmaFeatures": {
"jsx": true
}
},
"rules": {
"react/jsx-uses-react": 2,
Expand All @@ -31,7 +31,10 @@
"import/no-extraneous-dependencies": ["error", {
"devDependencies": ["test/**", "openfin-config/**", "openfin-launcher/**", "webpack/**", "**/*.dev*"],
"optionalDependencies": false
}]
}],
"no-unused-vars": ["error", { "argsIgnorePattern": "^_" }],
"no-nested-ternary": "off",
"no-use-before-define": "off"
},
"plugins": [
"react",
Expand Down
3 changes: 3 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -45,3 +45,6 @@ jspm_packages

# Public built files
public

#Openfin cache
OpenFin/
2 changes: 1 addition & 1 deletion .travis.yml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
language: node_js

node_js:
- '6.9'
- '10.14.0'

sudo: false

Expand Down
20 changes: 20 additions & 0 deletions CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -65,3 +65,23 @@ This project uses the [GitFlow]([https://www.atlassian.com/git/tutorials/compari

Please follow the [AngularJS commit message convention](https://github.com/angular/angular.js/blob/master/CONTRIBUTING.md#-git-commit-guidelines) for the commit message format.
This simplifies the generation of the change log for a release.


## Creating a release

Create locally a new branch based off `dev`, named `release-x.x.x`.
On this branch update the version in `package.json` to match the release number
and commit the change with the version as the commit message.
Push the branch to the upstream repository (provided you have write permission)
and open PR for this branch into `dev` and `master` branches.
Once the build has passed you can merge both PRs.
Travis should do the deployment(s) automatically.
The release candidate can be found at
[http://scottlogic.github.io/StockFlux/11.2.0-rc/install.html](http://scottlogic.github.io/StockFlux/x.x.x-rc/install.html)
Now checkout to the `master` branch locally, tag the release
`git tag -a x.x.x -m "x.x.x"` and push the tag to the upstream repository
`git push origin x.x.x`
On github go to [releases](https://github.com/ScottLogic/StockFlux/releases),
check that the tag appears at the top of the timeline.
Click on `Draft a new release`, fill the form and confirm by clicking on
`Publish release`
3 changes: 3 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,9 @@ The application is built using React and ES2015, transpiled via Babel. The chart

The displayed data is real and provided by [Quandl](https://www.quandl.com). The application uses separate Quandl API keys for development and release to mitigate chances of crossing Quandl's [rate limits](https://www.quandl.com/docs/api?json#rate-limits).

When working locally, make sure you set the environment variable `QUANDL_API_KEY` representing the Quandl API key before you start the development server or run a build.
The key is located in the StockFlux confluence page under the Internal Systems space.

### Initial Setup

[npm](https://www.npmjs.com/), the package manager for [Node.js](https://nodejs.org/), is used to manage the project's dependencies. [Grunt](http://gruntjs.com/), a JavaScript task runner, is used to test and build the project.
Expand Down
16 changes: 11 additions & 5 deletions openfin-config/app.dev.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,19 +3,25 @@
"startup_app": {
"name": "StockFlux Development",
"uuid": "StockFluxDev",
"maxWidth": 600,
"maxHeight": 200,
"defaultWidth": 400,
"defaultHeight": 200,
"maxWidth": 100,
"maxHeight": 100,
"defaultWidth": 100,
"defaultHeight": 100,
"frame": false,
"showTaskbarIcon": false,
"url": "http://localhost:5000/parent.html",
"autoShow" : true,
"applicationIcon": "http://localhost:5000/favicon.ico"
},
"services": [
{
"name": "layouts",
"manifestUrl": "https://cdn.openfin.co/services/openfin/layouts/0.9.3/app.json?$$disableTabbingOperations=true"
}
],
"runtime": {
"arguments": "--enable-aggressive-domstorage-flushing",
"version": "8.56.24.41"
"version": "9.61.36.36"
},
"shortcut": {
"company": "ScottLogic",
Expand Down
8 changes: 7 additions & 1 deletion openfin-config/app.prod.json
Original file line number Diff line number Diff line change
Expand Up @@ -13,9 +13,15 @@
"autoShow" : false,
"applicationIcon": "http://localhost:5001/favicon.ico"
},
"services": [
{
"name": "layouts",
"manifestUrl": "https://cdn.openfin.co/services/openfin/layouts/0.9.3/app.json?$$disableTabbingOperations=true"
}
],
"runtime": {
"arguments": "--enable-aggressive-domstorage-flushing",
"version": "8.56.24.41"
"version": "9.61.36.36"
},
"shortcut": {
"company": "ScottLogic",
Expand Down
Loading

0 comments on commit 73bc661

Please sign in to comment.