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/17] 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/17] 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/17] 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/17] 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 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 05/17] 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 06/17] 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 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 07/17] 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 08/17] 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 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 09/17] 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 10/17] 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 11/17] 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 12/17] 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 13/17] 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 14/17] 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 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 15/17] 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 cc9c7c81b9671d65ae43ea95ec064664267964bb Mon Sep 17 00:00:00 2001
From: Anna <anna@ushahidi.com>
Date: Mon, 6 Apr 2020 16:45:38 +0200
Subject: [PATCH 16/17] 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 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 17/17] 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">