diff --git a/app/config.json b/app/config.json index 821af564c9cb17375852416689f15b0190a755d5..345d84ccfb4bac4ed084c5b2bf419785f4f29502 100644 --- a/app/config.json +++ b/app/config.json @@ -134,7 +134,7 @@ "decimalCount": 2, "httpsMode": false, "helptip": { - "enable": true, + "enable": false, "installDocUrl": "https://github.com/duniter/duniter/blob/master/doc/install-a-node.md" }, "node": { @@ -145,8 +145,9 @@ "es": { "enable": true, "askEnable": false, - "host": "g1.data.duniter.fr", - "port": "443" + "host": "localhost", + "port": "9200", + "wsPort": "9400" }, "graph": { "enable": true diff --git a/bower.json b/bower.json index b0734e769b79b3532a303f274e5890995be5cd90..d6bffcfcc816196d2b7e689410500c9654f97b39 100644 --- a/bower.json +++ b/bower.json @@ -14,6 +14,7 @@ "angular": "1.5.3", "angular-bind-notifier": "^1.1.7", "angular-image-crop": "^2.0.0" + 0.7.2 }, "resolutions": { "angular-sanitize": "1.5.3", diff --git a/gulpfile.js b/gulpfile.js index 236a7146bcf42fffdae72d956d268d557f440fc6..6f08d841149ecc200ae0e2da0e24008ac66e33ca 100644 --- a/gulpfile.js +++ b/gulpfile.js @@ -37,7 +37,6 @@ var sourcemaps = require('gulp-sourcemaps'); var paths = { sass: ['./scss/**/*.scss'], config: ['./app/config.json'], - templates: ['./www/templates/**/*.html'], templatecache: ['./www/templates/**/*.html'], ng_translate: ['./www/i18n/locale-*.json'], ng_annotate: ['./www/js/**/*.js', '!./www/js/vendor/*.js'], diff --git a/www/js/app.js b/www/js/app.js index 98e98942fe54c9783d5b12c7916deca990550f1c..391a8da93802a57854579df40ad74ef70116a650 100644 --- a/www/js/app.js +++ b/www/js/app.js @@ -108,44 +108,44 @@ angular.module('cesium', ['ionic', 'ionic-material', 'ngMessages', 'pascalprecht .filter('formatDate', function($rootScope) { return function(input) { - return input ? moment(parseInt(input)*1000).local().format($rootScope.translations.DATE_PATTERN || 'YYYY-MM-DD HH:mm') : ''; + return input ? moment.unix(parseInt(input)).local().format($rootScope.translations.DATE_PATTERN || 'YYYY-MM-DD HH:mm') : ''; }; }) .filter('formatDateShort', function($rootScope) { return function(input) { - return input ? moment(parseInt(input)*1000).local().format($rootScope.translations.DATE_SHORT_PATTERN || 'YYYY-MM-DD') : ''; + return input ? moment.unix(parseInt(input)).local().format($rootScope.translations.DATE_SHORT_PATTERN || 'YYYY-MM-DD') : ''; }; }) .filter('formatDateMonth', function($rootScope) { return function(input) { - return input ? moment(parseInt(input)*1000).local().format($rootScope.translations.DATE_MONTH_YEAR_PATTERN || 'MMM YY') : ''; + return input ? moment.unix(parseInt(input)).local().format($rootScope.translations.DATE_MONTH_YEAR_PATTERN || 'MMM YY') : ''; }; }) .filter('formatTime', function() { return function(input) { - return input ? moment(parseInt(input)*1000).local().format('HH:mm') : ''; + return input ? moment.unix(parseInt(input)).local().format('HH:mm') : ''; }; }) .filter('formatFromNow', function() { return function(input) { - return input ? moment(parseInt(input)*1000).startOf('minute').fromNow() : ''; + return input ? moment.unix(parseInt(input)).startOf('minute').fromNow() : ''; }; }) .filter('formatDurationTo', function() { return function(input) { - return input ? moment(moment().utc().valueOf() + parseInt(input)*1000).startOf('minute').fromNow() : ''; + return input ? moment.unix(moment().utc().unix() + parseInt(input)).startOf('minute').fromNow() : ''; }; }) .filter('formatDuration', function() { return function(input) { - return input ? moment(0).startOf('minute').from(moment(parseInt(input)*1000), true) : ''; + return input ? moment(0).startOf('minute').from(moment.unix(parseInt(input)), true) : ''; }; }) @@ -162,14 +162,14 @@ angular.module('cesium', ['ionic', 'ionic-material', 'ngMessages', 'pascalprecht .filter('formatPeriod', function() { return function(input) { if (!input) {return null;} - var duration = moment(0).startOf('minute').from(moment(parseInt(input)*1000), true); + var duration = moment(0).startOf('minute').from(moment.unix(parseInt(input)), true); return duration.split(' ').slice(-1)[0]; // keep only last words (e.g. remove "un" "a"...) }; }) .filter('formatFromNowShort', function() { return function(input) { - return input ? moment(parseInt(input)*1000).startOf('minute').fromNow(true) : ''; + return input ? moment.unix(parseInt(input)).startOf('minute').fromNow(true) : ''; }; }) diff --git a/www/js/config.js b/www/js/config.js index 1dd5b5aa83ea50623f697af1af741a1d86bb91ac..7212a8d4fd25ec45f444956603d902b9290f764a 100644 --- a/www/js/config.js +++ b/www/js/config.js @@ -11,19 +11,19 @@ angular.module("cesium.config", []) .constant("csConfig", { "cacheTimeMs": 60000, "fallbackLanguage": "en", - "rememberMe": false, + "rememberMe": true, "showUDHistory": false, "timeout": 10000, "timeWarningExpireMembership": 5184000, "timeWarningExpire": 7776000, - "useLocalStorage": false, + "useLocalStorage": true, "useRelative": false, "initPhase": false, - "expertMode": false, + "expertMode": true, "decimalCount": 2, "httpsMode": false, "helptip": { - "enable": true, + "enable": false, "installDocUrl": "https://github.com/duniter/duniter/blob/master/doc/install-a-node.md" }, "node": { @@ -34,18 +34,19 @@ angular.module("cesium.config", []) "es": { "enable": true, "askEnable": false, - "host": "g1.data.duniter.fr", - "port": "443", - "notifications": { - "txSent": true, - "txReceived": true, - "certSent": true, - "certReceived": true - } + "host": "localhost", + "port": "9200", + "wsPort": "9400" + }, + "graph": { + "enable": true + }, + "neo4j": { + "enable": true } }, "version": "0.11.8", - "build": "2017-03-20T09:13:18.316Z", + "build": "2017-04-26T10:24:52.486Z", "newIssueUrl": "https://github.com/duniter/cesium/issues/new?labels=bug" }) diff --git a/www/js/controllers/network-controllers.js b/www/js/controllers/network-controllers.js index bcb21bc78c118523f025fc7f1b2c2be51a6e15ff..8d8069a66650dcf81bd280d96f21aa446dcdd2fa 100644 --- a/www/js/controllers/network-controllers.js +++ b/www/js/controllers/network-controllers.js @@ -1,7 +1,7 @@ angular.module('cesium.network.controllers', ['cesium.services']) -.config(function($stateProvider, csConfig) { +.config(function($stateProvider) { 'ngInject'; $stateProvider @@ -87,7 +87,6 @@ function NetworkLookupController($scope, $state, $ionicHistory, $ionicPopover, }); }; - //$scope.$on('$ionicView.enter', $scope.enter); $scope.$on('$ionicParentView.enter', $scope.enter); /**