Merge branch 'mobile' into modtools

dev/webpack.appfd.config.js

@@ -73,7 +73,7 @@ module.exports = new Config().extend({
     }),
     // CC new FaviconsPlugin('images/user_logo.png'),
     new webpack.DefinePlugin({
-      APP_VERSION: JSON.stringify('1.4.20, 22 October 2019'),
+      APP_VERSION: JSON.stringify('1.4.21, 30 October 2019'),
       // CC SET ABOVE: API: JSON.stringify(BASE_URL+'/api/'),
       FACEBOOK_APPID: JSON.stringify('134980666550322'),
       FACEBOOK_GRAFFITI_APPID: JSON.stringify('115376591981611'),

http/js/iznik/views/pages/modtools/events_pending.js

@@ -90,7 +90,15 @@ define([
         events: {
             'click .js-save': 'save',
             'click .js-approve': 'approve',
-            'click .js-delete': 'deleteMe'
+            'click .js-delete': 'deleteMe',
+            'click .js-chat': 'chat'
+        },
+
+        chat: function () {
+            var self = this
+            require(['iznik/views/chat/chat'], function (ChatHolder) {
+                ChatHolder().openModChatToUser(self.model.get('user').id, self.model.get('groups')[0].id)
+            })
         },
 
         approve: function() {

http/js/iznik/views/pages/modtools/support.js

@@ -1088,6 +1088,7 @@ define([
       'click .js-logs': 'logs',
       'click .js-spammer': 'spammer',
       'click .js-purge': 'purge',
+      'click .js-merge': 'merge',
       'click .js-profile': 'showProfile'
     },
 
@@ -1140,6 +1141,10 @@ define([
       v.render()
     },
 
+    merge: function () {
+      (new Iznik.Views.ModTools.User.Merge()).render()
+    },
+
     purge: function () {
       var self = this
       var v = new Iznik.Views.Confirm({

http/js/iznik/views/pages/modtools/volunteering_pending.js

@@ -89,7 +89,15 @@ define([
         events: {
             'click .js-save': 'save',
             'click .js-approve': 'approve',
-            'click .js-delete': 'deleteMe'
+            'click .js-delete': 'deleteMe',
+            'click .js-chat': 'chat'
+        },
+
+        chat: function () {
+            var self = this
+            require(['iznik/views/chat/chat'], function (ChatHolder) {
+                ChatHolder().openModChatToUser(self.model.get('user').id, self.model.get('groups')[0].id)
+            })
         },
 
         approve: function() {

http/template/modtools/communityevents/pending.html

@@ -120,6 +120,9 @@ <h4>
                 <button type="button" class="btn btn-danger js-delete">
                     <span class="glyphicon glyphicon-trash" />&nbsp;Delete
                 </button>
+                <div class="btn btn-white js-chat">
+                    <div class="glyphicon glyphicon-envelope vcenter" />&nbsp;Chat
+                </div>
             </ul>
         </div>
     </div>

http/template/modtools/messages/pending/message.html

@@ -3,6 +3,22 @@
         <div class="row">
             <div class="panel-title msgsubj js-details">
                 <div class="col-sm-9">
+                    <% if (obj.worry) { %>
+                        <% _(obj.worry).each(function(word) { %>
+                            <div class="alert alert-danger topspace">
+                                <% if (word.worryword.type === 'Review') { %>
+                                <p>This post contains a keyword which means it's flagged up for review.  If you can't see anything wrong with it, then it's fine.</p>
+                                <% } else if (word.worryword.type === 'Regulated') { %>
+                                <p>This post looks as though it contains a regulated substance.  These should not be allowed on Freegle.  Please do not approve this without checking on <a href="https://discourse.ilovefreegle.org/" data-realurl="true" target="_blank">Central</a> first.</p>
+                                <% } else if (word.worryword.type === 'Reportable') { %>
+                                <p>This post looks as though it contains a reportable substance.  These may need to be reported to the police.  Pease ask the member about it to see what their reason is, and if in doubt discuss on <a href="https://discourse.ilovefreegle.org/" data-realurl="true" target="_blank">Central</a>.</p>
+                                <% } else if (word.worryword.type === 'Medicine') { %>
+                                <p>This post looks as though it contains a drug, medicine or supplement.  These are not legal on Freegle.  Please do not approve this without checking on <a href="https://discourse.ilovefreegle.org/" data-realurl="true" target="_blank">Central</a> first.</p>
+                                <% } %>
+                                <p>You can find more information <a href="http://wiki.ilovefreegle.org/Worry_Words" data-realurl="true" target="_blank">here</a>.</p>
+                            </div>
+                        <% }) %>
+                    <% } %>
                     <h4 class="js-coloursubj">{{subject}}</h4>
                     <div class="inline nopad nomarg js-maybepluginonly">
                         <% if (obj.sourceheader == 'Platform' && obj.item && obj.location && obj.postcode) { %>

http/template/modtools/support/member.html

@@ -70,6 +70,11 @@
                 </div>
             </a>
             <% } %>
+            <% if (obj.systemrole == 'User' || obj.isadmin) { %>
+            <div class="btn btn-white js-merge">
+                =&nbsp;Merge
+            </div>
+            <% } %>
             <h3>Location</h3>
             <div class="row botspace">
                 <div class="col-md-3 botspace">

http/template/modtools/volunteering/pending.html

@@ -132,6 +132,9 @@ <h4>
                 <button type="button" class="btn btn-danger js-delete">
                     <span class="glyphicon glyphicon-trash" />&nbsp;Delete
                 </button>
+                <div class="btn btn-white js-chat">
+                    <div class="glyphicon glyphicon-envelope vcenter" />&nbsp;Chat
+                </div>
             </ul>
         </div>
     </div>

http/template/user/landing/why.html

@@ -58,30 +58,8 @@ <h2>Surely nobody would want this?</h2>
 <h2>Surely nobody would give away this?</h2>
 <p>Same thing - you might not, but someone else might.  Have a look.</p>
 <h2>What about Freecycle?</h2>
-<p>Freegle originally grew out of Freecycle, but we've developed in different ways.  So what are the differences?</p>
-<ul>
-    <li>
-        Our site is much easier to use.  We would say that...but it's true.
-    </li>
-    <li>
-        We have a nice mobile app.  Get it on <a href="https://play.google.com/store/apps/details?id=org.ilovefreegle.direct" data-realurl="true">
-        Google Play
-        </a> or
-        <a href="https://itunes.apple.com/gb/app/freegle/id970045029?ls=1&amp;mt=8" data-realurl="true">iTunes</a>.
-    </li>
-    <li>
-        We have lots of lovely, local, friendly volunteers to help you out.
-    </li>
-    <li>
-        We're based in the UK and run by volunteers, whereas Freecycle is based in the US.
-    </li>
-</ul>
 <p>You can use both - but we think you'll enjoy freegling more.</p>
 <h2>What about Gumtree?</h2>
-<p>
-    Gumtree does have a freebies section, but it's mostly about selling.  We're not in it to make a profit
-    (we're a charity) so we're all about helping people to give and get things for free.
-</p>
 <h2>Why not eBay it?</h2>
 <p>
     You could - and if you need the money, go for it.  But it's quite a hassle to do that, and then you

mobile/freegle/android/config.xml

@@ -1,5 +1,5 @@
 <?xml version='1.0' encoding='utf-8'?>
-<widget android-versionCode="547" id="org.ilovefreegle.direct" version="1.4.20" xmlns="http://www.w3.org/ns/widgets" xmlns:android="http://schemas.android.com/apk/res/android" xmlns:cdv="http://cordova.apache.org/ns/1.0">
+<widget android-versionCode="548" id="org.ilovefreegle.direct" version="1.4.21" xmlns="http://www.w3.org/ns/widgets" xmlns:android="http://schemas.android.com/apk/res/android" xmlns:cdv="http://cordova.apache.org/ns/1.0">
     <name>Freegle</name>
     <description>Offer and request free items on your local Freegle reuse group</description>
     <author />

mobile/freegle/ios/config.xml

@@ -1,5 +1,5 @@
 <?xml version='1.0' encoding='utf-8'?>
-<widget id="org.ilovefreegle.iphone" ios-CFBundleVersion="175" version="1.4.20" xmlns="http://www.w3.org/ns/widgets" xmlns:cdv="http://cordova.apache.org/ns/1.0">
+<widget id="org.ilovefreegle.iphone" ios-CFBundleVersion="176" version="1.4.21" xmlns="http://www.w3.org/ns/widgets" xmlns:cdv="http://cordova.apache.org/ns/1.0">
     <name>Freegle</name>
     <description>Offer and request free items on your local Freegle reuse group</description>
     <author />
@@ -92,7 +92,7 @@
         <config-file overwrite="true" parent="NSLocationWhenInUseUsageDescription" platform="ios" target="*-Info.plist">
             <string>To find your location when offering an item</string>
         </config-file>
-      </platform>
+    </platform>
     <plugin name="cordova-plugin-compat" spec="^1.2.0" />
     <plugin name="cordova-custom-config" spec="^4.0.2" />
     <plugin name="cordova-plugin-ios-camera-permissions" spec="^1.2.0">

package.json

@@ -130,7 +130,7 @@
     "glob": "^7.1.3",
     "glob-promise": "^3.4.0",
     "html-webpack-plugin": "^3.2.0",
-    "http-proxy": "^1.17.0",
+    "http-proxy": "^1.18.0",
     "imports-loader": "^0.7.1",
     "less": "^3.8.1",
     "less-loader": "^4.1.0",