Upstream/harbor
1
0
Fork 0
mirror of https://github.com/goharbor/harbor.git synced 2025-02-18 12:51:27 +01:00
Code Issues Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/vmware/harbor

Browse Source
This commit is contained in:
Fuhui Peng (c) 2017-11-01 18:36:37 +08:00
commit 30a60e6115
9 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Makefile
View File

@ -224,7 +224,7 @@ DOCKERSAVE_PARA=$(DOCKERIMAGENAME_ADMINSERVER):$(VERSIONTAG) \
$(DOCKERIMAGENAME_DB):$(VERSIONTAG) \ $(DOCKERIMAGENAME_DB):$(VERSIONTAG) \
$(DOCKERIMAGENAME_JOBSERVICE):$(VERSIONTAG) \ $(DOCKERIMAGENAME_JOBSERVICE):$(VERSIONTAG) \
vmware/nginx-photon:$(NGINXVERSION) vmware/registry:$(REGISTRYVERSION) \ vmware/nginx-photon:$(NGINXVERSION) vmware/registry:$(REGISTRYVERSION) \
photon:$(PHOTONVERSION) vmware/photon:$(PHOTONVERSION)
PACKAGE_OFFLINE_PARA=-zcvf harbor-offline-installer-$(GITTAGVERSION).tgz \ PACKAGE_OFFLINE_PARA=-zcvf harbor-offline-installer-$(GITTAGVERSION).tgz \
$(HARBORPKG)/common/templates $(HARBORPKG)/$(DOCKERIMGFILE).$(VERSIONTAG).tar.gz \ $(HARBORPKG)/common/templates $(HARBORPKG)/$(DOCKERIMGFILE).$(VERSIONTAG).tar.gz \
$(HARBORPKG)/prepare $(HARBORPKG)/NOTICE \ $(HARBORPKG)/prepare $(HARBORPKG)/NOTICE \

2
src/ui_ng/lib/src/project-policy-config/project-policy-config.component.ts
View File

@ -107,7 +107,7 @@ export class ProjectPolicyConfigComponent implements OnInit {
} }
hasChanges() { hasChanges() {
return compareValue(this.orgProjectPolicy, this.projectPolicy) return !compareValue(this.orgProjectPolicy, this.projectPolicy);
} }
save() { save() {

2
src/ui_ng/lib/src/tag/tag.component.html.ts
View File

@ -18,7 +18,7 @@ export const TAG_TEMPLATE = `
<clr-dg-column style="min-width: 160px;" [clrDgField]="'name'">{{'REPOSITORY.TAG' | translate}}</clr-dg-column> <clr-dg-column style="min-width: 160px;" [clrDgField]="'name'">{{'REPOSITORY.TAG' | translate}}</clr-dg-column>
<clr-dg-column style="width: 90px;" [clrDgField]="'size'">{{'REPOSITORY.SIZE' | translate}}</clr-dg-column> <clr-dg-column style="width: 90px;" [clrDgField]="'size'">{{'REPOSITORY.SIZE' | translate}}</clr-dg-column>
<clr-dg-column style="min-width: 120px; max-width:220px;">{{'REPOSITORY.PULL_COMMAND' | translate}}</clr-dg-column> <clr-dg-column style="min-width: 120px; max-width:220px;">{{'REPOSITORY.PULL_COMMAND' | translate}}</clr-dg-column>
<clr-dg-column style="width: 140px;" *ngIf="withClair">{{'VULNERABILITY.SINGULAR' | translate}}</clr-dg-column> <clr-dg-column style="width: 140px;" *ngIf="withClair">{{'REPOSITORY.VULNERABILITY' | translate}}</clr-dg-column>
<clr-dg-column style="width: 80px;" *ngIf="withNotary">{{'REPOSITORY.SIGNED' | translate}}</clr-dg-column> <clr-dg-column style="width: 80px;" *ngIf="withNotary">{{'REPOSITORY.SIGNED' | translate}}</clr-dg-column>
<clr-dg-column style="width: 130px;">{{'REPOSITORY.AUTHOR' | translate}}</clr-dg-column> <clr-dg-column style="width: 130px;">{{'REPOSITORY.AUTHOR' | translate}}</clr-dg-column>
<clr-dg-column style="width: 160px;"[clrDgSortBy]="createdComparator">{{'REPOSITORY.CREATED' | translate}}</clr-dg-column> <clr-dg-column style="width: 160px;"[clrDgSortBy]="createdComparator">{{'REPOSITORY.CREATED' | translate}}</clr-dg-column>

2
src/ui_ng/package.json
View File

@ -31,7 +31,7 @@
"clarity-icons": "^0.9.8", "clarity-icons": "^0.9.8",
"clarity-ui": "^0.9.8", "clarity-ui": "^0.9.8",
"core-js": "^2.4.1", "core-js": "^2.4.1",
"harbor-ui": "0.4.95", "harbor-ui": "0.4.96",
"intl": "^1.2.5", "intl": "^1.2.5",
"mutationobserver-shim": "^0.3.2", "mutationobserver-shim": "^0.3.2",
"ngx-cookie": "^1.0.0", "ngx-cookie": "^1.0.0",

2
src/ui_ng/src/app/project/project-detail/project-detail.component.html
View File

@ -16,7 +16,7 @@
<li class="nav-item" *ngIf="isSessionValid && isSystemAdmin"> <li class="nav-item" *ngIf="isSessionValid && isSystemAdmin">
<a class="nav-link" routerLink="replications" routerLinkActive="active">{{'PROJECT_DETAIL.REPLICATION' | translate}}</a> <a class="nav-link" routerLink="replications" routerLinkActive="active">{{'PROJECT_DETAIL.REPLICATION' | translate}}</a>
</li> </li>
<li class="nav-item" *ngIf="isSessionValid && isSystemAdmin"> <li class="nav-item" *ngIf="isSessionValid && (isSystemAdmin || isMember)">
<a class="nav-link" routerLink="configs" routerLinkActive="active">{{'PROJECT_DETAIL.CONFIG' | translate}}</a> <a class="nav-link" routerLink="configs" routerLinkActive="active">{{'PROJECT_DETAIL.CONFIG' | translate}}</a>
</li> </li>
</ul> </ul>

1
src/ui_ng/src/i18n/lang/en-us-lang.json
View File

@ -348,6 +348,7 @@
"FILTER_FOR_REPOSITORIES": "Filter Repositories", "FILTER_FOR_REPOSITORIES": "Filter Repositories",
"TAG": "Tag", "TAG": "Tag",
"SIZE": "Size", "SIZE": "Size",
"VULNERABILITY": "Vulnerability",
"SIGNED": "Signed", "SIGNED": "Signed",
"AUTHOR": "Author", "AUTHOR": "Author",
"CREATED": "Creation Time", "CREATED": "Creation Time",

1
src/ui_ng/src/i18n/lang/es-es-lang.json
View File

@ -349,6 +349,7 @@
"FILTER_FOR_REPOSITORIES": "Filtrar Repositorios", "FILTER_FOR_REPOSITORIES": "Filtrar Repositorios",
"TAG": "Etiqueta", "TAG": "Etiqueta",
"SIZE": "Size", "SIZE": "Size",
"VULNERABILITY": "Vulnerability",
"SIGNED": "Firmada", "SIGNED": "Firmada",
"AUTHOR": "Autor", "AUTHOR": "Autor",
"CREATED": "Fecha de creación", "CREATED": "Fecha de creación",

1
src/ui_ng/src/i18n/lang/zh-cn-lang.json
View File

@ -348,6 +348,7 @@
"FILTER_FOR_REPOSITORIES": "过滤镜像仓库", "FILTER_FOR_REPOSITORIES": "过滤镜像仓库",
"TAG": "标签", "TAG": "标签",
"SIZE": "大小", "SIZE": "大小",
"VULNERABILITY": "漏洞",
"SIGNED": "已签名", "SIGNED": "已签名",
"AUTHOR": "作者", "AUTHOR": "作者",
"CREATED": "创建时间", "CREATED": "创建时间",

2
tests/resources/Harbor-Pages/Project.robot
View File

@ -111,7 +111,7 @@ Project Should Not Be Deleted
[Arguments] ${projname} [Arguments] ${projname}
Delete Project ${projname} Delete Project ${projname}
Sleep 1 Sleep 1
Page Should Contain Element //clr-alert//span[contains(.,'cannot')] Page Should Contain ${projname}
Project Should Be Deleted Project Should Be Deleted
[Arguments] ${projname} [Arguments] ${projname}