Merge branch 'development' into next-release-3.2.0

MariusGrunenberg · Mar 30, 2019 · 81eb2d5 · 81eb2d5
2 parents e225afe + b0587da
commit 81eb2d5
Show file tree

Hide file tree

Showing 10 changed files with 26 additions and 8 deletions.
diff --git a/docs/process-services-cloud/components/app-list-cloud.component.md b/docs/process-services-cloud/components/app-list-cloud.component.md
@@ -31,6 +31,17 @@ You can show custom content when there are no apps available by supplying an
 </adf-cloud-app-list>
 ```
 
+## Activiti 7
+
+If you are generating a project for Activiti 7, you must add the list of apps you want to use in **app.config.json** .
+
+For example :
+
+```json
+  "alfresco-deployed-apps" : [{"name": "simple-app"}]
+```
+
+
 ## Class members
 
 ### Properties

diff --git a/docs/release-notes/RelNote310.md b/docs/release-notes/RelNote310.md
@@ -64,6 +64,7 @@ Below are the most important new features of this release:
 -   [SSO Role AuthGuard](#sso-role-authguard)
 -   [Improved accessibility](#improved-accessibility)
 -   [Arabic and RTL languages support](#arabic-and-rtl-languages-support)
+-   [ADF Testing pacakge](#ADF-testing-pacakge)
 
 ### More on Activiti 7
 
@@ -266,6 +267,7 @@ For more details refer to the :
 
 
 ### SSO Role AuthGuard
+
 The [Auth Guard SSO role service](../core/services/auth-guard-sso-role.service.md) implements an Angular
 [route guard](https://angular.io/guide/router#milestone-5-route-guards)
 to check the user has the right role permission. This is typically used with the
@@ -297,6 +299,10 @@ Due to regular requests, we also decided to support the Arabic language in ADF.
 
 We are quite happy with the current support of RTL languages on ADF, but feedback is welcome if you find something that could be improved or added for a better user experience.
 
+### ADF Testing pacakge
+
+If you are creating e2e in your project where ADF is involved we have started to export some utils and pages in the package @alfresco/adf-testing pacakges. 
+
 ## Localisation
 
 This release includes: French, German, Italian, Spanish, Arabic, Japanese, Dutch, Norwegian (Bokmål), Russian, Brazilian Portuguese and Simplified Chinese versions.

diff --git a/lib/content-services/package.json b/lib/content-services/package.json
@@ -25,7 +25,7 @@
     "@angular/platform-browser": ">=7.0.3",
     "@angular/platform-browser-dynamic": ">=7.0.3",
     "@angular/router": ">=7.0.3",
-    "@alfresco/js-api": "3.1.0-6eec5abc14bb31af3512cba5492f4ba43ffa2fac",
+    "@alfresco/js-api": "3.1.0",
     "rxjs": ">=6.2.2",
     "@alfresco/adf-core": "3.2.0-beta3",
     "@ngx-translate/core": ">=11.0.0",

diff --git a/lib/core/package.json b/lib/core/package.json
@@ -27,7 +27,7 @@
     "@angular/router": ">=7.0.3",
     "@mat-datetimepicker/core": ">=2.0.1",
     "@mat-datetimepicker/moment": ">=2.0.1",
-    "@alfresco/js-api": "3.1.0-6eec5abc14bb31af3512cba5492f4ba43ffa2fac",
+    "@alfresco/js-api": "3.1.0",
     "rxjs": ">=6.2.2",
     "@ngx-translate/core": ">=11.0.0",
     "core-js": ">=2.5.4",

diff --git a/lib/extensions/package.json b/lib/extensions/package.json
@@ -2,6 +2,7 @@
   "name": "@alfresco/adf-extensions",
   "description": "Provides extensibility support for ADF applications.",
   "version": "3.2.0-beta3",
+  "license": "Apache-2.0",
   "author": "Alfresco Software, Ltd.",
   "main": "bundles/adf-extensions.js",
   "repository": {
@@ -15,7 +16,7 @@
     "@angular/common": ">=7.0.3",
     "@angular/core": ">=7.0.3",
     "@angular/http": ">=7.0.3",
-    "@alfresco/js-api": "3.1.0-6eec5abc14bb31af3512cba5492f4ba43ffa2fac"
+    "@alfresco/js-api": "3.1.0"
   },
   "keywords": [
     "extensions",

diff --git a/lib/insights/package.json b/lib/insights/package.json
@@ -25,7 +25,7 @@
     "@angular/platform-browser": ">=7.0.3",
     "@angular/platform-browser-dynamic": ">=7.0.3",
     "@angular/router": ">=7.0.3",
-    "@alfresco/js-api": "3.1.0-6eec5abc14bb31af3512cba5492f4ba43ffa2fac",
+    "@alfresco/js-api": "3.1.0",
     "rxjs": ">=6.2.2",
     "@alfresco/adf-core": "3.2.0-beta3",
     "@alfresco/adf-content-services": "3.2.0-beta3",

diff --git a/lib/process-services-cloud/package.json b/lib/process-services-cloud/package.json
@@ -25,7 +25,7 @@
         "@angular/platform-browser": ">=7.0.3",
         "@angular/platform-browser-dynamic": ">=7.0.3",
         "@angular/router": ">=7.0.3",
-        "@alfresco/js-api": "3.1.0-6eec5abc14bb31af3512cba5492f4ba43ffa2fac",
+        "@alfresco/js-api": "3.1.0",
         "rxjs": ">=6.2.2",
         "@alfresco/adf-core": "3.2.0-beta3",
         "@ngx-translate/core": ">=11.0.0",

diff --git a/lib/process-services/package.json b/lib/process-services/package.json
@@ -25,7 +25,7 @@
     "@angular/platform-browser": ">=7.0.3",
     "@angular/platform-browser-dynamic": ">=7.0.3",
     "@angular/router": ">=7.0.3",
-    "@alfresco/js-api": "3.1.0-6eec5abc14bb31af3512cba5492f4ba43ffa2fac",
+    "@alfresco/js-api": "3.1.0",
     "rxjs": ">=6.2.2",
     "@alfresco/adf-core": "3.2.0-beta3",
     "@alfresco/adf-content-services": "3.2.0-beta3",

diff --git a/lib/testing/package.json b/lib/testing/package.json
@@ -4,6 +4,6 @@
   "peerDependencies": {
     "@angular/common": "^7.1.0",
     "@angular/core": "^7.1.0",
-    "@alfresco/js-api": "3.1.0-6eec5abc14bb31af3512cba5492f4ba43ffa2fac"
+    "@alfresco/js-api": "3.1.0"
   }
 }
diff --git a/package.json b/package.json
@@ -62,7 +62,7 @@
     "@alfresco/adf-process-services": "3.2.0-beta3",
     "@alfresco/adf-process-services-cloud": "3.2.0-beta3",
     "@alfresco/adf-testing": "3.2.0-beta3",
-    "@alfresco/js-api": "3.1.0-6eec5abc14bb31af3512cba5492f4ba43ffa2fac",
+    "@alfresco/js-api": "3.1.0",
     "@angular/animations": "7.0.3",
     "@angular/cdk": "7.0.3",
     "@angular/common": "7.0.3",