Browse Source

Merge branch 'release/4.x' of github.com:Squidex/squidex

# Conflicts:
#	backend/src/Squidex.Infrastructure/Translations/ResourcesLocalizer.cs
pull/593/head
Sebastian 5 years ago
parent
commit
a485da69a2
  1. 2
      Dockerfile
  2. 8
      frontend/app/features/settings/pages/roles/role.component.html
  3. 4
      frontend/app/framework/angular/forms/editors/tag-editor.component.html

2
Dockerfile

@ -68,6 +68,8 @@ WORKDIR /app
COPY --from=backend /build/ .
COPY --from=frontend /build/ wwwroot/build/
ENV ASPNETCORE_URLS=https://+;http://+
EXPOSE 80
EXPOSE 443
EXPOSE 11111

8
frontend/app/features/settings/pages/roles/role.component.html

@ -99,7 +99,7 @@
</sqx-form-hint>
<div class="row rule-section">
<div class="custom-control custom-checkbox col-6" *ngFor="let property of propertiesSimple; trackBy: trackByProperty">
<div class="custom-control custom-checkbox col-6" *ngFor="let property of propertiesSimple; trackBy: trackByProperty">
<input class="custom-control-input" type="checkbox" id="{{role.name}}_{{property.key}}"
[disabled]="!isEditable"
[ngModel]="getProperty(property.key)"
@ -121,8 +121,10 @@
[ngModel]="getProperty(propertiesList.HIDE_CONTENTS(schema.name))"
(ngModelChange)="setProperty(propertiesList.HIDE_CONTENTS(schema.name), $event)"
[ngModelOptions]="standalone">
<label class="custom-control-label truncate" for="{{role.name}}_schema_{{schema.name}}">
{{ 'roles.properties.hideContents' | sqxTranslate: { schema: schema.displayName } }}
<label class="custom-control-label" for="{{role.name}}_schema_{{schema.name}}">
<span class="truncate">
{{ 'roles.properties.hideContents' | sqxTranslate: { schema: schema.displayName } }}
</span>
</label>
</div>
</div>

4
frontend/app/framework/angular/forms/editors/tag-editor.component.html

@ -53,8 +53,8 @@
(ngModelChange)="toggleValue($event, item)"
/>
<label class="custom-control-label truncate" for="tag_{{i}}" title="{{item.name}}" titlePosition="top-left">
{{item.name}}
<label class="custom-control-label" for="tag_{{i}}" title="{{item.name}}" titlePosition="top-left">
<span class="truncate">{{item.name}}</span>
</label>
</div>
</div>

Loading…
Cancel
Save