Merge pull request #2259 from uProxy/dborkan-quiver-dist-2

Add Quiver to uProxy dist build!!

Author: dborkan

Gruntfile.coffee

@@ -171,10 +171,13 @@ coreDistFiles = [
   'freedom-social-firebase/facebook-social-provider.js'
   'freedom-social-firebase/google-social-provider.js'
   'freedom-social-firebase/google-auth.js'
+  'freedom-social-quiver/socketio.quiver.json'
+  'freedom-social-quiver/socketio.quiver.js'
   'freedom-port-control/port-control.js'
   'freedom-port-control/port-control.json'
   'freedom-pgp-e2e/end-to-end.compiled.js'
   'freedom-pgp-e2e/googstorage.js'
+  'freedom-pgp-e2e/hex2words.js'
   'freedom-pgp-e2e/e2e.js'
   'freedom-pgp-e2e/pgpapi.json'
 

package.json

@@ -32,7 +32,7 @@
     "freedom-port-control": "^0.9.0",
     "freedom-social-firebase": "^2.0.0",
     "freedom-social-github": "^0.1.3",
-    "freedom-social-quiver": "^0.0.8",
+    "freedom-social-quiver": "^0.1.0",
     "freedom-social-wechat": "^0.1.5",
     "freedomjs-anonymized-metrics": "^0.7.4",
     "fs-extra": "^0.12.0",

src/generic_core/dist_build/freedom-module.json

@@ -7,6 +7,10 @@
     ]
   },
   "dependencies": {
+    "SOCIAL-Quiver": {
+      "url": "../freedom-social-quiver/socketio.quiver.json",
+      "api": "social2"
+    },
     "SOCIAL-GMail": {
       "url": "../freedom-social-firebase/social.firebase-google.json",
       "api": "social2"

src/generic_ui/polymer/faq.html

@@ -134,12 +134,10 @@ <h2 class="i18n" data-i18n="HOW_DO_I_FIND"></h2>
               <p class="i18n" data-i18n="HOW_DO_I_FIND_ANSWER"></p>
             </section>
 
-            <!-- TODO: uncomment once Quiver is launched on webstore
             <section class="faq" id="whatIsUproxyNetwork">
               <h2 class="i18n" data-i18n="WHAT_IS_UPROXY_NETWORK"></h2>
               <p class="i18n" data-i18n="WHAT_IS_UPROXY_NETWORK_ANSWER"></p>
             </section>
-            -->
 
             <section class="faq" id="whatIsGitHub">
               <h2 class="i18n" data-i18n="WHAT_IS_GITHUB"></h2>