From b43b1184526f798774e7ee703ca4064b8246b215 Mon Sep 17 00:00:00 2001 From: Torsten Grote Date: Thu, 4 Feb 2021 12:01:37 -0300 Subject: fix console blocks formatting for android app translations --- taler-developer-manual.rst | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/taler-developer-manual.rst b/taler-developer-manual.rst index 3b018e6a..8655ae44 100644 --- a/taler-developer-manual.rst +++ b/taler-developer-manual.rst @@ -880,14 +880,20 @@ https://weblate.taler.net/projects/gnu-taler/ To update translations, enter the taler-android git repository and ensure that the weblate remote exists: +.. code-block:: console + $ git config -l | grep weblate If it does not yet exist (empty output), you can add it like this: +.. code-block:: console + $ git remote add weblate https://weblate.taler.net/git/gnu-taler/wallet-android/ Then you can merge in translations commit from the weblate remote: +.. code-block:: console + # ensure you have latest version $ git fetch weblate -- cgit v1.2.3 From 26ecf8cee12510673a6e26398e9e8e3c40c7c897 Mon Sep 17 00:00:00 2001 From: Torsten Grote Date: Thu, 4 Feb 2021 12:26:06 -0300 Subject: Add paragraph about how to release Android apps --- taler-developer-manual.rst | 45 +++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 45 insertions(+) diff --git a/taler-developer-manual.rst b/taler-developer-manual.rst index 8655ae44..a1148474 100644 --- a/taler-developer-manual.rst +++ b/taler-developer-manual.rst @@ -903,6 +903,51 @@ Then you can merge in translations commit from the weblate remote: Afterwards, build the entire project from source and test the UI to ensure that no erroneous translations (missing placeholders) are breaking things. +Release process +--------------- + +After extensive testing, the code making up a new release should get a signed git tag. +The current tag format is: + +* cashier-$VERSION +* pos-$VERSION +* wallet-$VERSION (where $VERSION has a v prefix) + +.. code-block:: console + + $ git tag -s $APP-$VERSION + +F-Droid +^^^^^^^ +Nightly builds get published automatically (see above) after pushing code to the official repo. +Actual releases get picked up by F-Droid's official repository via git tags. +So ensure that all releases get tagged properly. + +Some information for F-Droid official repository debugging: + +* Wallet: [`metadata `__] [`build log `__] +* Cashier: [`metadata `__] [`build log `__] +* PoS: [`metadata `__] [`build log `__] + +Google Play +^^^^^^^^^^^ +Google Play uploads are managed via `Fastlane `__. +Before proceeding, ensure that this is properly set up +and that you have access to the Google Play API. + +To release an app, enter into its respective folder and run fastlane: + +.. code-block:: console + + $ bundle exec fastlane + +Then select the deploy option. +Note this requires access to the Google Play upload signing key +set via the various environment variables in $app/fastlane/Fastfile. + +All uploads are going to the beta track by default. +These can be promoted to production later or immediately after upload if you feel daring. + .. _Code-coverage: Code Coverage -- cgit v1.2.3 From 4aeb5c4d9e953a4c4c7eed740443c31d191fad6e Mon Sep 17 00:00:00 2001 From: Florian Dold Date: Thu, 4 Feb 2021 18:29:24 +0100 Subject: complete wallet installation instructions --- taler-wallet-cli-manual.rst | 2 ++ 1 file changed, 2 insertions(+) diff --git a/taler-wallet-cli-manual.rst b/taler-wallet-cli-manual.rst index 8007f6b0..0758f9ef 100644 --- a/taler-wallet-cli-manual.rst +++ b/taler-wallet-cli-manual.rst @@ -28,6 +28,8 @@ Now the wallet CLI can be installed without requiring elevated permissions: .. code-block:: console $ npm set prefix $HOME/.npm-global + $ npm install -g @gnu-taler/taler-wallet-cli + $ taler-wallet-cli --version Getting Help -- cgit v1.2.3 From a5feedd105abb0dfd5bfb024cb1bcf7406163180 Mon Sep 17 00:00:00 2001 From: Thien-Thi Nguyen Date: Fri, 5 Feb 2021 17:27:10 -0500 Subject: say "ID" explicitly; mark up ‘sess01’ MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- design-documents/007-payment.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/design-documents/007-payment.rst b/design-documents/007-payment.rst index 432816a0..b08cc26a 100644 --- a/design-documents/007-payment.rst +++ b/design-documents/007-payment.rst @@ -187,7 +187,7 @@ The following example uses a detached wallet: B: -> GET https://shop.demo.taler.net/books/moby-dick (content-type: application/html) - S: [Assigns session sess01 to browser] + S: [Assigns session ID ``sess01`` to browser] S: -> POST https://merchant-backend.demo.taler.net/orders S: -> GET https://merchant-backend.demo.taler.net/orders/ord01?session_id-sess01 -- cgit v1.2.3 From 61af7fcbc9eebf67c50a535fd278f7076b0f57d4 Mon Sep 17 00:00:00 2001 From: Thien-Thi Nguyen Date: Fri, 5 Feb 2021 17:27:30 -0500 Subject: fix typo: s/-/=/ --- design-documents/007-payment.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/design-documents/007-payment.rst b/design-documents/007-payment.rst index b08cc26a..665838a1 100644 --- a/design-documents/007-payment.rst +++ b/design-documents/007-payment.rst @@ -189,7 +189,7 @@ The following example uses a detached wallet: S: [Assigns session ID ``sess01`` to browser] S: -> POST https://merchant-backend.demo.taler.net/orders - S: -> GET https://merchant-backend.demo.taler.net/orders/ord01?session_id-sess01 + S: -> GET https://merchant-backend.demo.taler.net/orders/ord01?session_id=sess01 B: <- HTTP 307, redirect to https://merchant-backend.demo.taler.net/orders/ord01?token=ct01&session=sess01 -- cgit v1.2.3 From 150b580470e28aca773697effdb49ed90428ecd3 Mon Sep 17 00:00:00 2001 From: Thien-Thi Nguyen Date: Fri, 5 Feb 2021 17:28:29 -0500 Subject: fix typo: s/session/session_id/ (four instances) --- design-documents/007-payment.rst | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/design-documents/007-payment.rst b/design-documents/007-payment.rst index 665838a1..115ac3f8 100644 --- a/design-documents/007-payment.rst +++ b/design-documents/007-payment.rst @@ -191,7 +191,7 @@ The following example uses a detached wallet: S: -> POST https://merchant-backend.demo.taler.net/orders S: -> GET https://merchant-backend.demo.taler.net/orders/ord01?session_id=sess01 - B: <- HTTP 307, redirect to https://merchant-backend.demo.taler.net/orders/ord01?token=ct01&session=sess01 + B: <- HTTP 307, redirect to https://merchant-backend.demo.taler.net/orders/ord01?token=ct01&session_id=sess01 B: -> GET https://merchant-backend.demo.taler.net/orders/ord01?token=ct01 (content-type: application/html) @@ -199,7 +199,7 @@ The following example uses a detached wallet: taler://pay/shop.demo.taler.net/ord01/sess01?c=ct01 B: [via JavaScript on page] - B: -> GET https://merchant-backend.demo.taler.net/orders/ord01?token=ct01&session=sess01 + B: -> GET https://merchant-backend.demo.taler.net/orders/ord01?token=ct01&session_id=sess01 (content-type: application/json) B: <- HTTP status 402 Payment Required @@ -207,14 +207,14 @@ The following example uses a detached wallet: W: POST https://shop.demo.taler.net/orders/ord01/claim B: [via JavaScript on page] - B: -> GET https://merchant-backend.demo.taler.net/orders/ord01?token=ct01&session=sess01 + B: -> GET https://merchant-backend.demo.taler.net/orders/ord01?token=ct01&session_id=sess01 (content-type: application/json) B: <- HTTP status 402 Payment Required W: POST https://shop.demo.taler.net/orders/ord01/pay B: [via JavaScript on page] - B: -> GET https://merchant-backend.demo.taler.net/orders/ord01?token=ct01&session=sess01 + B: -> GET https://merchant-backend.demo.taler.net/orders/ord01?token=ct01&session_id=sess01 (content-type: application/json) B: <- HTTP status 202 Accepted B: [redirects to fulfillment URL of ord01 baked into the JavaScript code] -- cgit v1.2.3 From 4656eba6a50c06ae9e43119d78c157ff2067c461 Mon Sep 17 00:00:00 2001 From: Thien-Thi Nguyen Date: Fri, 5 Feb 2021 22:06:07 -0500 Subject: fix typo: s/and/an/ --- taler-merchant-manual.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/taler-merchant-manual.rst b/taler-merchant-manual.rst index ad8b5130..8e2c7fa0 100644 --- a/taler-merchant-manual.rst +++ b/taler-merchant-manual.rst @@ -182,7 +182,7 @@ merchant, where the merchant specifies the specific terms of the order. After an order is created, it is *claimed* by a wallet. Once an order is claimed by a specific wallet, only that wallet will be able to pay for this order, to the exclusion of other wallets even if they see the same order URL. -Sharing order URLs is explicitly allowed: if a user shares and order URL +Sharing order URLs is explicitly allowed: if a user shares an order URL with another user, that other user should be given the opportunity to purchase the same product. -- cgit v1.2.3