Merge branch 'master' into development

This commit is contained in:
Denys Vuika 2018-01-26 19:49:50 +00:00
commit 1e2dbff33f
6 changed files with 16799 additions and 699 deletions

View File

@ -45,7 +45,7 @@
], ],
"scripts": [ "scripts": [
"../node_modules/pdfjs-dist/build/pdf.js", "../node_modules/pdfjs-dist/build/pdf.js",
"../node_modules/pdfjs-dist/web/compatibility.js", "../node_modules/pdfjs-dist/lib/shared/compatibility.js",
"../node_modules/pdfjs-dist/web/pdf_viewer.js" "../node_modules/pdfjs-dist/web/pdf_viewer.js"
], ],
"environmentSource": "environments/environment.ts", "environmentSource": "environments/environment.ts",

View File

@ -7,7 +7,7 @@
## Introduction ## Introduction
The Alfresco Content Application is an example application built using The Alfresco Content Application is an example application built using
[Alfresco Application Development Framework (ADF)](https://github.com/Alfresco/alfresco-ng2-components) components and was generated with [Angular CLI](https://github.com/angular/angular-cli) version 1.5.0. [Alfresco Application Development Framework (ADF)](https://github.com/Alfresco/alfresco-ng2-components) components and was generated with [Angular CLI](https://github.com/angular/angular-cli) version 1.6.6.
### Who is this example application for ### Who is this example application for

14881
package-lock.json generated Normal file

File diff suppressed because it is too large Load Diff

View File

@ -1,6 +1,6 @@
{ {
"name": "alfresco-content-app", "name": "alfresco-content-app",
"version": "1.0.0", "version": "1.0.1",
"license": "LGPL-3.0", "license": "LGPL-3.0",
"scripts": { "scripts": {
"ng": "ng", "ng": "ng",
@ -32,38 +32,36 @@
"@angular/router": "5.1.1", "@angular/router": "5.1.1",
"@ngx-translate/core": "8.0.0", "@ngx-translate/core": "8.0.0",
"alfresco-js-api": "2.0.0", "alfresco-js-api": "2.0.0",
"core-js": "2.4.1", "core-js": "2.5.3",
"hammerjs": "2.0.8", "hammerjs": "2.0.8",
"moment-es6": "1.0.0", "moment-es6": "1.0.0",
"pdfjs-dist": "1.5.404", "pdfjs-dist": "2.0.301",
"rxjs": "5.5.2", "rxjs": "5.5.2",
"web-animations-js": "^2.3.1", "web-animations-js": "^2.3.1",
"zone.js": "0.8.14" "zone.js": "0.8.20"
}, },
"devDependencies": { "devDependencies": {
"@angular-devkit/core": "^0.0.28", "@angular/cli": "1.6.6",
"@angular/cli": "1.5.0", "@angular/compiler-cli": "5.2.2",
"@angular/compiler-cli": "5.1.1", "@angular/language-service": "5.2.2",
"@angular/language-service": "4.4.5",
"@types/jasmine": "^2.5.53", "@types/jasmine": "^2.5.53",
"@types/jasminewd2": "^2.0.2", "@types/jasminewd2": "^2.0.2",
"@types/node": "~6.0.60", "@types/node": "9.3.0",
"codacy-coverage": "^2.0.3", "codelyzer": "^4.0.1",
"codelyzer": "~3.2.0", "jasmine-core": "~2.8.0",
"jasmine-core": "^2.6.2",
"jasmine-reporters": "^2.2.1", "jasmine-reporters": "^2.2.1",
"jasmine-spec-reporter": "^4.1.0", "jasmine-spec-reporter": "~4.2.1",
"jasmine2-protractor-utils": "^1.3.0", "jasmine2-protractor-utils": "^1.3.0",
"karma": "~1.7.0", "karma": "~2.0.0",
"karma-chrome-launcher": "~2.1.1", "karma-chrome-launcher": "~2.2.0",
"karma-cli": "~1.0.1", "karma-cli": "~1.0.1",
"karma-coverage-istanbul-reporter": "^1.2.1", "karma-coverage-istanbul-reporter": "^1.2.1",
"karma-jasmine": "~1.1.0", "karma-jasmine": "~1.1.0",
"karma-jasmine-html-reporter": "^0.2.2", "karma-jasmine-html-reporter": "^0.2.2",
"protractor": "^5.1.2", "protractor": "~5.1.2",
"rimraf": "2.6.2", "rimraf": "2.6.2",
"ts-node": "~3.2.0", "ts-node": "~4.1.0",
"tslint": "~5.7.0", "tslint": "~5.9.1",
"typescript": "~2.4.2" "typescript": "~2.5.3"
} }
} }

View File

@ -31,7 +31,7 @@ import { environment } from './environments/environment';
import 'hammerjs'; import 'hammerjs';
import pdfjsLib from 'pdfjs-dist'; import * as pdfjsLib from 'pdfjs-dist';
pdfjsLib.PDFJS.workerSrc = 'pdf.worker.js'; pdfjsLib.PDFJS.workerSrc = 'pdf.worker.js';
if (environment.production) { if (environment.production) {

2575
yarn.lock

File diff suppressed because it is too large Load Diff