Commit fa15bf1e authored by Benoit Lavenier's avatar Benoit Lavenier

[fix] Minor code fix

parent 031b47e9
Pipeline #6185 passed with stages
in 6 minutes and 30 seconds
......@@ -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
......
......@@ -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
......
......@@ -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]+))?",
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment