LupusNobilis
/
sogo
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

chore(npm): update md to v1.2.1

pull/289/head
Francis Lachapelle 2020-11-04 16:47:12 -05:00
parent 4a83733039
commit 6cac6f2383
5 changed files with 34 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

59
UI/Templates/PreferencesUI/UIxPreferences.wox
View File

@ -145,7 +145,7 @@
</md-autocomplete> </md-autocomplete>
</div> </div>
<div layout="row" layout-wrap="layout-wrap"> <div layout="row" layout-xs="column">
<md-input-container class="md-block" flex="30" flex-xs="100"> <md-input-container class="md-block" flex="30" flex-xs="100">
<label><var:string label:value="Short Date Format"/></label> <label><var:string label:value="Short Date Format"/></label>
<md-select ng-model="app.preferences.defaults.SOGoShortDateFormat"> <md-select ng-model="app.preferences.defaults.SOGoShortDateFormat">
@ -250,7 +250,7 @@
label:aria-label="Enable two-factor authentication using Google Authenticator"> label:aria-label="Enable two-factor authentication using Google Authenticator">
<var:string label:value="Enable two-factor authentication using Google Authenticator"/> <var:string label:value="Enable two-factor authentication using Google Authenticator"/>
</md-checkbox> </md-checkbox>
<div layout="row" layout-align="start center" layout-wrap="layout-wrap" <div layout="row" layout-align="start center" layout-xs="column"
layout-padding="layout-padding" layout-margin="layout-margin" layout-padding="layout-padding" layout-margin="layout-margin"
ng-show="app.preferences.defaults.SOGoGoogleAuthenticatorEnabled"> ng-show="app.preferences.defaults.SOGoGoogleAuthenticatorEnabled">
<div> <div>
@ -272,18 +272,18 @@
aria-controls="generalPasswordView-content" aria-controls="generalPasswordView-content"
label:label="Password"> label:label="Password">
<md-content id="passwordView" class="md-padding"> <md-content id="passwordView" class="md-padding">
<div layout="row"> <div layout="row" layout-xs="column">
<md-input-container class="md-block" flex="50"> <md-input-container class="md-block" flex="flex">
<label><var:string label:value="Current password"/> <label><var:string label:value="Current password"/>
</label> </label>
<input type="password" sg-no-dirty-check="true" ng-model="app.passwords.oldPassword"/> <input type="password" sg-no-dirty-check="true" ng-model="app.passwords.oldPassword"/>
</md-input-container> </md-input-container>
<md-input-container class="md-block" flex="50"> <md-input-container class="md-block" flex="flex">
<label><var:string label:value="New password"/> <label><var:string label:value="New password"/>
</label> </label>
<input type="password" sg-no-dirty-check="true" ng-model="app.passwords.newPassword"/> <input type="password" sg-no-dirty-check="true" ng-model="app.passwords.newPassword"/>
</md-input-container> </md-input-container>
<md-input-container class="md-block" flex="50"> <md-input-container class="md-block" flex="flex">
<label><var:string label:value="Confirmation"/> <label><var:string label:value="Confirmation"/>
</label> </label>
<input type="password" name="newPasswordConfirmation" sg-no-dirty-check="true" ng-model="app.passwords.newPasswordConfirmation"/> <input type="password" name="newPasswordConfirmation" sg-no-dirty-check="true" ng-model="app.passwords.newPasswordConfirmation"/>
@ -694,8 +694,8 @@
</md-select> </md-select>
</md-input-container> </md-input-container>
<div layout="row" layout-wrap="layout-wrap"> <div layout="row" layout-xs="column">
<md-input-container class="md-block" flex="50" flex-xs="100"> <md-input-container class="md-block" flex="flex">
<label><var:string label:value="When replying to a message"/></label> <label><var:string label:value="When replying to a message"/></label>
<md-select ng-model="app.preferences.defaults.SOGoMailReplyPlacement"> <md-select ng-model="app.preferences.defaults.SOGoMailReplyPlacement">
<var:foreach list="replyPlacementList" item="item"> <var:foreach list="replyPlacementList" item="item">
@ -706,7 +706,7 @@
</md-select> </md-select>
</md-input-container> </md-input-container>
<md-input-container class="md-block" flex="50" flex-xs="100"> <md-input-container class="md-block" flex="flex">
<label><var:string label:value="And place my signature"/></label> <label><var:string label:value="And place my signature"/></label>
<md-select ng-model="app.preferences.defaults.SOGoMailSignaturePlacement"> <md-select ng-model="app.preferences.defaults.SOGoMailSignaturePlacement">
<var:foreach list="signaturePlacementList" item="item"> <var:foreach list="signaturePlacementList" item="item">
@ -718,7 +718,7 @@
</md-input-container> </md-input-container>
</div> </div>
<div layout="row" layout-wrap="layout-wrap"> <div layout="row">
<md-input-container class="md-block" flex="50"> <md-input-container class="md-block" flex="50">
<label><var:string label:value="Compose messages in"/></label> <label><var:string label:value="Compose messages in"/></label>
<md-select ng-model="app.preferences.defaults.SOGoMailComposeMessageType"> <md-select ng-model="app.preferences.defaults.SOGoMailComposeMessageType">
@ -730,25 +730,26 @@
</md-select> </md-select>
</md-input-container> </md-input-container>
<div layout="row" flex="50" <div class="md-auto-horizontal-margin" flex="50">
ng-show="app.preferences.defaults.SOGoMailComposeMessageType == 'html'"> <div layout="row" ng-show="app.preferences.defaults.SOGoMailComposeMessageType == 'html'">
<md-checkbox <md-checkbox
ng-model="app.preferences.defaults.SOGoMailComposeFontSizeEnabled" ng-model="app.preferences.defaults.SOGoMailComposeFontSizeEnabled"
label:aria-label="Default font size"><!-- default font size --> label:aria-label="Default font size"><!-- default font size -->
</md-checkbox> </md-checkbox>
<md-input-container class="md-block md-flex"> <md-input-container class="md-block md-flex">
<label><var:string label:value="Default font size"/></label> <label><var:string label:value="Default font size"/></label>
<md-select label:aria-label="Default font size" <md-select label:aria-label="Default font size"
ng-disabled="!app.preferences.defaults.SOGoMailComposeFontSizeEnabled" ng-disabled="!app.preferences.defaults.SOGoMailComposeFontSizeEnabled"
ng-required="app.preferences.defaults.SOGoMailComposeFontSizeEnabled" ng-required="app.preferences.defaults.SOGoMailComposeFontSizeEnabled"
ng-model="app.preferences.defaults.SOGoMailComposeFontSize"> ng-model="app.preferences.defaults.SOGoMailComposeFontSize">
<var:foreach list="fontSizesList" item="item"> <var:foreach list="fontSizesList" item="item">
<md-option var:value="item"> <md-option var:value="item">
<var:string value="itemFontSizeText"/> <var:string value="itemFontSizeText"/>
</md-option> </md-option>
</var:foreach> </var:foreach>
</md-select> </md-select>
</md-input-container> </md-input-container>
</div>
</div> </div>
</div> </div>

2
UI/Templates/SchedulerUI/UIxAppointmentEditorTemplate.wox
View File

@ -24,7 +24,7 @@
</md-toolbar> </md-toolbar>
<md-dialog-content class="sg-has-form-sections"> <md-dialog-content class="sg-has-form-sections">
<div class="sg-form-section"> <div class="sg-form-section">
<div layout="row" layout-wrap="layout-wrap"> <div layout="row" layout-xs="column">
<!-- location --> <!-- location -->
<md-input-container flex="50" flex-xs="100"> <md-input-container flex="50" flex-xs="100">
<label><var:string label:value="Location"/></label> <label><var:string label:value="Location"/></label>

2
UI/Templates/SchedulerUI/UIxTaskEditorTemplate.wox
View File

@ -24,7 +24,7 @@
</md-toolbar> </md-toolbar>
<md-dialog-content class="sg-has-form-sections"> <md-dialog-content class="sg-has-form-sections">
<div class="sg-form-section"> <div class="sg-form-section">
<div layout="row" layout-wrap="layout-wrap"> <div layout="row" layout-xs="column">
<!-- location --> <!-- location -->
<md-input-container flex="50" flex-xs="100"> <md-input-container flex="50" flex-xs="100">
<label><var:string label:value="Location"/></label> <label><var:string label:value="Location"/></label>

2
UI/WebServerResources/angular-material

@ -1 +1 @@
Subproject commit 5d1c32664efc8f3bd38401ae527c4f4271f844b8 Subproject commit 709037d4e71809928782ef7110b232dcf372ec2d

2
UI/WebServerResources/package.json
View File

@ -8,7 +8,7 @@
"angular-aria": "^1.8.0", "angular-aria": "^1.8.0",
"angular-cookies": "^1.8.0", "angular-cookies": "^1.8.0",
"angular-file-upload": "^2.6.1", "angular-file-upload": "^2.6.1",
"angular-material": "1.1.26", "angular-material": "1.2.1",
"angular-messages": "^1.8.0", "angular-messages": "^1.8.0",
"angular-sanitize": "^1.8.0", "angular-sanitize": "^1.8.0",
"angular-ui-router": "^1.0.28", "angular-ui-router": "^1.0.28",