Skip to content

Commit bb5b930

Browse files
committed
Merge branch 'master' into production-aws
2 parents a2a90f6 + 1b26445 commit bb5b930

File tree

6 files changed

+18
-13
lines changed

6 files changed

+18
-13
lines changed

app/main/posts/modify/video.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
<img src="/img/vimeo.png" class="wordmark-replace">
1111
<span translate="post.video.video_url"> video URL</span>
1212
</p>
13-
<input type="text" ng-model="videoUrl" ng-change="constructIframe(videoUrl)" placeholder="https://youtu.be/123456">
13+
<input type="text" ng-model="videoUrl" ng-blur="constructIframe(videoUrl)" placeholder="https://youtu.be/123456">
1414

1515
<div id="{{previewId}}" class="form-field-preview" ng-show="videoUrl">
1616
<div class="video_embed-fluid">
Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,19 @@
11
<fieldset overflow-toggle has-overflow="forms.length > 1" ng-model-options="{ updateOn: 'default' }">
22
<label translate="app.surveys">Survey</label>
3-
3+
4+
<div class="form-field checkbox" ng-show="forms.length > 5">
5+
<label>
6+
<input type="checkbox" name="selectedForms" ng-model="all"><em><span translate="category.select_all"></span></em>
7+
</label>
8+
</div>
49
<div class="form-field checkbox" ng-repeat="(index, form) in forms">
510
<label>
6-
<input checklist-value="form.id" checklist-model="selectedForms" type="checkbox" name="selectedForms"> <bdi>{{ ::form.name }}</bdi>
11+
<input checklist-value="form.id" checklist-model="selectedForms" type="checkbox" name="selectedForms" ng-checked="all"> <bdi>{{ ::form.name }}</bdi>
712
</label>
813
</div>
914
<div class="form-field checkbox">
1015
<label>
11-
<input checklist-value="'none'" checklist-model="selectedForms" type="checkbox" name="selectedForms" > <span translate="nav.unknown">Unknown</span>
16+
<input checklist-value="'none'" checklist-model="selectedForms" type="checkbox" name="selectedForms" ng-checked="all" > <span translate="nav.unknown">Unknown</span>
1217
</label>
1318
</div>
1419
</fieldset>

app/main/posts/views/filters/filters-dropdown.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,6 @@ <h4 class="dropdown-menu-title" translate="app.filter_by"></h4>
2525
<!-- end: filter options -->
2626
</div>
2727
<div class="form-field filter-actions">
28-
<button type="button" class="button-link" ng-click="clearFilters()" translate>global_filter.restore_defaults</button>
28+
<button type="button" class="button-beta" ng-click="clearFilters()" translate>global_filter.restore_defaults</button>
2929
<button type="submit" class="button-alpha" ng-disabled="disableApplyButton()" translate>app.apply_filters</button>
3030
</div>

app/main/posts/views/share/share-menu.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ <h2 class="listing-item-title">
3131
<div class="listing-item-image">
3232
<img class="icon" src="/img/twitter.png" alt="">
3333
</div>
34-
<h2 class="listing-item-title"><a target="_blank" ng-href="https://twitter.com/home?status={{shareUrlEncoded}}">Twitter</a></h2>
34+
<h2 class="listing-item-title"><a target="_blank" ng-href="https://twitter.com/intent/tweet?url={{shareUrlEncoded}}">Twitter</a></h2>
3535
</div>
3636
</div>
3737

app/settings/users/users-edit.html

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ <h1 class="mode-context-title" ng-show="!user.id" translate>app.add_user</h1>
4040

4141
<form name="form">
4242
<div class="form-sheet">
43-
<div class="form-field" ng-class="{ 'error': form.full_name.$invalid && form.full_name.$dirty }">
43+
<div class="form-field init required" ng-class="{ 'error': form.full_name.$invalid && form.full_name.$dirty }">
4444
<label translate>user.full_name</label>
4545
<input type="text" placeholder="{{'user_create.full_name' | translate}}" ng-maxlength="150" ng-model="user.realname" name="full_name" required>
4646
<div ng-repeat="(error, value) in form.full_name.$error"
@@ -53,8 +53,8 @@ <h1 class="mode-context-title" ng-show="!user.id" translate>app.add_user</h1>
5353
</div>
5454
</div>
5555

56-
<div class="form-field" ng-class="{ 'error': form.email.$invalid && form.email.$dirty }">
57-
<label class="hidden" translate>user.email</label>
56+
<div class="form-field init required" ng-class="{ 'error': form.email.$invalid && form.email.$dirty }">
57+
<label translate>user.email</label>
5858
<input type="email" placeholder="{{'user_create.email' | translate}}" ng-maxlength="150" ng-model="user.email" name="email" required>
5959
<div ng-repeat="(error, value) in form.email.$error"
6060
ng-show="form.email.$dirty"
@@ -66,8 +66,8 @@ <h1 class="mode-context-title" ng-show="!user.id" translate>app.add_user</h1>
6666
</div>
6767
</div>
6868

69-
<div class="form-field" ng-class="{ 'error': form.password.$invalid && form.password.$dirty }">
70-
<label class="hidden" translate>user.password</label>
69+
<div class="form-field init required" ng-class="{ 'error': form.password.$invalid && form.password.$dirty }">
70+
<label translate>user.password</label>
7171

7272
<a class="button button-flat" ng-show="!passwordShown" ng-click="showPassword()" translate>user.update_password</a>
7373

package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@
4545
"dotenv": "^8.2.0",
4646
"eslint": "^6.7.1",
4747
"fancy-log": "^1.3.3",
48-
"file-loader": "^5.0.2",
48+
"file-loader": "^6.0.0",
4949
"fs-walk": "0.0.2",
5050
"gulp": "^4.0.2",
5151
"gulp-eslint": "^6.0.0",
@@ -88,7 +88,7 @@
8888
"svg-url-loader": "^3.0.3",
8989
"transifex": "^1.6.6",
9090
"uglifyjs-webpack-plugin": "^2.2.0",
91-
"url-loader": "^3.0.0",
91+
"url-loader": "^4.0.0",
9292
"webpack": "^4.41.4",
9393
"webpack-dev-middleware": "^3.7.2",
9494
"webpack-hot-middleware": "^2.25.0"

0 commit comments

Comments
 (0)