Skip to content

Commit

Permalink
Merge pull request #239 from crossroads/master
Browse files Browse the repository at this point in the history
#March2019Release1
  • Loading branch information
namrataukirde authored Mar 6, 2019
2 parents e9014b3 + fb005f3 commit 31f3715
Show file tree
Hide file tree
Showing 12 changed files with 170 additions and 62 deletions.
2 changes: 2 additions & 0 deletions config/environment.js
Original file line number Diff line number Diff line change
Expand Up @@ -44,6 +44,8 @@ module.exports = function(environment) {
APP: {
// Cloudinary Keys
NAME: 'app.goodcity',
TITLE: 'GoodCity',
BANNER_IMAGE: '/assets/images/donor.png',
APPLE_APP_ID: '1012253845',
REVIEW_APP_NAME: 'GoodCity',
CLOUD_NAME: 'ddoadcjjl',
Expand Down
Binary file modified cordova/res/android/drawable-hdpi/screen.png
100644 → 100755
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified cordova/res/android/drawable-ldpi/screen.png
100644 → 100755
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified cordova/res/android/drawable-mdpi/screen.png
100644 → 100755
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified cordova/res/android/drawable-xhdpi/screen.png
100644 → 100755
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified cordova/res/android/drawable-xxhdpi/screen.png
100644 → 100755
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified cordova/res/android/drawable-xxxhdpi/screen.png
100644 → 100755
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified cordova/res/screen/ios/Default@2x~universal~anyany.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
1 change: 1 addition & 0 deletions ember-cli-build.js
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@ module.exports = function(defaults) {
},
fingerprint: {
extensions: ['js','css', 'png', 'jpg', 'gif', 'map'],
exclude: ['images/donor.png'],
enabled: webRelease
},
gzip: {
Expand Down
23 changes: 14 additions & 9 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "goodcity",
"version": "0.16.5",
"version": "0.16.6",
"description": "Small description for goodcity goes here",
"license": "MIT",
"author": "",
Expand Down Expand Up @@ -28,6 +28,7 @@
"ember-cli": "2.11.0",
"ember-cli-app-version": "^3.1.0",
"ember-cli-babel": "5.2.4",
"ember-cli-code-coverage": "^0.4.2",
"ember-cli-coffeescript": "^1.16.1",
"ember-cli-content-security-policy": "1.0.0",
"ember-cli-cordova": "git://github.com/poetic/ember-cli-cordova.git",
Expand All @@ -41,7 +42,6 @@
"ember-cli-jshint": "^2.0.1",
"ember-cli-qunit": "^2.0.2",
"ember-cli-release": "^0.2.9",
"ember-rollbar-client": "0.2.2",
"ember-cli-sass": "^7.1.1",
"ember-cli-sri": "^2.1.1",
"ember-cli-uglify": "^2.0.0",
Expand All @@ -50,31 +50,36 @@
"ember-disable-proxy-controllers": "^1.0.1",
"ember-export-application-global": "2.0.0",
"ember-i18n": "5.2.1",
"node-sass": "^4.9.3",
"ember-load-initializers": "^1.0.0",
"ember-rollbar-client": "0.2.2",
"ember-select-2": "^1.3.0",
"ember-try": "~0.2.23",
"ember-welcome-page": "^3.2.0",
"ember-cli-code-coverage": "^0.4.2",
"express": "^4.16.3",
"glob": "^5.0.14",
"loader.js": "4.0.0",
"node-sass": "^4.9.3",
"xml2js": "^0.4.19"
},
"engines": {
"node": ">= 6"
},
"dependencies": {
"azure-api": "git://github.com/crossroads/azure-api.git#master",
"bower": "^1.8.4",
"codeclimate-test-reporter": "^0.5.0",
"phantomjs-prebuilt": "^2.1.14",
"cordova": "^7.1.0",
"cordova-update-config": "^1.0.2",
"azure-api": "git://github.com/crossroads/azure-api.git#master",
"deep-extend": "0.5.1",
"ember-cli-test-loader": "^1.1.0",
"ember-resolver": "^2.0.3",
"extend": "2.0.2",
"hoek": "4.2.1",
"loader.js": "4.0.0",
"lodash": "4.17.11",
"minimatch": "3.0.2",
"phantomjs-prebuilt": "^2.1.14",
"shared-goodcity": "git://github.com/crossroads/shared.goodcity.git#master",
"ember-cli-test-loader": "^1.1.0",
"slick-carousel": "^1.5.8",
"loader.js": "4.0.0"
"slick-carousel": "^1.5.8"
}
}
Binary file added public/assets/images/donor.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading

0 comments on commit 31f3715

Please sign in to comment.