Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
Cesium
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Container Registry
Model registry
Operate
Environments
Monitor
Incidents
Service Desk
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
bpresles
Cesium
Commits
fa15bf1e
Commit
fa15bf1e
authored
5 years ago
by
Benoit Lavenier
Browse files
Options
Downloads
Patches
Plain Diff
[fix] Minor code fix
parent
031b47e9
No related branches found
No related tags found
No related merge requests found
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
.gitignore
+1
-0
1 addition, 0 deletions
.gitignore
release.sh
+2
-2
2 additions, 2 deletions
release.sh
www/js/services/bma-services.js
+3
-3
3 additions, 3 deletions
www/js/services/bma-services.js
with
6 additions
and
5 deletions
.gitignore
+
1
−
0
View file @
fa15bf1e
...
@@ -8,6 +8,7 @@
...
@@ -8,6 +8,7 @@
/platforms/android/
/platforms/android/
/platforms/desktop/
/platforms/desktop/
/platforms/ios/
/resources/android/build/local.properties
/resources/android/build/local.properties
/resources/android/build/Cesium.keystore
/resources/android/build/Cesium.keystore
/resources/android/build/release-signing.properties
/resources/android/build/release-signing.properties
...
...
This diff is collapsed.
Click to expand it.
release.sh
+
2
−
2
View file @
fa15bf1e
...
@@ -149,9 +149,9 @@ if [[ $2 =~ ^[0-9]+.[0-9]+.[0-9]+((a|b)[0-9]+)?$ && $3 =~ ^[0-9]+$ ]]; then
...
@@ -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
"- Building desktop artifacts..."
echo
"----------------------------------"
echo
"----------------------------------"
#FIXME: ceci empêche d'etre sur le master/origin de cesium-desktop
git submodule init
#git submodule update --init
git submodule
sync
git submodule
sync
git submodule update
--remote
--merge
if
[[
-d
"
$DIRNAME
/platforms/desktop"
]]
;
then
if
[[
-d
"
$DIRNAME
/platforms/desktop"
]]
;
then
cd
platforms/desktop
cd
platforms/desktop
...
...
This diff is collapsed.
Click to expand it.
www/js/services/bma-services.js
+
3
−
3
View file @
fa15bf1e
...
@@ -28,8 +28,8 @@ angular.module('cesium.bma.services', ['ngApi', 'cesium.http.services', 'cesium.
...
@@ -28,8 +28,8 @@ angular.module('cesium.bma.services', ['ngApi', 'cesium.http.services', 'cesium.
WS2PTOR
:
'
WS2PTOR
'
WS2PTOR
:
'
WS2PTOR
'
},
},
regexp
=
{
regexp
=
{
USER_ID
:
"
[
A-Za-z0-9_-
]+
"
,
USER_ID
:
"
[
0-9a-zA-Z-_
]+
"
,
CURRENCY
:
"
[
A-Za-z0-9_-
]+
"
,
CURRENCY
:
"
[
0-9a-zA-Z-_
]+
"
,
PUBKEY
:
pubkey
,
PUBKEY
:
pubkey
,
PUBKEY_WITH_CHECKSUM
:
"
(
"
+
pubkey
+
"
):([123456789ABCDEFGHJKLMNPQRSTUVWXYZabcdefghijkmnopqrstuvwxyz]{3})
"
,
PUBKEY_WITH_CHECKSUM
:
"
(
"
+
pubkey
+
"
):([123456789ABCDEFGHJKLMNPQRSTUVWXYZabcdefghijkmnopqrstuvwxyz]{3})
"
,
COMMENT
:
"
[ a-zA-Z0-9-_:/;*
\\
[
\\
]()?!^
\\
+=@&~#{}|
\\\\
<>%.]*
"
,
COMMENT
:
"
[ a-zA-Z0-9-_:/;*
\\
[
\\
]()?!^
\\
+=@&~#{}|
\\\\
<>%.]*
"
,
...
@@ -37,7 +37,7 @@ angular.module('cesium.bma.services', ['ngApi', 'cesium.http.services', 'cesium.
...
@@ -37,7 +37,7 @@ angular.module('cesium.bma.services', ['ngApi', 'cesium.http.services', 'cesium.
// duniter://[uid]:[pubkey]@[host]:[port]
// duniter://[uid]:[pubkey]@[host]:[port]
URI_WITH_AT
:
"
duniter://(?:([A-Za-z0-9_-]+):)?(
"
+
pubkey
+
"
@([a-zA-Z0-9-.]+.[ a-zA-Z0-9-_:/;*?!^
\\
+=@&~#|<>%.]+)
"
,
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_-]+))?
"
,
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
,
BMAS_ENDPOINT
:
api
.
BMAS
+
REGEX_ENDPOINT_PARAMS
,
WS2P_ENDPOINT
:
api
.
WS2P
+
"
([a-f0-9]{8})
"
+
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]+))?
"
,
BMATOR_ENDPOINT
:
api
.
BMATOR
+
"
([a-z0-9-_.]*|[0-9.]+|[0-9a-f:]+.onion)(?: ([0-9]+))?
"
,
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment