Merge pull request #2259 from okTurtles/release-1.0.1

1.0.1 prep

backend/routes.js

@@ -159,7 +159,7 @@ if (process.env.NODE_ENV === 'development') {
       })
     }
   }, function (request, h) {
-    const ip = request.info.remoteAddress
+    const ip = request.headers['x-real-ip'] || request.info.remoteAddress
     const log = levelToColor[request.payload.level]
     console.debug(chalk.bold.yellow(`REMOTE LOG (${ip}): `) + log(`[${request.payload.level}] ${request.payload.value}`))
     return h.response().code(200)
@@ -722,7 +722,7 @@ route.POST('/zkpp/register/{name}', {
       }
     }
   } catch (e) {
-    const ip = req.info.remoteAddress
+    const ip = req.headers['x-real-ip'] || req.info.remoteAddress
     console.error(e, 'Error at POST /zkpp/{name}: ' + e.message, { ip })
   }
 
@@ -740,7 +740,7 @@ route.GET('/zkpp/{name}/auth_hash', {
 
     return challenge || Boom.notFound()
   } catch (e) {
-    const ip = req.info.remoteAddress
+    const ip = req.headers['x-real-ip'] || req.info.remoteAddress
     console.error(e, 'Error at GET /zkpp/{name}/auth_hash: ' + e.message, { ip })
   }
 
@@ -765,7 +765,7 @@ route.GET('/zkpp/{name}/contract_hash', {
       return salt
     }
   } catch (e) {
-    const ip = req.info.remoteAddress
+    const ip = req.headers['x-real-ip'] || req.info.remoteAddress
     console.error(e, 'Error at GET /zkpp/{name}/contract_hash: ' + e.message, { ip })
   }
 
@@ -791,7 +791,7 @@ route.POST('/zkpp/updatePasswordHash/{name}', {
       return result
     }
   } catch (e) {
-    const ip = req.info.remoteAddress
+    const ip = req.headers['x-real-ip'] || req.info.remoteAddress
     console.error(e, 'Error at POST /zkpp/updatePasswordHash/{name}: ' + e.message, { ip })
   }
 

package.json

@@ -1,9 +1,9 @@
 {
   "name": "group-income",
-  "version": "1.0.0",
+  "version": "1.0.1",
   "contractsVersion": "1.0.0",
   "private": true,
-  "description": "",
+  "description": "Group Income is a decentralized and private (end-to-end encrypted) financial safety net for you and your friends.",
   "scripts": {
     "backend": "npx nodemon --watch backend/ -- --require ./Gruntfile.js --require @babel/register ./backend/index.js",
     "sass-dev": "node-sass --output-style nested --source-map true -w -r -o ./dist/assets/css ./frontend/assets/style",

strings/english.json

@@ -51,7 +51,6 @@
   "Add a note {span_}(optional){_span}": "Add a note {span_}(optional){_span}",
   "Add code": "Add code",
   "Add description": "Add description",
-  "Add emoticons": "Add emoticons",
   "Add income details": "Add income details",
   "Add link": "Add link",
   "Add members": "Add members",
@@ -402,6 +401,8 @@
   "Incorrect username or password": "Incorrect username or password",
   "Info": "Info",
   "Information about your pledges streaks and other streak members appears here.": "Information about your pledges streaks and other streak members appears here.",
+  "Install": "Install",
+  "Install this web app on your device for better usability.": "Install this web app on your device for better usability.",
   "Introduce the potential new member(s) to your group": "Introduce the potential new member(s) to your group",
   "Invalid password": "Invalid password",
   "Invite links": "Invite links",

strings/english.strings

@@ -156,9 +156,6 @@
 /* views/containers/dashboard/GroupPurpose.vue, views/pages/GroupChat.vue */
 "Add description" = "Add description";
 
-/* views/containers/chatroom/MessageActions.vue */
-"Add emoticons" = "Add emoticons";
-
 /* views/containers/contributions/AddIncomeDetailsWidget.vue */
 "Add income details" = "Add income details";
 
@@ -1122,7 +1119,7 @@
 /* views/pages/GroupSettings.vue */
 "Group name" = "Group name";
 
-/* views/containers/group-settings/GroupCreationModal.vue */
+/* views/containers/group-settings/GroupCreationModal.vue, views/pages/GroupSettings.vue */
 "Group name cannot exceed {maxchar} characters" = "Group name cannot exceed {maxchar} characters";
 
 /* views/containers/group-settings/GroupCreationModal.vue */
@@ -1209,6 +1206,12 @@
 /* views/containers/dashboard/GroupMembersActivity.vue */
 "Information about your pledges streaks and other streak members appears here." = "Information about your pledges streaks and other streak members appears here.";
 
+/* views/pages/Home.vue */
+"Install" = "Install";
+
+/* views/pages/Home.vue */
+"Install this web app on your device for better usability." = "Install this web app on your device for better usability.";
+
 /* views/containers/design-system/DSModalFullscreen.vue, views/containers/design-system/DSModalNested.vue */
 "Introduce the potential new member(s) to your group" = "Introduce the potential new member(s) to your group";
 

strings/french.json

@@ -261,9 +261,9 @@
   "{user} missed {streak} vote": "{user} missed {streak} vote",
   "{user} missed {streak} votes": "{user} missed {streak} votes",
   "Direct Messages: Coming soon!": "Direct Messages: Coming soon!",
-  "Group name cannot exceed {maxchar} characters": "Group name cannot exceed {maxchar} characters",
   "Group name is required": "Group name is required",
   "Group purpose cannot exceed {maxchar} characters": "Group purpose cannot exceed {maxchar} characters",
+  "Group name cannot exceed {maxchar} characters": "Group name cannot exceed {maxchar} characters",
   "2. Wait for an existing member to use the app": "2. Wait for an existing member to use the app",
   "Because Group Income is end-to-end encrypted, an existing member must send you the secret keys to access the group. They will automatically do this when they load the app.": "Because Group Income is end-to-end encrypted, an existing member must send you the secret keys to access the group. They will automatically do this when they load the app.",
   "Click on the individual link you received from an existing group. Don't have an invite?": "Click on the individual link you received from an existing group. Don't have an invite?",
@@ -378,6 +378,8 @@
   "{messagesCount} Pinned": "{messagesCount} Pinned",
   "Next distribution date is on {date}. Make sure to update your {r1}income details{r2} by then.": "Next distribution date is on {date}. Make sure to update your {r1}income details{r2} by then.",
   "Group description cannot exceed {maxchar} characters": "Group description cannot exceed {maxchar} characters",
+  "Install this web app on your device for better usability.": "Install this web app on your device for better usability.",
+  "Install": "Install",
   "(group name unavailable)": "(group name unavailable)",
   "Go to dashboard": "Go to dashboard",
   "You are already a member of '{groupName}'": "You are already a member of '{groupName}'",
@@ -603,7 +605,6 @@
   "Are you sure you want to leave {channelName}?": "Êtes-vous sûr(e) de vouloir quitter {channelName} ?",
   "Leave Channel": "Quitter le salon",
   "You will no longer be able to send or see messages in this channel.": "Vous ne pourrez plus envoyer ni recevoir des messages dans ce salon.",
-  "Add emoticons": "Ajouter des émoticônes",
   "More options": "Autres options",
   "Reply": "Répondre",
   "Add reaction": "Ajouter une réaction",

strings/french.strings

@@ -786,15 +786,15 @@
 /* MISSING TRANSLATION - views/containers/global-dashboard/DirectMessages.vue */
 "Direct Messages: Coming soon!" = "Direct Messages: Coming soon!";
 
-/* MISSING TRANSLATION - views/containers/group-settings/GroupCreationModal.vue */
-"Group name cannot exceed {maxchar} characters" = "Group name cannot exceed {maxchar} characters";
-
 /* MISSING TRANSLATION - views/containers/group-settings/GroupCreationModal.vue */
 "Group name is required" = "Group name is required";
 
 /* MISSING TRANSLATION - views/containers/group-settings/GroupCreationModal.vue */
 "Group purpose cannot exceed {maxchar} characters" = "Group purpose cannot exceed {maxchar} characters";
 
+/* MISSING TRANSLATION - views/containers/group-settings/GroupCreationModal.vue, views/pages/GroupSettings.vue */
+"Group name cannot exceed {maxchar} characters" = "Group name cannot exceed {maxchar} characters";
+
 /* MISSING TRANSLATION - views/containers/group-settings/GroupJoinModal.vue */
 "2. Wait for an existing member to use the app" = "2. Wait for an existing member to use the app";
 
@@ -1137,6 +1137,12 @@
 /* MISSING TRANSLATION - views/pages/GroupSettings.vue */
 "Group description cannot exceed {maxchar} characters" = "Group description cannot exceed {maxchar} characters";
 
+/* MISSING TRANSLATION - views/pages/Home.vue */
+"Install this web app on your device for better usability." = "Install this web app on your device for better usability.";
+
+/* MISSING TRANSLATION - views/pages/Home.vue */
+"Install" = "Install";
+
 /* MISSING TRANSLATION - views/pages/Join.vue */
 "(group name unavailable)" = "(group name unavailable)";
 
@@ -1812,9 +1818,6 @@
 /* views/containers/chatroom/LeaveChannelModal.vue */
 "You will no longer be able to send or see messages in this channel." = "Vous ne pourrez plus envoyer ni recevoir des messages dans ce salon.";
 
-/* views/containers/chatroom/MessageActions.vue */
-"Add emoticons" = "Ajouter des émoticônes";
-
 /* views/containers/chatroom/MessageActions.vue */
 "More options" = "Autres options";
 
@@ -3084,6 +3087,9 @@
 /* Not currently used */
 "According to your voting rules, {strong_}{value} out of {total} members{_strong} will have to agree with this." = "Selon vos règles de vote, {strong_}{value} membres sur {total}{_strong} devront approuver ceci.";
 
+/* Not currently used */
+"Add emoticons" = "Ajouter des émoticônes";
+
 /* Not currently used */
 "Add {span_} to channel{_span}" = "Ajouter {span_} au salon{_span}";