1
0
Fork 0
mirror of https://github.com/documize/community.git synced 2025-07-19 21:29:42 +02:00

bumped ember version + yarn

This commit is contained in:
Harvey Kandola 2017-09-04 09:56:09 +01:00
parent 66497d5407
commit 0de060138d
12 changed files with 12614 additions and 676 deletions

6
.gitignore vendored
View file

@ -63,3 +63,9 @@ Dockerfile
container.sh container.sh
make.sh make.sh
jsconfig.json jsconfig.json
yarn-error.log
testem.log
# ember-try
.node_modules.ember-try/
bower.json.ember-try
package.json.ember-try

View file

@ -8,7 +8,7 @@ The mission is to bring software dev inspired features (refactoring, testing, li
## Latest version ## Latest version
v1.53.4 v1.53.5
## OS Support ## OS Support

View file

@ -21,7 +21,6 @@ import (
"github.com/documize/community/edition/boot" "github.com/documize/community/edition/boot"
"github.com/documize/community/edition/logging" "github.com/documize/community/edition/logging"
"github.com/documize/community/embed" "github.com/documize/community/embed"
// _"github.com/documize/community/embed" // the compressed front-end code and static data
"github.com/documize/community/server" "github.com/documize/community/server"
"github.com/documize/community/server/web" "github.com/documize/community/server/web"
_ "github.com/go-sql-driver/mysql" // the mysql driver is required behind the scenes _ "github.com/go-sql-driver/mysql" // the mysql driver is required behind the scenes
@ -43,7 +42,7 @@ func main() {
rt.Product = env.ProdInfo{} rt.Product = env.ProdInfo{}
rt.Product.Major = "1" rt.Product.Major = "1"
rt.Product.Minor = "53" rt.Product.Minor = "53"
rt.Product.Patch = "4" rt.Product.Patch = "5"
rt.Product.Version = fmt.Sprintf("%s.%s.%s", rt.Product.Major, rt.Product.Minor, rt.Product.Patch) rt.Product.Version = fmt.Sprintf("%s.%s.%s", rt.Product.Major, rt.Product.Minor, rt.Product.Patch)
rt.Product.Edition = "Community" rt.Product.Edition = "Community"
rt.Product.Title = fmt.Sprintf("%s Edition", rt.Product.Edition) rt.Product.Title = fmt.Sprintf("%s Edition", rt.Product.Edition)

File diff suppressed because one or more lines are too long

9
gui/config/targets.js Normal file
View file

@ -0,0 +1,9 @@
/* eslint-env node */
module.exports = {
browsers: [
'ie 9',
'last 1 Chrome versions',
'last 1 Firefox versions',
'last 1 Safari versions'
]
};

5417
gui/package-lock.json generated Normal file

File diff suppressed because it is too large Load diff

View file

@ -1,6 +1,6 @@
{ {
"name": "documize", "name": "documize",
"version": "1.53.4", "version": "1.53.5",
"description": "The Document IDE", "description": "The Document IDE",
"private": true, "private": true,
"repository": "", "repository": "",
@ -21,13 +21,13 @@
"devDependencies": { "devDependencies": {
"broccoli-asset-rev": "^2.4.5", "broccoli-asset-rev": "^2.4.5",
"ember-ajax": "^3.0.0", "ember-ajax": "^3.0.0",
"ember-cli": "~2.14.0", "ember-cli": "^2.15.0",
"ember-cli-app-version": "^3.0.0", "ember-cli-app-version": "^3.0.0",
"ember-cli-babel": "^6.3.0", "ember-cli-babel": "^6.3.0",
"ember-cli-dependency-checker": "^1.3.0", "ember-cli-dependency-checker": "^2.0.0",
"ember-cli-eslint": "^3.0.0", "ember-cli-eslint": "^4.0.0",
"ember-cli-htmlbars": "^2.0.1", "ember-cli-htmlbars": "^2.0.1",
"ember-cli-htmlbars-inline-precompile": "^0.4.3", "ember-cli-htmlbars-inline-precompile": "^1.0.0",
"ember-cli-inject-live-reload": "^1.4.1", "ember-cli-inject-live-reload": "^1.4.1",
"ember-cli-mirage": "^0.2.0", "ember-cli-mirage": "^0.2.0",
"ember-cli-qunit": "^4.0.0", "ember-cli-qunit": "^4.0.0",
@ -36,12 +36,12 @@
"ember-cli-sri": "^2.1.0", "ember-cli-sri": "^2.1.0",
"ember-cli-test-loader": "^1.1.0", "ember-cli-test-loader": "^1.1.0",
"ember-cli-uglify": "^1.2.0", "ember-cli-uglify": "^1.2.0",
"ember-data": "~2.14.3", "ember-data": "~2.14.9",
"ember-export-application-global": "^2.0.0", "ember-export-application-global": "^2.0.0",
"ember-load-initializers": "^1.0.0", "ember-load-initializers": "^1.0.0",
"ember-resolver": "^4.0.0", "ember-resolver": "^4.0.0",
"ember-simple-auth": "1.2.2", "ember-simple-auth": "1.2.2",
"ember-source": "~2.14.0", "ember-source": "~2.15.0",
"loader.js": "^4.2.3" "loader.js": "^4.2.3"
}, },
"ember-addon": { "ember-addon": {

View file

@ -1,13 +1,19 @@
/*jshint node:true*/ /* eslint-env node */
module.exports = { module.exports = {
"framework": "qunit", test_page: 'tests/index.html?hidepassed',
"test_page": "tests/index.html", disable_watching: true,
"disable_watching": true, launch_in_ci: [
"launch_in_ci": [ 'Chrome'
"PhantomJS"
], ],
"launch_in_dev": [ launch_in_dev: [
"PhantomJS", 'Chrome'
"Chrome" ],
browser_args: {
Chrome: [
'--disable-gpu',
'--headless',
'--remote-debugging-port=9222',
'--window-size=1440,900'
] ]
}
}; };

View file

@ -3,7 +3,7 @@ import Ember from 'ember';
import startApp from '../helpers/start-app'; import startApp from '../helpers/start-app';
import destroyApp from '../helpers/destroy-app'; import destroyApp from '../helpers/destroy-app';
const { RSVP: { Promise } } = Ember; const { RSVP: { resolve } } = Ember;
export default function(name, options = {}) { export default function(name, options = {}) {
module(name, { module(name, {
@ -26,7 +26,7 @@ export default function(name, options = {}) {
afterEach() { afterEach() {
let afterEach = options.afterEach && options.afterEach.apply(this, arguments); let afterEach = options.afterEach && options.afterEach.apply(this, arguments);
return Promise.resolve(afterEach).then(() => destroyApp(this.application)); return resolve(afterEach).then(() => destroyApp(this.application));
} }
}); });
} }

View file

@ -2,5 +2,7 @@ import resolver from './helpers/resolver';
import { import {
setResolver setResolver
} from 'ember-qunit'; } from 'ember-qunit';
import { start } from 'ember-cli-qunit';
setResolver(resolver); setResolver(resolver);
start();

6499
gui/yarn.lock Normal file

File diff suppressed because it is too large Load diff

View file

@ -1,16 +1,16 @@
{ {
"community": "community":
{ {
"version": "1.53.4", "version": "1.53.5",
"major": 1, "major": 1,
"minor": 53, "minor": 53,
"patch": 4 "patch": 5
}, },
"enterprise": "enterprise":
{ {
"version": "1.55.4", "version": "1.55.5",
"major": 1, "major": 1,
"minor": 55, "minor": 55,
"patch": 4 "patch": 5
} }
} }