Merge pull request #235 from crossroads/master

#Feb2019Release1
crossroads · Feb 22, 2019 · e9014b3 · e9014b3
2 parents 03c3e64 + b08c96d
commit e9014b3
Show file tree

Hide file tree

Showing 14 changed files with 1 addition and 106 deletions.
diff --git a/.jshintrc b/.jshintrc
@@ -6,7 +6,6 @@
     "moment" : true,
     "airbrakeJs": true,
     "io": true,
-    "UserVoice": true,
     "braintree": true
   },
   "browser" : true,

diff --git a/app/components/user-voice.js b/app/components/user-voice.js
diff --git a/app/controllers/item/messages.js b/app/controllers/item/messages.js
@@ -47,7 +47,7 @@ export default MessagesBaseController.extend({
         return;
       }
 
-      this.get("messageBox").confirm(this.get("i18n").t("delete_confirm"), () => {
+      this.get("messageBox").custom(this.get("i18n").t("delete_confirm"), this.get("i18n").t("not_now"), null, this.get("i18n").t("item.cancel"), () => {
         this.set("cancelByDonor", true);
         var loadingView = getOwner(controller).lookup('component:loading').append();
 

diff --git a/app/locales/en/translations.coffee b/app/locales/en/translations.coffee
@@ -10,7 +10,6 @@ I18nTranslationsEn =
     "menu":
       "support_gc": "Support GoodCity!"
       "faq": "Frequently Asked Questions"
-      "feedback": "Feedback & Support"
       "rate": "Rate this app"
 
     "application":

diff --git a/app/locales/zh-tw/translations.coffee b/app/locales/zh-tw/translations.coffee
@@ -10,7 +10,6 @@ I18nTranslationsZhTw =
     "menu":
       "support_gc": "支持好人好市！"
       "faq": "常見問題"
-      "feedback": "回饋與支援"
       "rate": "在iTunes上評分"
 
     "application":

diff --git a/app/router.js b/app/router.js
@@ -10,7 +10,6 @@ Router.map(function() {
   this.route('tour');
   this.route('register');
   this.route('faq');
-  this.route('feedback');
   this.route('support');
 
   this.route('offers', function () {

diff --git a/app/routes/feedback.js b/app/routes/feedback.js
diff --git a/app/styles/app.scss b/app/styles/app.scss
@@ -5,7 +5,6 @@
 
 /* template specific */
 @import "templates/tour";
-@import "templates/uservoice";
 @import "templates/components/braintree_form";
 @import "templates/support";
 @import "templates/loading_image";

diff --git a/app/styles/templates/_uservoice.scss b/app/styles/templates/_uservoice.scss
diff --git a/app/templates/app_menu_list.hbs b/app/templates/app_menu_list.hbs
@@ -18,9 +18,6 @@
 
       <li>{{#link-to 'faq' (query-params questionAnchor=null)}}{{t "menu.faq"}}{{/link-to}}</li>
 
-      {{#unless (js-and (is-production) cordova.iOSDevice)}}
-        <li>{{#link-to 'feedback'}}{{t "menu.feedback"}}{{/link-to}}</li>
-      {{/unless}}
 
       {{#if isMobileApp}}
         <li>

diff --git a/app/templates/components/user-voice.hbs b/app/templates/components/user-voice.hbs
diff --git a/app/templates/feedback.hbs b/app/templates/feedback.hbs
diff --git a/ember-cli-build.js b/ember-cli-build.js
@@ -65,7 +65,5 @@ module.exports = function(defaults) {
     destDir: '/img'
   });
 
-  app.import('vendor/uservoice/uservoice.js');
-
   return app.toTree();
 };
diff --git a/vendor/uservoice/uservoice.js b/vendor/uservoice/uservoice.js