From 88d22f985e9d250e5413d9c55d8c35c545add16e Mon Sep 17 00:00:00 2001
From: blavenie <benoit.lavenier@e-is.pro>
Date: Tue, 19 Apr 2016 08:46:08 +0200
Subject: [PATCH] Merge remote-tracking branch 'origin/with-ES-store'
Conflicts:
bower.json
www/css/style.css
www/i18n/locale-en.json
www/index.html
www/js/app.js
www/js/controllers/currency-controllers.js
www/js/controllers/home-controllers.js
www/js/controllers/wallet-controllers.js
www/js/services/crypto-services.js
www/js/services/utils-services.js
www/js/services/wallet-services.js
www/templates/account/new_account.html
www/templates/account/view_transfer.html
www/templates/account/view_wallet.html
www/templates/currency/select_currency.html
www/templates/currency/tabs/view_parameters.html
www/templates/currency/view_peer.html
www/templates/explore/explore_currency.html
www/templates/explore/explore_tabs.html
www/templates/home.html
www/templates/login.html
www/templates/menu.html
www/templates/wot/lookup.html
www/templates/wot/modal_lookup.html
---
www/i18n/locale-fr-FR.json | 71 ---------------------------
www/js/config.js | 3 +-
www/js/controllers.js | 4 +-
www/js/controllers/app-controllers.js | 25 ----------
www/js/services.js | 4 +-
5 files changed, 3 insertions(+), 104 deletions(-)
diff --git a/www/i18n/locale-fr-FR.json b/www/i18n/locale-fr-FR.json
index 4a3dd19d9..dd9fda620 100644
--- a/www/i18n/locale-fr-FR.json
+++ b/www/i18n/locale-fr-FR.json
@@ -129,77 +129,6 @@
"TITLE": "Paiement"
}
},
- "MARKET": {
- "COMMON": {
- "CATEGORY": "Catégorie",
- "CATEGORIES": "Catégories",
- "ISSUER": "Soumis par",
- "PRICE": "Prix",
- "BTN_BUY": "Acheter"
- },
- "SEARCH": {
- "TITLE": "Annonces",
- "SEARCH_HELP": "Recherche (voiture, livre...)",
- "BTN_ADD": "Nouveau",
- "BTN_OPTIONS": "Recherche avancée",
- "BTN_AROUND_ME": "Autour de moi",
- "LOCATION": "Localisation",
- "LOCATION_HELP": "Ville"
- },
- "VIEW": {
- "TITLE": "Annonce"
- },
- "EDIT": {
- "TITLE": "Edition",
- "BTN_ADD_PICTURES": "Ajouter des photos",
- "RECORD_TITLE": "Titre",
- "RECORD_TITLE_HELP": "Titre",
- "RECORD_DESCRIPTION": "Description",
- "RECORD_DESCRIPTION_HELP": "Description",
- "RECORD_PRICE": "Prix",
- "RECORD_PRICE_HELP": "Prix (optionnel)",
- "RECORD_LOCATION": "Ville",
- "RECORD_LOCATION_HELP": "Adresse, Ville"
- }
- },
- "REGISTRY": {
- "COMMON": {
- "CATEGORY": "Catégorie",
- "CATEGORIES": "Catégories",
- "ISSUER": "Soumis par"
- },
- "SEARCH": {
- "TITLE": "Annuaire",
- "SEARCH_HELP": "Recherche (nom, pseudo, clé publique...)",
- "BTN_ADD": "Nouveau",
- "BTN_OPTIONS": "Recherche avancée",
- "LOCATION": "Localisation",
- "LOCATION_HELP": "Ville"
- },
- "VIEW": {
- "TITLE": ""
- },
- "NEW": {
- "TITLE": "Nouveau",
- "SELECT_TYPE": "Type d'ajout :",
- "TYPE_PARTICULAR": "Particulier",
- "TYPE_COMPANY": "Entreprise, organisme ou institution"
- },
- "EDIT": {
- "TITLE": "Edition",
- "BTN_ADD_PICTURES": "Ajouter des photos",
- "RECORD_TITLE": "Nom",
- "RECORD_TITLE_HELP": "Nom",
- "RECORD_DESCRIPTION": "À propos de moi",
- "RECORD_DESCRIPTION_HELP": "À propos de moi",
- "RECORD_PRICE": "Prix",
- "RECORD_PRICE_HELP": "Prix (optionnel)",
- "RECORD_LOCATION": "Localisation",
- "RECORD_LOCATION_HELP": "Localisation (adresse, ville)",
- "RECORD_SOCIAL_NETWORKS": "Réseaux sociaux",
- "RECORD_PUBKEY": "Clé publique"
- }
- },
"ERROR": {
"POPUP_TITLE": "Erreur",
"UNKNOWN_ERROR": "Erreur inconnue",
diff --git a/www/js/config.js b/www/js/config.js
index 833a34d7b..785c6ff5a 100644
--- a/www/js/config.js
+++ b/www/js/config.js
@@ -10,9 +10,8 @@ angular.module("cesium.config", [])
.constant("APP_CONFIG", {
"UCOIN_NODE": "twiced.fr:9330",
- "UCOIN_NODE_ES": "es.ucoin.fr",
"VERSION": "0.0.1",
"BUILD_DATE": "2016-04-16T16:07:33.159Z"
})
-;
\ No newline at end of file
+;
diff --git a/www/js/controllers.js b/www/js/controllers.js
index 556042733..c2bed9b55 100644
--- a/www/js/controllers.js
+++ b/www/js/controllers.js
@@ -6,9 +6,7 @@ angular.module('cesium.controllers', [
'cesium.currency.controllers',
'cesium.wot.controllers',
'cesium.transfer.controllers',
- 'cesium.settings.controllers',
- 'cesium.market.controllers',
- 'cesium.registry.controllers'
+ 'cesium.settings.controllers'
])
.config(function($httpProvider) {
diff --git a/www/js/controllers/app-controllers.js b/www/js/controllers/app-controllers.js
index 8a0155c19..8b50ddb3e 100644
--- a/www/js/controllers/app-controllers.js
+++ b/www/js/controllers/app-controllers.js
@@ -27,19 +27,6 @@ angular.module('cesium.app.controllers', ['cesium.services'])
.controller('AppCtrl', AppController)
- //.controller('LoginCtrl', LoginController)
-
-// .factory('AppModals', ['ModalService', function(ModalService){
-// function showLogin(walletData){
-// return ModalService.show('templates/login.html', 'LoginCtrl', walletData);
-// }
-//
-// // all app modals here
-// return {
-// showLogin: showLogin
-// };
-//
-// }])
;
function LoginModalController($scope, $ionicModal, Wallet, CryptoUtils, UIUtils, $q, $state, $timeout, $ionicSideMenuDelegate, $ionicHistory) {
@@ -201,23 +188,11 @@ function AppController($scope, $ionicModal, $state, $ionicSideMenuDelegate, UIUt
$scope.hasHeaderFabLeft = false;
$scope.hasHeaderFabRight = false;
$scope.system = System;
- $scope.options = {
- market: {
- enable: !!Market
- },
- registry: {
- enable: !!Registry
- }
- };
LoginModalController.call(this, $scope, $ionicModal, Wallet, CryptoUtils, UIUtils, $q, $state, $timeout, $ionicSideMenuDelegate, $ionicHistory);
TransferModalController.call(this, $scope, $ionicModal, $state, BMA, Wallet, UIUtils, $timeout, System);
- ionic.Platform.ready(function() {
- //System.init(navigator);
- });
-
////////////////////////////////////////
// Load currencies
////////////////////////////////////////
diff --git a/www/js/services.js b/www/js/services.js
index 650bb8320..4723b2c85 100644
--- a/www/js/services.js
+++ b/www/js/services.js
@@ -3,8 +3,6 @@ angular.module('cesium.services', [
'cesium.bma.services',
'cesium.crypto.services',
'cesium.utils.services',
- 'cesium.wallet.services',
- 'cesium.market.services',
- 'cesium.registry.services'
+ 'cesium.wallet.services'
])
;
--
GitLab