From 2d8ac4859e4433bf0d80995e1e41ba5726497c30 Mon Sep 17 00:00:00 2001
From: "greenkeeper[bot]" <23040076+greenkeeper[bot]@users.noreply.github.com>
Date: Tue, 17 Mar 2020 21:20:53 +0000
Subject: [PATCH 01/27] chore(package): update svg-url-loader to version 5.0.0

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index 2d9c561496..2087f6a1a5 100644
--- a/package.json
+++ b/package.json
@@ -85,7 +85,7 @@
     "sass-loader": "^8.0.0",
     "style-loader": "^1.1.2",
     "supports-color": "^3.1.2",
-    "svg-url-loader": "^4.0.0",
+    "svg-url-loader": "^5.0.0",
     "transifex": "^1.6.6",
     "uglifyjs-webpack-plugin": "^2.2.0",
     "url-loader": "^3.0.0",

From 2d7119a9861265a298d19aa854ff1504fbbb2331 Mon Sep 17 00:00:00 2001
From: noone0212 <ssoni@ee.iitr.ac.in>
Date: Thu, 19 Mar 2020 07:31:28 +0530
Subject: [PATCH 02/27] Search field cleared

---
 app/common/directives/filter-system/filter-searchbar.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/common/directives/filter-system/filter-searchbar.html b/app/common/directives/filter-system/filter-searchbar.html
index d97c0b55de..477564c75b 100644
--- a/app/common/directives/filter-system/filter-searchbar.html
+++ b/app/common/directives/filter-system/filter-searchbar.html
@@ -11,7 +11,7 @@
                 ng-model="model.q"
                 ng-focus="showSearchResults()"
                 ng-keyup="detectSubmit($event)"
-                ng-value="model.q"
+                ng-value="model.q=''"
             >
             <svg class="iconic" ng-show="!form.q.$viewValue.length">
               <use xmlns:xlink="http://www.w3.org/1999/xlink" xlink:href="/img/iconic-sprite.svg#magnifying-glass"></use>

From ea80e84b40496def8bdbf5718697127da04b5063 Mon Sep 17 00:00:00 2001
From: noone0212 <ssoni@ee.iitr.ac.in>
Date: Sun, 22 Mar 2020 04:33:52 +0530
Subject: [PATCH 03/27] updated selected user count

---
 app/settings/users/users.controller.js | 1 +
 1 file changed, 1 insertion(+)

diff --git a/app/settings/users/users.controller.js b/app/settings/users/users.controller.js
index daeb906a95..a74cf9d7f7 100644
--- a/app/settings/users/users.controller.js
+++ b/app/settings/users/users.controller.js
@@ -93,6 +93,7 @@ function (
             $q.all(calls).then(function () {
                 Notify.notify('notify.user.bulk_destroy_success');
                 $scope.getUsersForPagination();
+                $scope.selectedUsers.length = 0;
             }, handleResponseErrors)
             .finally($scope.filterRole);
         }, function () {});

From c2bb127a68e87766212ec62edb10321d788a095f Mon Sep 17 00:00:00 2001
From: "greenkeeper[bot]" <23040076+greenkeeper[bot]@users.noreply.github.com>
Date: Mon, 23 Mar 2020 11:46:55 +0000
Subject: [PATCH 04/27] chore(package): update html-webpack-plugin to version
 4.0.0

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index b50e11b85b..2d9afc0b42 100644
--- a/package.json
+++ b/package.json
@@ -54,7 +54,7 @@
     "gulp-rename": "^1.4.0",
     "gulp-tar": "^3.1.0",
     "html-loader": "^0.5.5",
-    "html-webpack-plugin": "^3.2.0",
+    "html-webpack-plugin": "^4.0.0",
     "imports-loader": "^0.8.0",
     "is-url": "^1.2.4",
     "jasmine-core": "^3.5.0",

From 80b2459be66368a407a14cdb785ab9fd3d883981 Mon Sep 17 00:00:00 2001
From: Artur Neumann <artur@jankaritech.com>
Date: Tue, 24 Mar 2020 10:47:54 +0545
Subject: [PATCH 05/27] test: user profile & session update

---
 .../directives/user-profile-directive-spec.js | 45 +++++++++++++++++--
 test/unit/mock/services/user.js               |  3 +-
 2 files changed, 44 insertions(+), 4 deletions(-)

diff --git a/test/unit/common/user-profile/directives/user-profile-directive-spec.js b/test/unit/common/user-profile/directives/user-profile-directive-spec.js
index 31797073b5..e80d4640d3 100644
--- a/test/unit/common/user-profile/directives/user-profile-directive-spec.js
+++ b/test/unit/common/user-profile/directives/user-profile-directive-spec.js
@@ -44,14 +44,18 @@ describe('user profile directive', function () {
     });
 
     describe('saveUser', function () {
-        describe('with a successfull backend call', function () {
+        describe('with a successful backend call', function () {
             beforeEach(function () {
                 spyOn(UserEndpoint, 'update').and.callThrough();
+                spyOn(Session, 'setSessionDataEntries').and.callThrough();
+                spyOn(Notify, 'apiErrors')
+                spyOn(Notify, 'notify').and.callThrough();
             });
 
             describe('after changed values of user', function () {
                 beforeEach(function () {
                     isolateScope.user.realname = 'Changed name';
+                    isolateScope.user.email = 'changed@ushahidi.com';
                 });
 
                 describe('after calling saveUser', function () {
@@ -60,8 +64,21 @@ describe('user profile directive', function () {
                     });
 
                     it('should call "update" on the UserEndpoint with id=me and the changed user profile values', function () {
-                        expect(UserEndpoint.update).toHaveBeenCalled();
+                        expect(UserEndpoint.update).toHaveBeenCalledWith(
+                            {id: 'me'},
+                            jasmine.objectContaining({
+                                'email': 'changed@ushahidi.com',
+                                'realname': 'Changed name'
+                                }
+                            )
+                        );
                         expect(isolateScope.user.realname).toBe('Changed name');
+                        expect(isolateScope.user.email).toBe('changed@ushahidi.com');
+                        expect(Notify.notify).toHaveBeenCalledWith('user_profile.update_success');
+                        expect(Notify.apiErrors).toHaveBeenCalledTimes(0)
+                        expect(Session.setSessionDataEntries).toHaveBeenCalledWith(
+                            {'email': 'changed@ushahidi.com', 'realname': 'Changed name'}
+                        );
                     });
 
                     it('should set user to the new data', function () {
@@ -69,10 +86,32 @@ describe('user profile directive', function () {
                     });
                 });
             });
+
+            describe('after changed the password of the user', function () {
+                beforeEach(function () {
+                    isolateScope.user.password = 'changed';
+                });
+
+                describe('after calling saveUser', function () {
+                    beforeEach(function () {
+                        isolateScope.saveUser(isolateScope.user);
+                    });
+
+                    it('should call "update" on the UserEndpoint with the changed password', function () {
+                        expect(UserEndpoint.update).toHaveBeenCalledWith(
+                            {id: 'me'},
+                            jasmine.objectContaining({
+                                    'password': 'changed'
+                                }
+                            )
+                        );
+                        expect(Notify.apiErrors).toHaveBeenCalledTimes(0)
+                    });
+                });
+            });
         });
 
         describe('with an error on the backend call', function () {
-
             var errorResponse = {
                     status: 400,
                     data: {
diff --git a/test/unit/mock/services/user.js b/test/unit/mock/services/user.js
index 043594270d..e865439c76 100644
--- a/test/unit/mock/services/user.js
+++ b/test/unit/mock/services/user.js
@@ -47,7 +47,8 @@ module.exports = [function () {
                         successCallback({
                             realname: 'Changed name',
                             id: 1,
-                            someField: 'addedByServer'
+                            someField: 'addedByServer',
+                            email: 'changed@ushahidi.com'
                         });
                     } else {
                         failCallback({

From 9bd2fe48a3bac211f226c43f3322d52cfd8440de Mon Sep 17 00:00:00 2001
From: Artur Neumann <artur@jankaritech.com>
Date: Tue, 24 Mar 2020 11:05:12 +0545
Subject: [PATCH 06/27] fix: loading correct amount of posts after deleting

---
 app/main/posts/views/post-view-data.directive.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/main/posts/views/post-view-data.directive.js b/app/main/posts/views/post-view-data.directive.js
index 91f1ec0558..4adce776cc 100644
--- a/app/main/posts/views/post-view-data.directive.js
+++ b/app/main/posts/views/post-view-data.directive.js
@@ -326,7 +326,7 @@ function PostViewDataController(
             limit: $scope.itemsPerPage
         });
         if (useOffset === true) {
-            postQuery.offset = ($scope.currentPage - 1) * $scope.itemsPerPage;
+            postQuery.offset = $scope.posts.length;
         }
         PostEndpoint.query(postQuery).$promise.then(function (postsResponse) {
             //Clear posts

From 619875fd4f117f9d963784ba5ce8238af216609d Mon Sep 17 00:00:00 2001
From: rohit645 <kumarnath.rohit@gmail.com>
Date: Tue, 24 Mar 2020 23:18:57 +0530
Subject: [PATCH 07/27] Removed share button from post creation page

---
 app/main/posts/modify/post-editor.html | 1 -
 1 file changed, 1 deletion(-)

diff --git a/app/main/posts/modify/post-editor.html b/app/main/posts/modify/post-editor.html
index e34ac8e77a..49fbe656a9 100644
--- a/app/main/posts/modify/post-editor.html
+++ b/app/main/posts/modify/post-editor.html
@@ -35,7 +35,6 @@ <h1 class="mode-context-title"><bdi>{{post.form.name}}</bdi></h1>
               </button>
           </div>
           <div class="button-group" ng-show="!post.id">
-              <post-share button="true" ng-show="!post.id"></post-share>
               <button type="submit" class="button-alpha"  ng-if="!saving_post">{{submit}}</button>
               <button type="submit" class="button-alpha"  disabled ng-if="saving_post">{{submitting}}
                 <div class="loading">

From a9ccbb90d4d2e58bf837b903baf2310f744a1321 Mon Sep 17 00:00:00 2001
From: Anna <anna@ushahidi.com>
Date: Thu, 26 Mar 2020 09:59:59 +0100
Subject: [PATCH 08/27] Adding a new confirm delete-notification w extra check

---
 app/common/locales/en.json                 |  8 ++--
 app/common/notifications/notify.service.js | 49 +++++++++++++++++++++-
 app/settings/surveys/surveys.controller.js |  2 +-
 3 files changed, 53 insertions(+), 6 deletions(-)

diff --git a/app/common/locales/en.json b/app/common/locales/en.json
index c0012a864e..b7ccf03520 100644
--- a/app/common/locales/en.json
+++ b/app/common/locales/en.json
@@ -319,7 +319,7 @@
         "delete" : {
             "desc" : "<strong>If you delete this survey</strong>, all of its posts will also be deleted. Proceed with caution.",
             "delete" : "Delete survey",
-            "delete_this" : "Delete this survey",
+            "delete_this" : "Delete this surve",
             "delete_this_field" : "Delete this field",
             "delete_field" : "Delete field",
             "desc_field" : "<strong>If you delete this field</strong>, all of the data that was collected within it will also be deleted. Proceed with caution."
@@ -1523,8 +1523,10 @@
             "save_attribute_success" : "Field {{name}} added",
             "edit_form_success" : "Survey {{name}} updated",
             "edit_stage_success" : "Survey task {{name}} updated",
-            "delete_form_confirm" : "Are you sure you want to delete this survey?",
-            "delete_form_confirm_desc" : "This action cannot be undone. Deleting this survey will remove all of its data, including posts.",
+            "delete_form_confirm" : "Are you sure you want to delete this survey and all its posts?",
+            "delete_form_confirm_desc" : "This action cannot be undone. Deleting this survey will remove all of its data, including posts. Write the name of the survey: <br><br><strong>{{check_name}}</strong><br><br>in the box below to confirm deletion.",
+            "delete_form_error": "The text you entered does not match the survey-name, please try again",
+            "delete_form_button": "Delete this survey",
             "destroy_form_success" : "Survey {{name}} deleted",
             "delete_stage_confirm" : "Are you sure you want to delete this task?",
             "delete_stage_confirm_desc" : "This action cannot be undone. Deleting this task will remove all of its fields, and any data in them.",
diff --git a/app/common/notifications/notify.service.js b/app/common/notifications/notify.service.js
index 7002d62258..a86655cf66 100644
--- a/app/common/notifications/notify.service.js
+++ b/app/common/notifications/notify.service.js
@@ -22,7 +22,8 @@ function Notify(_, $q, $rootScope, $translate, SliderService, ModalService, Demo
         infoModal: infoModal,
         confirmLeave: confirmLeave,
         demo: demo,
-        notifyPermanent: notifyPermanent
+        notifyPermanent: notifyPermanent,
+        deleteWithInput: deleteWithInput
     };
 
     function notify(message, translateValues) {
@@ -217,7 +218,52 @@ function Notify(_, $q, $rootScope, $translate, SliderService, ModalService, Demo
 
         return deferred.promise;
     }
+    function deleteWithInput (type, checkName) {
+        var scope = getScope();
+        var deferred = $q.defer();
+        scope.noequal = false;
+
+        const modalText = {
+            survey: {
+                title: 'notify.form.delete_form_confirm',
+                modalBody: 'notify.form.delete_form_confirm_desc',
+                errorLabel: 'notify.form.delete_form_error',
+                button: 'notify.form.delete_form_button'
+            }
+        };
+
+        var texts = modalText[type];
 
+        $translate(texts.modalBody, {check_name: checkName}).then(show, show);
+
+        function show(body) {
+
+            scope.confirm = function (name) {
+                if (name === checkName) {
+                    scope.noequal = false;
+                    deferred.resolve();
+                    ModalService.close();
+                } else {
+                    scope.noequal = true;
+                }
+            };
+
+            scope.cancel = function () {
+                deferred.reject();
+                ModalService.close();
+            };
+
+            ModalService.openTemplate(
+                `<div class="form-field">
+                    <p>${body}</p>
+                    <p class="alert error" ng-show="noequal" translate>${texts.errorLabel}</p>
+                    <input class="form-field" type="text" name="survey" ng-model="name">
+                    <button class="button-destructive button-flat" ng-click="$parent.confirm(name)" translate>${texts.button}</button>
+                    <button class="button-flat" ng-click="$parent.cancel()" translate="message.button.cancel">Cancel</button>
+                </div>`, texts.title, false, scope, false, false);
+            }
+            return deferred.promise;
+    }
 
     function confirmDelete(confirmText, confirmWarningText, translateValues) {
         var deferred = $q.defer();
@@ -227,7 +273,6 @@ function Notify(_, $q, $rootScope, $translate, SliderService, ModalService, Demo
             translateValues = confirmWarningText;
             confirmWarningText = false;
         }
-
         $translate(confirmText, translateValues).then(show, show);
 
         function show(confirmText) {
diff --git a/app/settings/surveys/surveys.controller.js b/app/settings/surveys/surveys.controller.js
index 63ab14e9ba..fdbbcccb78 100644
--- a/app/settings/surveys/surveys.controller.js
+++ b/app/settings/surveys/surveys.controller.js
@@ -49,7 +49,7 @@ function (
     };
 
     $scope.deleteSurvey = function (survey) {
-        Notify.confirmDelete('notify.form.delete_form_confirm', 'notify.form.delete_form_confirm_desc').then(function () {
+        Notify.deleteWithInput('survey', survey.name).then(function () {
             // If we haven't saved the survey
             // just go back to the surveys views
             if (!survey.id) {

From 6f718669725cd6f3a301fec98e0a6d71466c0572 Mon Sep 17 00:00:00 2001
From: Anna <anna@ushahidi.com>
Date: Thu, 26 Mar 2020 10:00:30 +0100
Subject: [PATCH 09/27] adding test

---
 .../common/notifications/notify.service.spec.js   | 15 +++++++++++++++
 1 file changed, 15 insertions(+)

diff --git a/test/unit/common/notifications/notify.service.spec.js b/test/unit/common/notifications/notify.service.spec.js
index 79d657364d..ce1777a257 100644
--- a/test/unit/common/notifications/notify.service.spec.js
+++ b/test/unit/common/notifications/notify.service.spec.js
@@ -203,6 +203,21 @@ describe('Notify', function () {
         });
     });
 
+    describe('deleteWithInput', function () {
+        beforeEach(function () {
+            spyOn(mockModalService, 'openTemplate').and.callThrough();
+            spyOn(mockSliderService, 'openTemplate').and.callThrough();
+        });
+
+        it('Calls ModalService.openTemplate with error message', function () {
+            mockModalService.state = false;
+            Notify.deleteWithInput('survey', 'this is the name of the survey');
+            $rootScope.$digest();
+            expect(mockModalService.openTemplate).toHaveBeenCalled();
+        });
+    });
+
+
     describe('limit', function () {
         beforeEach(function () {
             spyOn(mockSliderService, 'openTemplate').and.callThrough();

From 0075bf123a73042434ef28530fa6ad4fa9af343a Mon Sep 17 00:00:00 2001
From: Artur Neumann <artur@jankaritech.com>
Date: Fri, 27 Mar 2020 12:11:46 +0545
Subject: [PATCH 10/27] fix: typo

---
 .../user-profile/directives/user-profile-directive-spec.js      | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/test/unit/common/user-profile/directives/user-profile-directive-spec.js b/test/unit/common/user-profile/directives/user-profile-directive-spec.js
index 31797073b5..9fe48e7d7c 100644
--- a/test/unit/common/user-profile/directives/user-profile-directive-spec.js
+++ b/test/unit/common/user-profile/directives/user-profile-directive-spec.js
@@ -44,7 +44,7 @@ describe('user profile directive', function () {
     });
 
     describe('saveUser', function () {
-        describe('with a successfull backend call', function () {
+        describe('with a successful backend call', function () {
             beforeEach(function () {
                 spyOn(UserEndpoint, 'update').and.callThrough();
             });

From b6820484c295339d3cf6a941fc00f8456b825e5a Mon Sep 17 00:00:00 2001
From: Artur Neumann <artur@jankaritech.com>
Date: Fri, 27 Mar 2020 13:40:29 +0545
Subject: [PATCH 11/27] fix: csv column titles not shown in FF

---
 app/settings/data-import/data-import.html | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/app/settings/data-import/data-import.html b/app/settings/data-import/data-import.html
index 9e99cc2f40..27fd6c61c5 100644
--- a/app/settings/data-import/data-import.html
+++ b/app/settings/data-import/data-import.html
@@ -150,7 +150,9 @@ <h2 class="stepper-heading">
                                 <div class="form-field select" data-fieldgroup-target="status-model-columns" ng-show="isStatusOption('defined_column')">
                                     <div class="custom-select">
                                       <select ng-model="selectedStatus">
-                                         <option ng-repeat="column in csv.columns track by $index" value="{{$index}}" label="{{column}}" >
+                                          <option ng-repeat="column in csv.columns track by $index" value="{{$index}}">
+                                              {{column}}
+                                          </option>
                                       </select>
                                     </div>
                                     <p><em translate="data_import.status_explanation">Ushahidi recognizes one of three post statuses: Published, Under review, and Archived. So be sure that each entry in the column you select has one of those three values.</em></p>
@@ -183,7 +185,9 @@ <h2 class="stepper-heading">
                                                 <option selected="selected" value="" translate="data_import.leave_empty">
                                                     Leave empty
                                                 </option>
-                                                 <option ng-repeat="column in csv.columns track by $index" value="{{$index}}" label="{{column}}" >
+                                                <option ng-repeat="column in csv.columns track by $index" value="{{$index}}">
+                                                      {{column}}
+                                                </option>
                                               </select>
                                           </div>
                                       </td>

From 6ad82b4d5b97c7ced57bb0e5ed3000b7112ef6a2 Mon Sep 17 00:00:00 2001
From: Anna <anna@ushahidi.com>
Date: Fri, 27 Mar 2020 11:31:42 +0100
Subject: [PATCH 12/27] tweaks to confirmation-notification

---
 app/common/locales/en.json                 |  4 ++--
 app/common/notifications/notify.service.js | 11 ++++-------
 2 files changed, 6 insertions(+), 9 deletions(-)

diff --git a/app/common/locales/en.json b/app/common/locales/en.json
index b7ccf03520..92c7bc8e61 100644
--- a/app/common/locales/en.json
+++ b/app/common/locales/en.json
@@ -319,7 +319,7 @@
         "delete" : {
             "desc" : "<strong>If you delete this survey</strong>, all of its posts will also be deleted. Proceed with caution.",
             "delete" : "Delete survey",
-            "delete_this" : "Delete this surve",
+            "delete_this" : "Delete this survey",
             "delete_this_field" : "Delete this field",
             "delete_field" : "Delete field",
             "desc_field" : "<strong>If you delete this field</strong>, all of the data that was collected within it will also be deleted. Proceed with caution."
@@ -1523,7 +1523,7 @@
             "save_attribute_success" : "Field {{name}} added",
             "edit_form_success" : "Survey {{name}} updated",
             "edit_stage_success" : "Survey task {{name}} updated",
-            "delete_form_confirm" : "Are you sure you want to delete this survey and all its posts?",
+            "delete_form_confirm" : "Are you sure you want to delete this survey and all of its data?",
             "delete_form_confirm_desc" : "This action cannot be undone. Deleting this survey will remove all of its data, including posts. Write the name of the survey: <br><br><strong>{{check_name}}</strong><br><br>in the box below to confirm deletion.",
             "delete_form_error": "The text you entered does not match the survey-name, please try again",
             "delete_form_button": "Delete this survey",
diff --git a/app/common/notifications/notify.service.js b/app/common/notifications/notify.service.js
index a86655cf66..56b0f6aff3 100644
--- a/app/common/notifications/notify.service.js
+++ b/app/common/notifications/notify.service.js
@@ -221,7 +221,7 @@ function Notify(_, $q, $rootScope, $translate, SliderService, ModalService, Demo
     function deleteWithInput (type, checkName) {
         var scope = getScope();
         var deferred = $q.defer();
-        scope.noequal = false;
+        scope.isEqual = true;
 
         const modalText = {
             survey: {
@@ -237,14 +237,11 @@ function Notify(_, $q, $rootScope, $translate, SliderService, ModalService, Demo
         $translate(texts.modalBody, {check_name: checkName}).then(show, show);
 
         function show(body) {
-
             scope.confirm = function (name) {
-                if (name === checkName) {
-                    scope.noequal = false;
+                scope.isEqual = name === checkName;
+                if (scope.isEqual) {
                     deferred.resolve();
                     ModalService.close();
-                } else {
-                    scope.noequal = true;
                 }
             };
 
@@ -256,7 +253,7 @@ function Notify(_, $q, $rootScope, $translate, SliderService, ModalService, Demo
             ModalService.openTemplate(
                 `<div class="form-field">
                     <p>${body}</p>
-                    <p class="alert error" ng-show="noequal" translate>${texts.errorLabel}</p>
+                    <p class="alert error" ng-show="!isEqual" translate>${texts.errorLabel}</p>
                     <input class="form-field" type="text" name="survey" ng-model="name">
                     <button class="button-destructive button-flat" ng-click="$parent.confirm(name)" translate>${texts.button}</button>
                     <button class="button-flat" ng-click="$parent.cancel()" translate="message.button.cancel">Cancel</button>

From ae973426ffe6a087ea73f7887fe5b0210054ede8 Mon Sep 17 00:00:00 2001
From: noone0212 <ssoni@ee.iitr.ac.in>
Date: Tue, 31 Mar 2020 13:39:00 +0530
Subject: [PATCH 13/27] cleaning secondary toolbar

---
 app/main/posts/views/add-post-button.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/main/posts/views/add-post-button.html b/app/main/posts/views/add-post-button.html
index 9dd628a496..f5c429e6b3 100644
--- a/app/main/posts/views/add-post-button.html
+++ b/app/main/posts/views/add-post-button.html
@@ -1,5 +1,5 @@
 <div class="fab" ng-class="{'upgrade-button': upgradeButton}" data-message="add-post">
-    <button type="button" class="button-alpha button-fab" ng-click="handleClick()" ng-disabled="disabled" ng-class="{'disabled': $parent.$parent.bulkActionsSelected}">
+    <button type="button" class="button-alpha button-fab" ng-click="handleClick()" ng-disabled="disabled" ng-class="{'disabled': $parent.$parent.bulkActionsSelected || editMode()}">
         <svg class="iconic">
             <use xlink:href="/img/iconic-sprite.svg#plus"></use>
             <foreignObject>

From dcbe4516df0221b0d63e3f10c607899b14cd7519 Mon Sep 17 00:00:00 2001
From: noone0212 <ssoni@ee.iitr.ac.in>
Date: Tue, 31 Mar 2020 18:50:55 +0530
Subject: [PATCH 14/27] hide add-post-button

---
 app/main/posts/views/add-post-button.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/main/posts/views/add-post-button.html b/app/main/posts/views/add-post-button.html
index f5c429e6b3..253f17335d 100644
--- a/app/main/posts/views/add-post-button.html
+++ b/app/main/posts/views/add-post-button.html
@@ -1,5 +1,5 @@
 <div class="fab" ng-class="{'upgrade-button': upgradeButton}" data-message="add-post">
-    <button type="button" class="button-alpha button-fab" ng-click="handleClick()" ng-disabled="disabled" ng-class="{'disabled': $parent.$parent.bulkActionsSelected || editMode()}">
+    <button type="button" class="button-alpha button-fab" ng-click="handleClick()" ng-disabled="disabled" ng-class="{'ng-hide': $parent.$parent.bulkActionsSelected || editMode()}">
         <svg class="iconic">
             <use xlink:href="/img/iconic-sprite.svg#plus"></use>
             <foreignObject>

From 413fd4621e363df0395d44e877d0cb4c301580e1 Mon Sep 17 00:00:00 2001
From: Anna <anna@ushahidi.com>
Date: Thu, 2 Apr 2020 15:55:39 +0200
Subject: [PATCH 15/27] disabling esModules for url-loader

---
 webpack.config.js | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/webpack.config.js b/webpack.config.js
index 035edcc03f..88da5e6b0f 100644
--- a/webpack.config.js
+++ b/webpack.config.js
@@ -58,7 +58,10 @@ module.exports = {
       {
         test: /\.png/,
         use: {
-          loader: 'url-loader?limit=10000'
+          loader: 'url-loader?limit=10000',
+          options: {
+            esModule:false
+          }
         }
       },
       {

From ba7b49fbaac987f7aac77b1b24ed33ea6a43be54 Mon Sep 17 00:00:00 2001
From: Anna <anna@ushahidi.com>
Date: Thu, 2 Apr 2020 15:56:49 +0200
Subject: [PATCH 16/27] removing images for Youtube and Vimeo

---
 app/common/locales/en.json       | 5 +----
 app/main/posts/modify/video.html | 8 +-------
 2 files changed, 2 insertions(+), 11 deletions(-)

diff --git a/app/common/locales/en.json b/app/common/locales/en.json
index c0012a864e..308be80158 100644
--- a/app/common/locales/en.json
+++ b/app/common/locales/en.json
@@ -844,10 +844,7 @@
             "error_in_upload": "Your image is too large (maximum size is 1MB) or has the wrong format (allowed formats are gif, png, jpg and jpeg), please check and try again!"
         },
         "video" : {
-            "enter_a" : "Enter a",
-            "or" : " or ",
-            "vimeo" : " Vimeo",
-            "video_url" : " video URL"
+            "enter_a_url": "Enter a video URL from Youtube or Vimeo."
         },
         "unstructured" : {
             "add_survey" : {
diff --git a/app/main/posts/modify/video.html b/app/main/posts/modify/video.html
index de2d1e3b58..5320c0f50e 100644
--- a/app/main/posts/modify/video.html
+++ b/app/main/posts/modify/video.html
@@ -2,13 +2,7 @@
 <form>
   <div class="form-field video_embed">
     <label>{{label}}</label>
-    <p>
-      <span translate="post.video.enter_a">Enter a</span>
-
-      <img src="/img/youtube.png" class="wordmark-replace">
-      <span translate="post.video.or"> or </span>
-      <img src="/img/vimeo.png" class="wordmark-replace">
-      <span translate="post.video.video_url"> video URL</span>
+    <p translate="post.video.enter_a_url">Enter a video URL from Youtube or Vimeo.
     </p>
     <input type="text" ng-model="videoUrl" ng-blur="constructIframe(videoUrl)" placeholder="https://youtu.be/123456">
 

From 26d978f248dc84f425a44da6deaf7d3f7ec0770f Mon Sep 17 00:00:00 2001
From: "greenkeeper[bot]" <23040076+greenkeeper[bot]@users.noreply.github.com>
Date: Thu, 2 Apr 2020 22:53:09 +0000
Subject: [PATCH 17/27] fix(package): update leaflet.locatecontrol to version
 0.71.1

Closes #1471
---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index c37cf2834f..f8f06feb02 100644
--- a/package.json
+++ b/package.json
@@ -112,7 +112,7 @@
     "angular-ui-bootstrap": "^2.5.0",
     "checklist-model": "~0.11.0",
     "d3": "^3.5.17",
-    "leaflet.locatecontrol": "^0.70.0",
+    "leaflet.locatecontrol": "^0.71.1",
     "leaflet": "^1.6.0",
     "leaflet-easybutton": "^2.4.0",
     "leaflet.markercluster": "1.0.5",

From bd348731eca7371ee5bdbfad9d400ddade0043f0 Mon Sep 17 00:00:00 2001
From: Romina <rowasc@gmail.com>
Date: Fri, 3 Apr 2020 14:00:07 -0300
Subject: [PATCH 18/27] Add cross-fetch (ponyfill) rather than node-fetch so
 that we support browsers correctly

---
 app/common/verifier/verifier.js | 2 +-
 package.json                    | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/app/common/verifier/verifier.js b/app/common/verifier/verifier.js
index 9b47dd9863..2bce1eb6ed 100644
--- a/app/common/verifier/verifier.js
+++ b/app/common/verifier/verifier.js
@@ -1,5 +1,5 @@
 import isUrl from 'is-url';
-import fetch from 'node-fetch';
+import fetch from 'cross-fetch';
 import * as forms from '../../../mocked_backend/api/v3/forms.json';
 import * as tags from '../../../mocked_backend/api/v3/tags.json';
 import * as features from '../../../mocked_backend/api/v3/config/features.json';
diff --git a/package.json b/package.json
index c37cf2834f..5a3be25d1b 100644
--- a/package.json
+++ b/package.json
@@ -111,10 +111,11 @@
     "angular-translate-loader-static-files": "^2.11.0",
     "angular-ui-bootstrap": "^2.5.0",
     "checklist-model": "~0.11.0",
+    "cross-fetch": "^3.0.4",
     "d3": "^3.5.17",
-    "leaflet.locatecontrol": "^0.70.0",
     "leaflet": "^1.6.0",
     "leaflet-easybutton": "^2.4.0",
+    "leaflet.locatecontrol": "^0.70.0",
     "leaflet.markercluster": "1.0.5",
     "libphonenumber-js": "^1.0.24",
     "moment": "2.19.3",

From 718239756dc8540d74a0ae53fdaf669e464e6363 Mon Sep 17 00:00:00 2001
From: rohit645 <kumarnath.rohit@gmail.com>
Date: Fri, 3 Apr 2020 22:32:05 +0530
Subject: [PATCH 19/27] removed private toggle button from survey-edit window

---
 app/settings/surveys/attribute-editor.html | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/settings/surveys/attribute-editor.html b/app/settings/surveys/attribute-editor.html
index 15f98c7622..57dbe7230a 100644
--- a/app/settings/surveys/attribute-editor.html
+++ b/app/settings/surveys/attribute-editor.html
@@ -79,7 +79,7 @@
          </div>
        </div>
        <!-- end: media upload toggle to make caption an optional field-->
-       <div class="form-field switch" ng-show="canMakePrivate()">
+       <!-- <div class="form-field switch" ng-show="canMakePrivate()">
           <label translate="survey.make_response_private">Make responses private</label>
           <p data-fieldgroup-target="field-private-message-3" class="init active" translate="survey.response_private_desc" ng-show="editAttribute.response_private">
             <svg class="iconic">
@@ -91,7 +91,7 @@
              <input class="tgl" id="switchprivateresponse" type="checkbox" ng-model="editAttribute.response_private">
              <label class="tgl-btn" for="switchprivateresponse"></label>
           </div>
-       </div>
+       </div> -->
        <div class="form-field switch" ng-if="canDisplay()">
             <label translate="app.default_value">Default value (optional):</label>
             <div class="form-field">

From d0b073023b004726eb5925a9a4c77747c68d1987 Mon Sep 17 00:00:00 2001
From: Romina Suarez <rowasc@gmail.com>
Date: Fri, 3 Apr 2020 16:11:48 -0300
Subject: [PATCH 20/27] Add link to report issues

---
 README.md | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/README.md b/README.md
index 594926102f..d5e3f4aeae 100644
--- a/README.md
+++ b/README.md
@@ -8,6 +8,9 @@ Ushahidi Platform Web Client
 [![Dependency Status](https://david-dm.org/ushahidi/platform-client/dev-status.svg?style=flat)](https://david-dm.org/ushahidi/platform-client#info=devDependencies)
 
 ___
+## Report and find Ushahidi Platform V3 issues
+
+All our issues live in https://github.com/ushahidi/platform/issues . 
 
 ## Try it out on Heroku
 

From eb486406b62776a69d2308eaeca26af47639bd5d Mon Sep 17 00:00:00 2001
From: rohit645 <kumarnath.rohit@gmail.com>
Date: Mon, 6 Apr 2020 09:54:16 +0530
Subject: [PATCH 21/27] requested changes made

---
 app/settings/surveys/attribute-editor.directive.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/settings/surveys/attribute-editor.directive.js b/app/settings/surveys/attribute-editor.directive.js
index 7700b4eea7..c778ed2c9a 100644
--- a/app/settings/surveys/attribute-editor.directive.js
+++ b/app/settings/surveys/attribute-editor.directive.js
@@ -70,7 +70,7 @@ function (
             };
 
             $scope.canMakePrivate = function () {
-                return $scope.editAttribute.type !== 'tags';
+                return $scope.editAttribute.type !== 'tags' && $scope.editAttribute.type !== 'title' && $scope.editAttribute.type !== 'description';
             };
 
             $scope.canDisableCaption = function () {

From cc9c7c81b9671d65ae43ea95ec064664267964bb Mon Sep 17 00:00:00 2001
From: Anna <anna@ushahidi.com>
Date: Mon, 6 Apr 2020 16:45:38 +0200
Subject: [PATCH 22/27] disabling esModules for svg-url-loader

---
 webpack.config.js | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/webpack.config.js b/webpack.config.js
index 88da5e6b0f..bbcf30a336 100644
--- a/webpack.config.js
+++ b/webpack.config.js
@@ -67,7 +67,10 @@ module.exports = {
       {
         test: /\.svg/,
         use: {
-          loader: 'svg-url-loader?limit=1'
+          loader: 'svg-url-loader?limit=1',
+          options: {
+            esModule: false
+          }
         }
       },
       {

From 8c5d2e775ede15ef59db7f773f89be14315ea7cb Mon Sep 17 00:00:00 2001
From: rohit645 <kumarnath.rohit@gmail.com>
Date: Tue, 7 Apr 2020 08:37:51 +0530
Subject: [PATCH 23/27] fixed error due to previous commit

---
 app/settings/surveys/attribute-editor.html | 26 +++++++++++-----------
 1 file changed, 13 insertions(+), 13 deletions(-)

diff --git a/app/settings/surveys/attribute-editor.html b/app/settings/surveys/attribute-editor.html
index 57dbe7230a..7f6b417aa4 100644
--- a/app/settings/surveys/attribute-editor.html
+++ b/app/settings/surveys/attribute-editor.html
@@ -79,19 +79,19 @@
          </div>
        </div>
        <!-- end: media upload toggle to make caption an optional field-->
-       <!-- <div class="form-field switch" ng-show="canMakePrivate()">
-          <label translate="survey.make_response_private">Make responses private</label>
-          <p data-fieldgroup-target="field-private-message-3" class="init active" translate="survey.response_private_desc" ng-show="editAttribute.response_private">
-            <svg class="iconic">
-              <use xmlns:xlink="http://www.w3.org/1999/xlink" xlink:href="/img/iconic-sprite.svg#lock-locked"></use>
-            </svg>
-              Only people with permission to edit responses will be able to see responses to this field.
-          </p>
-          <div class="toggle-switch">
-             <input class="tgl" id="switchprivateresponse" type="checkbox" ng-model="editAttribute.response_private">
-             <label class="tgl-btn" for="switchprivateresponse"></label>
-          </div>
-       </div> -->
+       <div class="form-field switch" ng-show="canMakePrivate()">
+        <label translate="survey.make_response_private">Make responses private</label>
+        <p data-fieldgroup-target="field-private-message-3" class="init active" translate="survey.response_private_desc" ng-show="editAttribute.response_private">
+          <svg class="iconic">
+            <use xmlns:xlink="http://www.w3.org/1999/xlink" xlink:href="/img/iconic-sprite.svg#lock-locked"></use>
+          </svg>
+            Only people with permission to edit responses will be able to see responses to this field.
+        </p>
+        <div class="toggle-switch">
+           <input class="tgl" id="switchprivateresponse" type="checkbox" ng-model="editAttribute.response_private">
+           <label class="tgl-btn" for="switchprivateresponse"></label>
+        </div>
+     </div>
        <div class="form-field switch" ng-if="canDisplay()">
             <label translate="app.default_value">Default value (optional):</label>
             <div class="form-field">

From 8504425ce81b56498873ea595ea51b8da2779aba Mon Sep 17 00:00:00 2001
From: rohit645 <kumarnath.rohit@gmail.com>
Date: Tue, 7 Apr 2020 08:41:23 +0530
Subject: [PATCH 24/27] indentation

---
 app/settings/surveys/attribute-editor.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/settings/surveys/attribute-editor.html b/app/settings/surveys/attribute-editor.html
index 7f6b417aa4..9f4b642bbb 100644
--- a/app/settings/surveys/attribute-editor.html
+++ b/app/settings/surveys/attribute-editor.html
@@ -91,7 +91,7 @@
            <input class="tgl" id="switchprivateresponse" type="checkbox" ng-model="editAttribute.response_private">
            <label class="tgl-btn" for="switchprivateresponse"></label>
         </div>
-     </div>
+       </div>
        <div class="form-field switch" ng-if="canDisplay()">
             <label translate="app.default_value">Default value (optional):</label>
             <div class="form-field">

From 0bbf932f3838d0f873dce2bca7022e37ffcc15c4 Mon Sep 17 00:00:00 2001
From: Romina Suarez <rowasc@gmail.com>
Date: Fri, 10 Apr 2020 00:54:52 -0300
Subject: [PATCH 25/27] Revert "Removed share button from post creation page"

---
 app/main/posts/modify/post-editor.html | 1 +
 1 file changed, 1 insertion(+)

diff --git a/app/main/posts/modify/post-editor.html b/app/main/posts/modify/post-editor.html
index 49fbe656a9..e34ac8e77a 100644
--- a/app/main/posts/modify/post-editor.html
+++ b/app/main/posts/modify/post-editor.html
@@ -35,6 +35,7 @@ <h1 class="mode-context-title"><bdi>{{post.form.name}}</bdi></h1>
               </button>
           </div>
           <div class="button-group" ng-show="!post.id">
+              <post-share button="true" ng-show="!post.id"></post-share>
               <button type="submit" class="button-alpha"  ng-if="!saving_post">{{submit}}</button>
               <button type="submit" class="button-alpha"  disabled ng-if="saving_post">{{submitting}}
                 <div class="loading">

From 3c6fe59e9affb7eef15718a1afb749e46ca76ef8 Mon Sep 17 00:00:00 2001
From: Romina <rowasc@gmail.com>
Date: Fri, 10 Apr 2020 05:01:57 -0300
Subject: [PATCH 26/27] Fix(SelectAll for surveys): update the model correctly
 on check/uncheck all

---
 .../views/filters/filter-form.directive.js    | 21 +++++++++++++++++--
 app/main/posts/views/filters/filter-form.html |  6 +++---
 2 files changed, 22 insertions(+), 5 deletions(-)

diff --git a/app/main/posts/views/filters/filter-form.directive.js b/app/main/posts/views/filters/filter-form.directive.js
index 816766b558..2c7e5d8302 100644
--- a/app/main/posts/views/filters/filter-form.directive.js
+++ b/app/main/posts/views/filters/filter-form.directive.js
@@ -12,15 +12,24 @@ function FormSelectDirective(FormEndpoint) {
     };
 
     function FormSelectLink(scope, element, attrs, ngModel) {
+        scope.checkAll = true;
         if (!ngModel) {
             return;
         }
 
         scope.forms = [];
         scope.selectedForms = [];
-
+        scope.toggleAll = toggleAll;
         activate();
-
+        function toggleAll() {             
+            if (!scope.checkAll) {
+                scope.checkAll = true;
+                Array.prototype.splice.apply(scope.selectedForms, [0, scope.selectedForms.length].concat(scope.forms.map(f => f.id).concat('none')));
+            } else {
+                scope.checkAll = false;
+                Array.prototype.splice.apply(scope.selectedForms, [0, scope.selectedForms.length]);
+            }
+        }
         function activate() {
             // Load forms
             scope.forms = FormEndpoint.query();
@@ -35,6 +44,14 @@ function FormSelectDirective(FormEndpoint) {
         }
 
         function saveValueToView(selectedForms) {
+            // the length +1 check is because we add 'none' through ng-models for unknown survey type (messages with no post)
+            // this "fixes" the usecase where the user manually selected/unselected all checkboxes
+            const sameValues = selectedForms.length === scope.forms.length + 1;
+            if (!sameValues && scope.checkAll === true) {
+                scope.checkAll = false;
+            } else if (sameValues && scope.checkAll === false) {
+                scope.checkAll = true;
+            }
             ngModel.$setViewValue(angular.copy(selectedForms));
         }
     }
diff --git a/app/main/posts/views/filters/filter-form.html b/app/main/posts/views/filters/filter-form.html
index 2a25257bc7..2280dd906f 100644
--- a/app/main/posts/views/filters/filter-form.html
+++ b/app/main/posts/views/filters/filter-form.html
@@ -3,17 +3,17 @@
    
     <div class="form-field checkbox" ng-show="forms.length > 5">
         <label>
-            <input  type="checkbox" name="selectedForms" ng-model="all"><em><span translate="category.select_all"></span></em>
+            <input  type="checkbox" name="selectedForms" ng-checked="checkAll" ng-click="toggleAll()"><em><span translate="category.select_all"></span></em>
         </label>
     </div>
     <div class="form-field checkbox" ng-repeat="(index, form) in forms">
         <label>
-            <input checklist-value="form.id" checklist-model="selectedForms" type="checkbox" name="selectedForms" ng-checked="all"> <bdi>{{ ::form.name }}</bdi>
+            <input checklist-value="form.id" checklist-model="selectedForms" type="checkbox" name="selectedForms"> <bdi>{{ ::form.name }}</bdi>
         </label>
     </div>
     <div class="form-field checkbox">
         <label>
-            <input checklist-value="'none'" checklist-model="selectedForms" type="checkbox" name="selectedForms" ng-checked="all" > <span translate="nav.unknown">Unknown</span>
+            <input checklist-value="'none'" checklist-model="selectedForms" type="checkbox" name="selectedForms"> <span translate="nav.unknown">Unknown</span>
         </label>
     </div>
 </fieldset>

From d6c395536971458377f91ba17f8a3840fd641d94 Mon Sep 17 00:00:00 2001
From: Romina Suarez <rowasc@gmail.com>
Date: Mon, 13 Apr 2020 08:39:48 -0300
Subject: [PATCH 27/27] Update filter-form.directive.js

Remove trailing spaces
---
 app/main/posts/views/filters/filter-form.directive.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/main/posts/views/filters/filter-form.directive.js b/app/main/posts/views/filters/filter-form.directive.js
index 2c7e5d8302..2b3c1dd9aa 100644
--- a/app/main/posts/views/filters/filter-form.directive.js
+++ b/app/main/posts/views/filters/filter-form.directive.js
@@ -21,7 +21,7 @@ function FormSelectDirective(FormEndpoint) {
         scope.selectedForms = [];
         scope.toggleAll = toggleAll;
         activate();
-        function toggleAll() {             
+        function toggleAll() {
             if (!scope.checkAll) {
                 scope.checkAll = true;
                 Array.prototype.splice.apply(scope.selectedForms, [0, scope.selectedForms.length].concat(scope.forms.map(f => f.id).concat('none')));