From fa15bf1e8f351382253d82ed145c1deddbeaa131 Mon Sep 17 00:00:00 2001
From: Benoit Lavenierblavenie <benoit.lavenier@e-is.pro>
Date: Wed, 24 Jul 2019 22:33:51 +0200
Subject: [PATCH] [fix] Minor code fix
---
.gitignore | 1 +
release.sh | 4 ++--
www/js/services/bma-services.js | 6 +++---
3 files changed, 6 insertions(+), 5 deletions(-)
diff --git a/.gitignore b/.gitignore
index c491a553..1cb21fc6 100644
--- a/.gitignore
+++ b/.gitignore
@@ -8,6 +8,7 @@
/platforms/android/
/platforms/desktop/
+/platforms/ios/
/resources/android/build/local.properties
/resources/android/build/Cesium.keystore
/resources/android/build/release-signing.properties
diff --git a/release.sh b/release.sh
index ea7b2b2f..9a650c7e 100755
--- a/release.sh
+++ b/release.sh
@@ -149,9 +149,9 @@ if [[ $2 =~ ^[0-9]+.[0-9]+.[0-9]+((a|b)[0-9]+)?$ && $3 =~ ^[0-9]+$ ]]; then
echo "- Building desktop artifacts..."
echo "----------------------------------"
- #FIXME: ceci empêche d'etre sur le master/origin de cesium-desktop
- #git submodule update --init
+ git submodule init
git submodule sync
+ git submodule update --remote --merge
if [[ -d "$DIRNAME/platforms/desktop" ]]; then
cd platforms/desktop
diff --git a/www/js/services/bma-services.js b/www/js/services/bma-services.js
index 574c2501..76dd2e38 100644
--- a/www/js/services/bma-services.js
+++ b/www/js/services/bma-services.js
@@ -28,8 +28,8 @@ angular.module('cesium.bma.services', ['ngApi', 'cesium.http.services', 'cesium.
WS2PTOR: 'WS2PTOR'
},
regexp = {
- USER_ID: "[A-Za-z0-9_-]+",
- CURRENCY: "[A-Za-z0-9_-]+",
+ USER_ID: "[0-9a-zA-Z-_]+",
+ CURRENCY: "[0-9a-zA-Z-_]+",
PUBKEY: pubkey,
PUBKEY_WITH_CHECKSUM: "(" + pubkey +"):([123456789ABCDEFGHJKLMNPQRSTUVWXYZabcdefghijkmnopqrstuvwxyz]{3})",
COMMENT: "[ a-zA-Z0-9-_:/;*\\[\\]()?!^\\+=@&~#{}|\\\\<>%.]*",
@@ -37,7 +37,7 @@ angular.module('cesium.bma.services', ['ngApi', 'cesium.http.services', 'cesium.
// duniter://[uid]:[pubkey]@[host]:[port]
URI_WITH_AT: "duniter://(?:([A-Za-z0-9_-]+):)?("+pubkey+"@([a-zA-Z0-9-.]+.[ a-zA-Z0-9-_:/;*?!^\\+=@&~#|<>%.]+)",
URI_WITH_PATH: "duniter://([a-zA-Z0-9-.]+.[a-zA-Z0-9-_:.]+)/("+pubkey+")(?:/([A-Za-z0-9_-]+))?",
- BMA_ENDPOINT: "BASIC_MERKLED_API" + REGEX_ENDPOINT_PARAMS,
+ BMA_ENDPOINT: api.BMA + REGEX_ENDPOINT_PARAMS,
BMAS_ENDPOINT: api.BMAS + REGEX_ENDPOINT_PARAMS,
WS2P_ENDPOINT: api.WS2P + " ([a-f0-9]{8})"+ REGEX_ENDPOINT_PARAMS,
BMATOR_ENDPOINT: api.BMATOR + " ([a-z0-9-_.]*|[0-9.]+|[0-9a-f:]+.onion)(?: ([0-9]+))?",
--
GitLab