diff --git a/config.xml b/config.xml
index 8bbb94d789c9640c6cf4f6de9014de8d2604cfe4..8f1cacd27732fbadc794fdd0be7fd5af1235ba64 100644
--- a/config.xml
+++ b/config.xml
@@ -132,15 +132,6 @@
<false />
</config-file>
</platform>
- <platform name="osx">
- <icon height="16" src="resources/osx/icon-16.png" width="16" />
- <icon height="32" src="resources/osx/icon-32.png" width="32" />
- <icon height="64" src="resources/osx/icon-64.png" width="64" />
- <icon height="128" src="resources/osx/icon-128.png" width="128" />
- <icon height="256" src="resources/osx/icon-256.png" width="256" />
- <icon height="512" src="resources/osx/icon-512.png" width="512" />
- <icon height="1024" src="resources/osx/icon-1024.png" width="1024" />
- </platform>
<plugin name="cordova-plugin-camera" spec="^4.1.0">
<variable name="CAMERA_USAGE_DESCRIPTION" value="Add picture to the user profile" />
<variable name="PHOTOLIBRARY_USAGE_DESCRIPTION" value="Take a picture for the user profile" />
@@ -169,6 +160,4 @@
</plugin>
<plugin name="ionic-plugin-keyboard" spec="^2.2.1" />
<plugin name="cordova-plugin-androidx" spec="^1.0.2" />
- <engine name="ios" spec="^6.1.0" />
- <engine name="osx" spec="^6.0.0" />
</widget>
diff --git a/doc/fr/.presentation-2016-06-03.odp b/doc/fr/.presentation-2016-06-03.odp
new file mode 100644
index 0000000000000000000000000000000000000000..d3d2febddd4ae328d7308f23dad3806b724b5692
Binary files /dev/null and b/doc/fr/.presentation-2016-06-03.odp differ
diff --git a/doc/fr/presentation-2016-06-03.odp b/doc/fr/presentation-2016-06-03.odp
deleted file mode 100644
index 7da7aff702b5314487fcf96c7ba54b1cd462e24f..0000000000000000000000000000000000000000
Binary files a/doc/fr/presentation-2016-06-03.odp and /dev/null differ
diff --git a/install.sh b/install.sh
index 1d5039e51da674c3030acc364c46d44c5f47ceec..960563ee9bcd9d72037a0d594d0810cf14e296c0 100755
--- a/install.sh
+++ b/install.sh
@@ -67,8 +67,8 @@ install_from_github() {
do_install() {
- if ! is_installed "curl"; then
- echo "=> curl is not available. You will likely need to install 'curl' package."
+ if [! is_installed "curl"] | [! is_installed "wget"]; then
+ echo "=> curl is not available. You will likely need to install 'curl' or 'wget' package."
exit 1
fi
if ! is_installed "unzip"; then
diff --git a/package.json b/package.json
index 5e0499386d56c132753d85fec2378663c05c5d9c..7cb527ff0f8d3c6e13a864b19a750c50175cf740 100644
--- a/package.json
+++ b/package.json
@@ -95,8 +95,7 @@
"cordova": "^10.0.0",
"cordova-android": "^9.0.0",
"cordova-clipboard": "^1.3.0",
- "cordova-ios": "^6.1.1",
- "cordova-osx": "^6.0.0",
+ "cordova-ios": "^6.2.0",
"cordova-plugin-androidx": "^3.0.0",
"cordova-plugin-androidx-adapter": "^1.1.3",
"cordova-plugin-camera": "^5.0.1",
@@ -214,9 +213,8 @@
"cordova-plugin-minisodium": {}
},
"platforms": [
- "ios",
- "osx",
- "android"
+ "android",
+ "ios"
]
},
"engines": {
diff --git a/www/js/config.js b/www/js/config.js
index 94d0138706f02b19349e6fe82219f5adef913552..0027636ef2017dcd29ec16061c4429d103dbd6b8 100644
--- a/www/js/config.js
+++ b/www/js/config.js
@@ -120,7 +120,7 @@ angular.module("cesium.config", [])
}
},
"version": "1.6.12",
- "build": "2021-03-01T17:45:19.094Z",
+ "build": "2021-03-03T20:44:36.248Z",
"newIssueUrl": "https://git.duniter.org/clients/cesium-grp/cesium/issues/new"
})
diff --git a/yarn.lock b/yarn.lock
index eaaa61e89de3ea8b4f95a57aeb003923e6139e41..17097a320af00a8e242ce6ac0943ad3b1c2e0ae5 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -2571,7 +2571,7 @@ cordova-fetch@^3.0.0:
semver "^7.1.3"
which "^2.0.2"
-cordova-ios@^6.1.1:
+cordova-ios@^6.2.0:
version "6.2.0"
resolved "https://registry.npmjs.org/cordova-ios/-/cordova-ios-6.2.0.tgz#3aaec7376b9a202cdcaf28faab6a79823b04c519"
integrity sha512-sLjZg2QBI1SpQVwfe0MSn89YNVkBGLW9Q1vcFJBsqKBrhvoEOJ5Ytq0gwqdhgTOGzlwJUfxC6OHM3jcsRjtYrw==
@@ -2609,20 +2609,6 @@ cordova-lib@^10.0.0:
stringify-package "^1.0.1"
write-file-atomic "^3.0.3"
-cordova-osx@^6.0.0:
- version "6.0.0"
- resolved "https://nexus.e-is.pro/nexus/content/repositories/npmjs/cordova-osx/-/cordova-osx-6.0.0.tgz#28aea6c9d3c86ec339a1dc1b4996aae4282cf0fc"
- integrity sha512-WQTJSh0E2HymwIQF2mTGXYE8i8uG5RaRjE2CFJt/VXTn1xs/nnjcSsALsPLh7en2kv/N6YKe5bBesYYNULrWdQ==
- dependencies:
- cordova-common "^4.0.0"
- nopt "^4.0.1"
- plist "^3.0.1"
- q "^1.4.1"
- shelljs "^0.5.3"
- underscore "^1.9.1"
- unorm "^1.4.1"
- xcode "^3.0.1"
-
cordova-plugin-androidx-adapter@^1.1.3:
version "1.1.3"
resolved "https://registry.npmjs.org/cordova-plugin-androidx-adapter/-/cordova-plugin-androidx-adapter-1.1.3.tgz#aa7e673ee342de208a6a34a50986ee2ac4b5ba60"
@@ -9154,7 +9140,7 @@ pupa@^2.0.1:
dependencies:
escape-goat "^2.0.0"
-q@^1.1.2, q@^1.4.1, q@^1.5.1:
+q@^1.1.2, q@^1.5.1:
version "1.5.1"
resolved "https://nexus.e-is.pro/nexus/content/repositories/npmjs/q/-/q-1.5.1.tgz#7e32f75b41381291d04611f1bf14109ac00651d7"
integrity sha1-fjL3W0E4EpHQRhHxvxQQmsAGUdc=
@@ -10032,11 +10018,6 @@ shelljs@^0.2.6:
resolved "https://nexus.e-is.pro/nexus/content/repositories/npmjs/shelljs/-/shelljs-0.2.6.tgz#90492d72ffcc8159976baba62fb0f6884f0c3378"
integrity sha1-kEktcv/MgVmXa6umL7D2iE8MM3g=
-shelljs@^0.5.3:
- version "0.5.3"
- resolved "https://nexus.e-is.pro/nexus/content/repositories/npmjs/shelljs/-/shelljs-0.5.3.tgz#c54982b996c76ef0c1e6b59fbdc5825f5b713113"
- integrity sha1-xUmCuZbHbvDB5rWfvcWCX1txMRM=
-
shelljs@^0.8.3:
version "0.8.4"
resolved "https://nexus.e-is.pro/nexus/content/repositories/npmjs/shelljs/-/shelljs-0.8.4.tgz#de7684feeb767f8716b326078a8a00875890e3c2"
@@ -11293,7 +11274,7 @@ underscore@1.2.1:
resolved "https://nexus.e-is.pro/nexus/content/repositories/npmjs/underscore/-/underscore-1.2.1.tgz#fc5c6b0765673d92a2d4ac8b4dc0aa88702e2bd4"
integrity sha1-/FxrB2VnPZKi1KyLTcCqiHAuK9Q=
-underscore@^1.9.1, underscore@^1.9.2:
+underscore@^1.9.2:
version "1.10.2"
resolved "https://nexus.e-is.pro/nexus/content/repositories/npmjs/underscore/-/underscore-1.10.2.tgz#73d6aa3668f3188e4adb0f1943bd12cfd7efaaaf"
integrity sha512-N4P+Q/BuyuEKFJ43B9gYuOj4TQUHXX+j2FqguVOpjkssLUUrnJofCcBccJSCoeturDoZU6GorDTHSvUDlSQbTg==
@@ -11372,7 +11353,7 @@ universalify@^2.0.0:
resolved "https://registry.npmjs.org/universalify/-/universalify-2.0.0.tgz#75a4984efedc4b08975c5aeb73f530d02df25717"
integrity sha512-hAZsKq7Yy11Zu1DE0OzWjw7nnLZmJZYTDZZyEFHZdUhV8FkH5MCfoU1XMaxXovpyW5nq5scPqq0ZDP9Zyl04oQ==
-unorm@^1.4.1, unorm@^1.6.0:
+unorm@^1.6.0:
version "1.6.0"
resolved "https://nexus.e-is.pro/nexus/content/repositories/npmjs/unorm/-/unorm-1.6.0.tgz#029b289661fba714f1a9af439eb51d9b16c205af"
integrity sha512-b2/KCUlYZUeA7JFUuRJZPUtr4gZvBh7tavtv4fvk4+KV9pfGiR6CQAQAWl49ZpR3ts2dk4FYkP7EIgDJoiOLDA==