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

Upgrade to Ember 3.1.2 ++

Also disabled optional feature Application Template Wrapper.
This commit is contained in:
Harvey Kandola 2018-05-23 15:14:47 +01:00
parent 09d698fd2a
commit 95323c90ee
7 changed files with 4230 additions and 2165 deletions

View file

@ -34,4 +34,3 @@
{{#layout/bottom-bar}} {{#layout/bottom-bar}}
{{/layout/bottom-bar}} {{/layout/bottom-bar}}

View file

@ -1,6 +1,7 @@
.layout-header, .layout-header,
.layout-footer { .layout-footer {
flex: 0 0 auto; flex: 0 0 auto;
width: 100%;
} }
.layout-body { .layout-body {
@ -45,8 +46,8 @@ footer {
.layout-sidebar { .layout-sidebar {
flex: 0 0 20rem; flex: 0 0 20rem;
// height: calc(100vh - 145px); // height: calc(100vh - 145px);
overflow-x: hidden; // overflow-x: hidden;
overflow-y: auto; // overflow-y: auto;
} }
} }

View file

@ -0,0 +1,3 @@
{
"application-template-wrapper": false
}

View file

@ -1,8 +1,18 @@
'use strict';
const browsers = [
'last 1 Chrome versions',
'last 1 Firefox versions',
'last 1 Safari versions'
];
const isCI = !!process.env.CI;
const isProduction = process.env.EMBER_ENV === 'production';
if (isCI || isProduction) {
browsers.push('ie 11');
}
module.exports = { module.exports = {
browsers: [ browsers
'ie 9',
'last 1 Chrome versions',
'last 1 Firefox versions',
'last 1 Safari versions'
]
}; };

4653
gui/package-lock.json generated

File diff suppressed because it is too large Load diff

View file

@ -20,9 +20,10 @@
"author": "Documize Inc.", "author": "Documize Inc.",
"license": "AGPL", "license": "AGPL",
"devDependencies": { "devDependencies": {
"@ember/optional-features": "^0.6.0",
"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.18.1", "ember-cli": "^3.1.4",
"ember-cli-app-version": "^3.0.0", "ember-cli-app-version": "^3.0.0",
"ember-cli-babel": "^6.6.0", "ember-cli-babel": "^6.6.0",
"ember-cli-dependency-checker": "^2.1.0", "ember-cli-dependency-checker": "^2.1.0",
@ -37,20 +38,21 @@
"ember-cli-sri": "^2.1.0", "ember-cli-sri": "^2.1.0",
"ember-cli-uglify": "^2.0.0", "ember-cli-uglify": "^2.0.0",
"ember-concurrency": "^0.8.12", "ember-concurrency": "^0.8.12",
"ember-data": "2.18.0", "ember-data": "3.1.1",
"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.4.0", "ember-simple-auth": "^1.4.0",
"ember-source": "^2.18.0", "ember-source": "3.1.2",
"ember-truth-helpers": "^2.0.0", "ember-truth-helpers": "^2.0.0",
"eslint-plugin-ember": "^5.0.0", "eslint-plugin-ember": "^5.0.0",
"loader.js": "^4.2.3" "loader.js": "^4.2.3"
}, },
"dependencies": { "dependencies": {
"bootstrap": "^4.1.0", "bootstrap": "^4.1.0",
"nan": "git+https://github.com/nodejs/nan.git",
"node-sass": "^4.9.0", "node-sass": "^4.9.0",
"npm": "^5.7.1", "npm": "^5.10.0",
"popper.js": "^1.14.3" "popper.js": "^1.14.3"
} }
} }

File diff suppressed because it is too large Load diff