Skip to content

Commit

Permalink
Upgraded to latest JS SPA release
Browse files Browse the repository at this point in the history
  • Loading branch information
HarveyKandola committed Jul 14, 2017
1 parent 7397812 commit a8e8d14
Show file tree
Hide file tree
Showing 9 changed files with 659 additions and 672 deletions.
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ The mission is to bring software dev inspired features (refactoring, testing, li

## Latest version

v1.48.2
v1.49.0

## OS Support

Expand All @@ -18,7 +18,7 @@ v1.48.2

## Tech stack

- EmberJS (v2.12.0)
- EmberJS (v2.14.0)
- Go (v1.8)
- MySQL (v5.7.10+) or Percona (v5.7.16-10+)

Expand Down
2 changes: 1 addition & 1 deletion app/.eslintrc.js
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
module.exports = {
root: true,
parserOptions: {
ecmaVersion: 6,
ecmaVersion: 2017,
sourceType: 'module'
},
extends: 'eslint:recommended',
Expand Down
5 changes: 1 addition & 4 deletions app/.travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,17 +8,14 @@ sudo: false
cache:
directories:
- $HOME/.npm
- $HOME/.cache # includes bowers cache

before_install:
- npm config set spin false
- npm install -g bower phantomjs-prebuilt
- bower --version
- npm install -g phantomjs-prebuilt
- phantomjs --version

install:
- npm install
- bower install

script:
- npm test
2 changes: 1 addition & 1 deletion app/app/app.js
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ import config from './config/environment';

let App;

Ember.MODEL_FACTORY_INJECTIONS = true;
// Ember.MODEL_FACTORY_INJECTIONS = true;

// Ember.RSVP.on('error', function(error) {
// console.log("App:");
Expand Down
28 changes: 14 additions & 14 deletions app/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -14,34 +14,34 @@
"test": "ember test"
},
"engines": {
"node": ">= 0.10.0"
"node": "^4.5 || 6.* || >= 7.*"
},
"author": "Documize Inc.",
"license": "AGPL",
"devDependencies": {
"broccoli-asset-rev": "^2.4.5",
"ember-ajax": "^2.4.1",
"ember-cli": "2.12.0",
"ember-cli-app-version": "^2.0.0",
"ember-cli-babel": "^5.1.7",
"ember-ajax": "^3.0.0",
"ember-cli": "~2.14.0",
"ember-cli-app-version": "^3.0.0",
"ember-cli-babel": "^6.3.0",
"ember-cli-dependency-checker": "^1.3.0",
"ember-cli-eslint": "^3.0.0",
"ember-cli-htmlbars": "^1.1.1",
"ember-cli-htmlbars-inline-precompile": "^0.3.6",
"ember-cli-htmlbars": "^2.0.1",
"ember-cli-htmlbars-inline-precompile": "^0.4.3",
"ember-cli-inject-live-reload": "^1.4.1",
"ember-cli-mirage": "^0.2.0",
"ember-cli-qunit": "^3.1.0",
"ember-cli-qunit": "^4.0.0",
"ember-cli-sass": "5.3.1",
"ember-cli-shims": "^1.0.2",
"ember-cli-shims": "^1.1.0",
"ember-cli-sri": "^2.1.0",
"ember-cli-test-loader": "^1.1.0",
"ember-cli-uglify": "^1.2.0",
"ember-data": "^2.12.0",
"ember-export-application-global": "^1.0.5",
"ember-load-initializers": "^0.6.0",
"ember-resolver": "^2.0.3",
"ember-data": "~2.14.3",
"ember-export-application-global": "^2.0.0",
"ember-load-initializers": "^1.0.0",
"ember-resolver": "^4.0.0",
"ember-simple-auth": "1.2.2",
"ember-source": "~2.12.0",
"ember-source": "~2.14.0",
"loader.js": "^4.2.3"
},
"ember-addon": {
Expand Down
12 changes: 0 additions & 12 deletions app/testem.json

This file was deleted.

4 changes: 2 additions & 2 deletions core/api/endpoint/server.go
Original file line number Diff line number Diff line change
Expand Up @@ -34,8 +34,8 @@ var Product core.ProdInfo

func init() {
Product.Major = "1"
Product.Minor = "48"
Product.Patch = "2"
Product.Minor = "49"
Product.Patch = "0"
Product.Version = fmt.Sprintf("%s.%s.%s", Product.Major, Product.Minor, Product.Patch)
Product.Edition = "Community"
Product.Title = fmt.Sprintf("%s Edition", Product.Edition)
Expand Down
2 changes: 2 additions & 0 deletions core/api/request/init.go
Original file line number Diff line number Diff line change
Expand Up @@ -83,6 +83,8 @@ func init() {
}
}

fmt.Println(Db.DriverName())

return false // value not changed
})
}
Expand Down
1,272 changes: 636 additions & 636 deletions embed/bindata_assetfs.go

Large diffs are not rendered by default.

0 comments on commit a8e8d14

Please sign in to comment.