Merge branch 'v1.1.4.0' into v1.1.5.0
# Conflicts: # config.xml # package.json # src/app/app-routing.module.ts # src/app/app.component.ts # src/app/app.module.ts # src/app/app.scss # src/app/pages/menu/menu.page.html # src/app/pages/menu/menu.page.ts # src/app/pages/offres/offres-carte/offres-carte.page.ts
Showing
| { | { | ||
| "name": "atapp", | "name": "atapp", | ||
| "version": "1.0.0", | "version": "1.1.5.0", | ||
| "description": "", | "author": "Allo Testeurs", | ||
| "main": "index.js", | "homepage": "http://www.allo-testeurs.com/", | ||
| "scripts": { | |||
| "ng": "ng", | |||
| "start": "ng serve", | |||
| "build": "ng build", | |||
| "test": "ng test", | |||
| "lint": "ng lint", | |||
| "e2e": "ng e2e" | |||
| }, | |||
| "private": true, | |||
| "dependencies": { | "dependencies": { | ||
| "cordova-android": "^8.0.0", | "@angular/common": "^7.2.2", | ||
| "@angular/core": "^7.2.2", | |||
| "@angular/fire": "^5.2.1", | |||
| "@angular/forms": "^7.2.2", | |||
| "@angular/http": "^7.2.2", | |||
| "@angular/platform-browser": "^7.2.2", | |||
| "@angular/platform-browser-dynamic": "^7.2.2", | |||
| "@angular/router": "^7.2.2", | |||
| "@ionic-native/app-version": "^5.11.0", | |||
| "@ionic-native/background-geolocation": "^5.8.0", | |||
| "@ionic-native/background-mode": "^5.11.0", | |||
| "@ionic-native/core": "^5.0.0", | |||
| "@ionic-native/diagnostic": "^5.8.0", | |||
| "@ionic-native/google-plus": "^5.0.0", | |||
| "@ionic-native/http": "^5.8.0", | |||
| "@ionic-native/local-notifications": "^5.11.0", | |||
| "@ionic-native/location-accuracy": "^5.8.0", | |||
| "@ionic-native/splash-screen": "^5.0.0", | |||
| "@ionic-native/status-bar": "^5.0.0", | |||
| "@ionic/angular": "^4.1.0", | |||
| "@ionic/storage": "^2.2.0", | |||
| "cordova-android": "^8.1.0", | |||
| "cordova-plugin-advanced-http": "^2.1.1", | "cordova-plugin-advanced-http": "^2.1.1", | ||
| "cordova-plugin-app-version": "^0.1.9", | "cordova-plugin-app-version": "^0.1.9", | ||
| "cordova-plugin-background-mode": "^0.7.2", | "cordova-plugin-background-mode": "git+https://github.com/sercatven/cordova-plugin-background-mode.git", | ||
| "cordova-plugin-camera": "^4.1.0", | |||
| "cordova-plugin-file": "^6.0.1", | |||
| "cordova-plugin-badge": "^0.8.8", | "cordova-plugin-badge": "^0.8.8", | ||
| "cordova-plugin-filepath": "^1.5.6", | "cordova-plugin-file": "^6.0.1", | ||
| "cordova-plugin-googleplus": "^8.0.0", | "cordova-plugin-googleplus": "^8.0.0", | ||
| "cordova-plugin-local-notification": "^0.9.0-beta.2", | "cordova-plugin-local-notification": "^0.9.0-beta.2", | ||
| "cordova-plugin-play-games-services": "^1.1.2", | "cordova-plugin-play-games-services": "^1.1.2", | ||
| "cordova-plugin-qrscanner": "^3.0.1", | |||
| "cordova-plugin-request-location-accuracy": "^2.3.0", | "cordova-plugin-request-location-accuracy": "^2.3.0", | ||
| "cordova-sqlite-storage": "^3.2.0", | "cordova-sqlite-storage": "^3.2.0", | ||
| "cordova.plugins.diagnostic": "^5.0.0", | "cordova.plugins.diagnostic": "^5.0.0", | ||
| "core-js": "^2.5.4", | |||
| "firebase": "^6.6.1", | |||
| "ionic-image-loader": "^6.3.3", | "ionic-image-loader": "^6.3.3", | ||
| "leaflet.markercluster": "^1.4.1", | |||
| "leaflet": "^1.5.1", | "leaflet": "^1.5.1", | ||
| "path": "^0.12.7" | "leaflet.markercluster": "^1.4.1", | ||
| "path": "^0.12.7", | |||
| "rxjs": "~6.5.1", | |||
| "sweetalert": "^2.1.2", | |||
| "tslib": "^1.9.0", | |||
| "zone.js": "~0.8.29" | |||
| }, | }, | ||
| "devDependencies": {}, | "devDependencies": { | ||
| "scripts": { | "@angular-devkit/architect": "~0.13.8", | ||
| "test": "echo \"Error: no test specified\" && exit 1" | "@angular-devkit/build-angular": "~0.13.8", | ||
| "@angular-devkit/core": "~7.3.8", | |||
| "@angular-devkit/schematics": "~7.3.8", | |||
| "@angular/cli": "~7.3.8", | |||
| "@angular/compiler": "~7.2.2", | |||
| "@angular/compiler-cli": "~7.2.2", | |||
| "@angular/language-service": "~7.2.2", | |||
| "@ionic/angular-toolkit": "~1.5.1", | |||
| "@ionic/lab": "2.0.4", | |||
| "@types/jasmine": "~2.8.8", | |||
| "@types/jasminewd2": "~2.0.3", | |||
| "@types/node": "~12.0.0", | |||
| "codelyzer": "~4.5.0", | |||
| "jasmine-core": "~2.99.1", | |||
| "jasmine-spec-reporter": "~4.2.1", | |||
| "karma": "~4.1.0", | |||
| "karma-chrome-launcher": "~2.2.0", | |||
| "karma-coverage-istanbul-reporter": "~2.0.1", | |||
| "karma-jasmine": "~1.1.2", | |||
| "karma-jasmine-html-reporter": "^0.2.2", | |||
| "protractor": "~5.4.0", | |||
| "ts-node": "~8.3.0", | |||
| "tslint": "~5.17.0", | |||
| "typescript": "~3.1.6", | |||
| "cordova-plugin-whitelist": "1.3.3", | |||
| "cordova-plugin-statusbar": "2.4.2", | |||
| "cordova-plugin-device": "2.0.2", | |||
| "cordova-plugin-splashscreen": "5.0.2", | |||
| "cordova-plugin-ionic-webview": "^4.0.0", | |||
| "cordova-plugin-ionic-keyboard": "^2.0.5" | |||
| }, | }, | ||
| "repository": { | "browser": { | ||
| "type": "git", | "crypto": false, | ||
| "url": "git@versions.feeling-group.com:nabil.sadki/allo-app.git" | "fs": false, | ||
| "module": false | |||
| }, | }, | ||
| "author": "", | "description": "An Ionic project", | ||
| "license": "ISC" | "cordova": { | ||
| } | "plugins": { | ||
| "cordova-sqlite-storage": {}, | |||
| "cordova-plugin-advanced-http": {}, | |||
| "cordova.plugins.diagnostic": { | |||
| "ANDROID_SUPPORT_VERSION": "28.+" | |||
| }, | |||
| "cordova-plugin-request-location-accuracy": {}, | |||
| "cordova-plugin-local-notification": {}, | |||
| "cordova-plugin-whitelist": {}, | |||
| "cordova-plugin-statusbar": {}, | |||
| "cordova-plugin-device": {}, | |||
| "cordova-plugin-splashscreen": {}, | |||
| "cordova-plugin-ionic-webview": {}, | |||
| "cordova-plugin-ionic-keyboard": {}, | |||
| "cordova-plugin-background-mode": {}, | |||
| "cordova-plugin-app-version": {}, | |||
| "cordova-plugin-file": {}, | |||
| "cordova-plugin-googleplus": { | |||
| "PLAY_SERVICES_VERSION": "11.8.0" | |||
| } | |||
| }, | |||
| "platforms": [ | |||
| "android" | |||
| ] | |||
| } | |||
| } | |||
| \ No newline at end of file |
resources/ios/icon/icon-20.png
0 → 100644
905 Bytes
resources/ios/icon/icon-20@2x.png
0 → 100644
2.32 KB
resources/ios/icon/icon-20@3x.png
0 → 100644
3.75 KB
resources/ios/icon/icon-24@2x.png
0 → 100644
2.87 KB
resources/ios/icon/icon-27.5@2x.png
0 → 100644
3.36 KB
resources/ios/icon/icon-29.png
0 → 100644
1.56 KB
resources/ios/icon/icon-29@2x.png
0 → 100644
3.58 KB
resources/ios/icon/icon-29@3x.png
0 → 100644
5.53 KB
resources/ios/icon/icon-44@2x.png
0 → 100644
5.73 KB
resources/ios/icon/icon-86@2x.png
0 → 100644
11.1 KB
resources/ios/icon/icon-98@2x.png
0 → 100644
12.7 KB
resources/ios/splash/Default-2436h.png
0 → 100644
783 KB
1010 KB
src/app/constants.ts
0 → 100644
src/app/modals/login-help/login-help.page.ts
0 → 100644
src/app/pages/compte/favoris/favoris.page.ts
0 → 100644
src/app/services/auth-guard.service.spec.ts
0 → 100644
src/app/services/auth-guard.service.ts
0 → 100644
src/app/services/auth.service.spec.ts
0 → 100644
src/app/services/auth.service.ts
0 → 100644
src/assets/img/icon/favicon.png
0 → 100644
79.2 KB
src/assets/img/soon.png
0 → 100644
25.1 KB