Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

build: merge Release 4.41.0 into develop #497

Merged
merged 3 commits into from
Oct 21, 2020
Merged

build: merge Release 4.41.0 into develop #497

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
21a01d7
chore: bump version to 4.41.0
tshuli Oct 20, 2020
36c24e7
fix: missing period for decryption modal
tshuli Oct 20, 2020
058ab66
fix: use mobile view for submission search / filter elements up till xl
tshuli Oct 20, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
595 changes: 311 additions & 284 deletions CHANGELOG.md
View file
Open in desktop

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion package-lock.json
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "FormSG",
"description": "Form Manager for Government",
"version": "4.40.0",
"version": "4.41.0",
"homepage": "https://form.gov.sg",
"authors": [
"FormSG <[email protected]>"
Expand Down
4 changes: 2 additions & 2 deletions src/public/modules/forms/admin/css/view-responses.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -94,7 +94,7 @@
border: 1px solid #b8b8b8;
}

@media (max-width: 768px) {
@media (max-width: 1200px) {
#responses-tab #date-picker input {
width: 100%;
}
Expand Down Expand Up @@ -124,7 +124,7 @@
justify-content: space-between;
}

@media only screen and (max-width: 768px) {
@media only screen and (max-width: 1200px) {
#responses-tab .flex-row {
display: -webkit-box;
display: -ms-flexbox;
Expand Down
2 changes: 1 addition & 1 deletion src/public/modules/forms/admin/views/decrypt-progress.client.modal.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
<i class="bx bx-loader bx-spin"></i>
</div>
<div class="field-description">
<b>Decrypting large amount of files</b> Decryption might take a while
<b>Decrypting large amount of files.</b><br />Decryption might take a while
depending on the capabilities of your device.
</div>
</div>
8 changes: 4 additions & 4 deletions src/public/modules/forms/admin/views/view-responses.client.view.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,7 @@
</div>
<div ng-if="vm.currentView === 2">
<div class="flex-row">
<div class="col-md-3 response-stats">
<div class="col-xl-3 response-stats">
<span class="stats-text">
<span
><span class="stats">{{vm.responsesCount}}</span> response(s) to
Expand All @@ -82,7 +82,7 @@
</span>
</div>
<div
class="col-md-6"
class="col-xl-6"
ng-show="vm.filterBySubmissionShowFilterBox"
id="filter-by-submission-filter-textbox-container"
>
Expand All @@ -100,7 +100,7 @@
<a ng-click="vm.filterBySubmissionReset()">View&nbsp;All</a>
</span>
</div>
<div class="datepicker-export-container col-md-3">
<div class="datepicker-export-container col-xl-3">
<date-range-picker-directive
class="datepicker-container"
ng-model="vm.datePicker.date"
Expand All @@ -113,7 +113,7 @@
</div>
</div>
<div class="flex-row" ng-show="vm.filterBySubmissionShowFilterBox">
<div class="col-md-5"></div>
<div class="col-xl-5"></div>
</div>
<div class="row">
<div ng-if="vm.responsesCount > 0" class="col-md-12">
Expand Down