Merge branch 'master' into dev-denys-340

# Conflicts:
#	ng2-components/ng2-alfresco-datatable/package.json
#	ng2-components/ng2-alfresco-documentlist/package.json
This commit is contained in:
Denys Vuika
2016-07-06 13:06:31 +01:00
14 changed files with 90 additions and 40 deletions

View File

@@ -1,7 +1,7 @@
{
"name": "ng2-alfresco-core",
"description": "Alfresco Angular 2 Components core",
"version": "0.0.0-PLACEHOLDER",
"version": "0.2.0",
"author": "Alfresco Software, Ltd.",
"scripts": {
"clean": "rimraf dist node_modules typings",

View File

@@ -1,7 +1,7 @@
{
"name": "ng2-alfresco-datatable",
"description": "Alfresco Angular2 DataTable Component",
"version": "0.0.0-PLACEHOLDER",
"version": "0.2.0",
"author": "Alfresco Software, Ltd.",
"scripts": {
"clean": "rimraf dist node_modules typings",

View File

@@ -1,7 +1,7 @@
{
"name": "ng2-alfresco-documentlist",
"description": "Alfresco Angular2 Document List Component",
"version": "0.0.0-PLACEHOLDER",
"version": "0.2.0",
"author": "Alfresco Software, Ltd.",
"scripts": {
"clean": "rimraf dist node_modules typings",
@@ -74,9 +74,9 @@
"zone.js": "0.6.12",
"rimraf": "2.5.2",
"ng2-translate": "2.2.2",
"alfresco-js-api": "^0.1.0",
"ng2-alfresco-core": "0.0.0-PLACEHOLDER",
"ng2-alfresco-datatable": "0.0.0-PLACEHOLDER"
"ng2-alfresco-core": "0.2.0",
"ng2-alfresco-datatable": "0.2.0",
"alfresco-js-api": "^0.1.0"
},
"peerDependencies": {
"material-design-icons": "^2.2.3",

View File

@@ -1,7 +1,7 @@
{
"name": "ng2-alfresco-login",
"description": "Alfresco Angular2 Login Component",
"version": "0.0.0-PLACEHOLDER",
"version": "0.2.0",
"author": "Alfresco Software, Ltd.",
"scripts": {
"clean": "rimraf dist node_modules typings",
@@ -82,7 +82,7 @@
"zone.js": "0.6.12",
"rimraf": "2.5.2",
"ng2-translate": "2.2.2",
"ng2-alfresco-core": "0.0.0-PLACEHOLDER",
"ng2-alfresco-core": "0.2.0",
"alfresco-js-api": "^0.1.0",
"coveralls": "^2.11.9"
},

View File

@@ -1,7 +1,7 @@
{
"name": "ng2-alfresco-search",
"description": "Alfresco Angular2 Search Component",
"version": "0.0.0-PLACEHOLDER",
"version": "0.2.0",
"author": "Alfresco Software, Ltd.",
"scripts": {
"clean": "rimraf dist node_modules typings",
@@ -76,7 +76,7 @@
"ng2-translate": "2.2.2",
"material-design-lite": "1.1.3",
"alfresco-js-api": "^0.1.0",
"ng2-alfresco-core": "0.0.0-PLACEHOLDER"
"ng2-alfresco-core": "0.2.0"
},
"peerDependencies": {
"material-design-icons": "^2.2.3",

View File

@@ -1,7 +1,7 @@
{
"name": "ng2-alfresco-upload",
"description": "Alfresco Angular2 Upload Component",
"version": "0.0.0-PLACEHOLDER",
"version": "0.2.0",
"author": "Alfresco Software, Ltd.",
"scripts": {
"clean": "rimraf dist node_modules typings",
@@ -78,7 +78,7 @@
"rimraf": "2.5.2",
"ng2-translate": "2.2.2",
"alfresco-js-api": "^0.1.0",
"ng2-alfresco-core": "0.0.0-PLACEHOLDER"
"ng2-alfresco-core": "0.2.0"
},
"peerDependencies": {
"material-design-icons": "^2.2.3",

View File

@@ -1,7 +1,7 @@
{
"name": "ng2-alfresco-viewer",
"description": "Alfresco documents viewer",
"version": "0.0.0-PLACEHOLDER",
"version": "0.2.0",
"author": "Alfresco Software, Ltd.",
"scripts": {
"clean": "rimraf dist node_modules typings",