Merge pull request #281 from julianpoy/fix-pepperplate-import-fcm-tok…

…en-association Fix fcmtoken relationship in pepperplate import
julianpoy · Jul 2, 2019 · 426abf2 · 426abf2
2 parents a9d52ce + 87051d7
commit 426abf2
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 2 deletions.
diff --git a/Backend/app.js b/Backend/app.js
@@ -22,7 +22,7 @@ var devMode = appConfig.environment === 'dev';
 
 Raven.config(appConfig.sentry.dsn, {
   environment: appConfig.environment,
-  release: '1.8.1'
+  release: '1.8.2'
 }).install();
 
 // Routes

diff --git a/Backend/routes/index.js b/Backend/routes/index.js
@@ -163,6 +163,7 @@ router.get(
     include: [
       {
         model: FCMToken,
+        as: 'fcmTokens',
         attributes: ['id', 'token']
       }
     ]

diff --git a/Frontend/src/index.html b/Frontend/src/index.html
@@ -111,7 +111,7 @@
   </script>
 
   <script>
-    window.version = '1.8.1';
+    window.version = '1.8.2';
   </script>
 
   <link href="build/main.css" rel="stylesheet" async>

diff --git a/Frontend/src/pages/info-components/release-notes/release-notes.html b/Frontend/src/pages/info-components/release-notes/release-notes.html
@@ -20,6 +20,11 @@
 
   <br />
 
+  <b>v1.8.2</b><br />
+  - Fixed an issue where pepperplate import would fail even with correct credentials<br />
+
+  <br />
+
   <b>v1.8.1</b><br />
   - Message threads now appear with newest on top<br />