Skip to content

Commit 39a626d

Browse files
authored
Merge pull request #4984 from Alfresco/development
Release ADF version 3.4.0
2 parents 5e0f715 + 4ead51d commit 39a626d

File tree

673 files changed

+28950
-7905
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

673 files changed

+28950
-7905
lines changed

.github/CODEOWNERS

Lines changed: 37 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,37 @@
1+
# Each line is a file pattern followed by one or more owners.
2+
3+
# These owners will be the default owners for everything in
4+
# the repo. Unless a later match takes precedence,
5+
# these users will be requested for
6+
# review when someone opens a pull request.
7+
* @eromano @popovicsandras @DenysVuika
8+
9+
# Order is important; the last matching pattern takes the most
10+
# precedence. When someone opens a pull request that only
11+
# modifies JS files, only @js-owner and not the global
12+
# owner(s) will be requested for a review.
13+
e2e/* @eromano @cristinaj @gmandakini @marouanbentaleb
14+
15+
# You can also use email addresses if you prefer. They'll be
16+
# used to look up users just like we do for commit author
17+
# emails.
18+
19+
docs/* @m-hulbert @eromano
20+
21+
# In this example, @doctocat owns any files in the build/logs
22+
# directory at the root of the repository and any of its
23+
# subdirectories.
24+
#/build/logs/ @doctocat
25+
26+
# The `docs/*` pattern will match files like
27+
# `docs/getting-started.md` but not further nested files like
28+
# `docs/build-app/troubleshooting.md`.
29+
30+
31+
# In this example, @octocat owns any file in an apps directory
32+
# anywhere in your repository.
33+
#apps/ @octocat
34+
35+
# In this example, @doctocat owns any file in the `/docs`
36+
# directory in the root of your repository.
37+
#/docs/ @doctocat

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
<a href='https://github.com/Alfresco/alfresco-ng2-components/blob/master/LICENSE'>
1515
<img src='https://img.shields.io/hexpm/l/plug.svg' alt='license' />
1616
</a>
17-
</p>
17+
</p
1818
1919
## Introduction
2020

angular.json

Lines changed: 40 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
},
2424
"assets": [
2525
"demo-shell/src/assets",
26-
"demo-shell/src/favicon.ico",
26+
"demo-shell/src/favicon-96x96.png",
2727
"demo-shell/src/app.config.json",
2828
"demo-shell/src/versions.json",
2929
{
@@ -78,6 +78,8 @@
7878
}
7979
],
8080
"styles": [
81+
"demo-shell/src/assets/fonts/material-icons/material-icons.css",
82+
"demo-shell/src/assets/fonts/muli/muli.css",
8183
"demo-shell/src/styles.scss",
8284
"demo-shell/src/custom-style.scss"
8385
],
@@ -106,18 +108,32 @@
106108
"with": "demo-shell/src/environments/environment.prod.ts"
107109
}
108110
]
111+
},
112+
"e2e": {
113+
"fileReplacements": [
114+
{
115+
"replace": "demo-shell/src/environments/environment.ts",
116+
"with": "demo-shell/src/environments/environment.e2e.ts"
117+
}
118+
]
109119
}
110120
}
111121
},
112122
"serve": {
113123
"builder": "@angular-devkit/build-angular:dev-server",
114124
"options": {
115125
"browserTarget": "dist:build",
116-
"port": 3000
126+
"host": "0.0.0.0",
127+
"port": 3000,
128+
"proxyConfig": "demo-shell/proxy.conf.js",
129+
"disableHostCheck": true
117130
},
118131
"configurations": {
119132
"production": {
120133
"browserTarget": "dist:build:production"
134+
},
135+
"e2e": {
136+
"browserTarget": "dist:build:e2e"
121137
}
122138
}
123139
},
@@ -141,12 +157,14 @@
141157
"node_modules/moment/min/moment.min.js"
142158
],
143159
"styles": [
160+
"demo-shell/src/assets/fonts/material-icons/material-icons.css",
161+
"demo-shell/src/assets/fonts/muli/muli.css",
144162
"demo-shell/src/styles.scss",
145163
"demo-shell/src/custom-style.scss"
146164
],
147165
"assets": [
148166
"demo-shell/src/assets",
149-
"demo-shell/src/favicon.ico",
167+
"demo-shell/src/favicon-96x96.png",
150168
"demo-shell/src/app.config.json",
151169
"demo-shell/src/versions.json",
152170
{
@@ -324,6 +342,8 @@
324342
}
325343
],
326344
"styles": [
345+
"demo-shell/src/assets/fonts/material-icons/material-icons.css",
346+
"demo-shell/src/assets/fonts/muli/muli.css",
327347
"demo-shell/src/styles.scss",
328348
"demo-shell/src/custom-style-dev.scss"
329349
],
@@ -352,18 +372,32 @@
352372
"with": "demo-shell/src/environments/environment.prod.ts"
353373
}
354374
]
375+
},
376+
"e2e": {
377+
"fileReplacements": [
378+
{
379+
"replace": "demo-shell/src/environments/environment.ts",
380+
"with": "demo-shell/src/environments/environment.e2e.ts"
381+
}
382+
]
355383
}
356384
}
357385
},
358386
"serve": {
359387
"builder": "@angular-devkit/build-angular:dev-server",
360388
"options": {
361389
"browserTarget": "dev:build",
362-
"port": 3000
390+
"host": "0.0.0.0",
391+
"port": 3000,
392+
"proxyConfig": "demo-shell/proxy.conf.js",
393+
"disableHostCheck": true
363394
},
364395
"configurations": {
365396
"production": {
366397
"browserTarget": "dev:build:production"
398+
},
399+
"e2e": {
400+
"browserTarget": "dev:build:e2e"
367401
}
368402
}
369403
},
@@ -387,6 +421,8 @@
387421
"node_modules/moment/min/moment.min.js"
388422
],
389423
"styles": [
424+
"demo-shell/src/assets/fonts/material-icons/material-icons.css",
425+
"demo-shell/src/assets/fonts/muli/muli.css",
390426
"demo-shell/src/styles.scss",
391427
"demo-shell/src/custom-style-dev.scss"
392428
],

cspell.json

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -126,7 +126,9 @@
126126
"uncheck",
127127
"subfolders",
128128
"ECMBPM",
129-
"processwithvariables"
129+
"processwithvariables",
130+
"dropdownrestprocess",
131+
"devops"
130132
],
131133
"dictionaries": [
132134
"html",

demo-shell/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"name": "Alfresco-ADF-Angular-Demo",
33
"description": "Demo shell for Alfresco Angular components",
4-
"version": "3.3.0",
4+
"version": "3.4.0",
55
"author": "Alfresco Software, Ltd.",
66
"repository": {
77
"type": "git",

demo-shell/proxy.conf.js

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
1+
var PROXY_HOST_ADF = process.env.PROXY_HOST_ADF;
2+
13
module.exports = {
24
"/alfresco": {
3-
"target": "http://localhost:8080",
5+
"target": (PROXY_HOST_ADF || "http://localhost:8080"),
46
"secure": false,
57
"pathRewrite": {
68
"^/alfresco/alfresco": ""
@@ -15,7 +17,7 @@ module.exports = {
1517
}
1618
},
1719
"/activiti-app": {
18-
"target": "http://localhost:8080",
20+
"target": (PROXY_HOST_ADF || "http://localhost:8080"),
1921
"secure": false,
2022
"pathRewrite": {
2123
"^/activiti-app/activiti-app": ""

demo-shell/resources/i18n/ar.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -78,6 +78,7 @@
7878
"UPLOADER": "مُحمِّل",
7979
"WEBSCRIPT": "برنامج الويب النصي",
8080
"TAG": "علامة",
81+
"PIPES": "أنابيب",
8182
"TRASHCAN": "سلة المحذوفات",
8283
"SOCIAL": "اجتماعي",
8384
"SETTINGS": "إعدادات",

demo-shell/resources/i18n/cs.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -78,6 +78,7 @@
7878
"UPLOADER": "Nástroj pro odesílání",
7979
"WEBSCRIPT": "Webový skript",
8080
"TAG": "Tag",
81+
"PIPES": "Potrubí",
8182
"TRASHCAN": "Koš",
8283
"SOCIAL": "Sociální",
8384
"SETTINGS": "Nastavení",

demo-shell/resources/i18n/da.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -78,6 +78,7 @@
7878
"UPLOADER": "Uploader",
7979
"WEBSCRIPT": "Webscript",
8080
"TAG": "Tag",
81+
"PIPES": "Rør",
8182
"TRASHCAN": "Papirkurv",
8283
"SOCIAL": "Social",
8384
"SETTINGS": "Indstillinger",

demo-shell/resources/i18n/de.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -78,6 +78,7 @@
7878
"UPLOADER": "Uploader",
7979
"WEBSCRIPT": "Webscript",
8080
"TAG": "Tag",
81+
"PIPES": "Pipes",
8182
"TRASHCAN": "Papierkorb",
8283
"SOCIAL": "Soziale Funktionen",
8384
"SETTINGS": "Einstellungen",

0 commit comments

Comments
 (0)