einhorn_b
95dfd5b8a2
try with manuall installed node-gyp
2023-10-06 08:07:13 +02:00
clauspeterhuebner
c9ebb0ff3d
Merge branch 'master' into 3204-release-1_23_3
2023-10-05 12:13:50 +02:00
clauspeterhuebner
a874368ea7
Merge pull request #3200 from gradido/2947-refactor-the-existing-sendcoins-resolver-methode-to-distingue-between-local-transaction-and-x-transaction
...
refactor(backend): x-sendcoins-3: refactor transactionResolver to distingue between local and x-com-transaction
2023-10-05 12:12:44 +02:00
clauspeterhuebner
046285071e
Merge pull request #3194 from gradido/3187-feature-x-sendcoind-23-invoke-settlement-of-x-pending-tx
...
feat(federation): x-com sendcoins 23: invoke settlement of pending tx
2023-10-05 12:12:02 +02:00
einhornimmond
a66c9111d4
Merge pull request #3212 from gradido/update_mariadb_image_name
...
fix(database): update mariadb image name
2023-10-05 08:57:07 +02:00
clauspeterhuebner
6066d403c6
Merge branch 'master' into 3204-release-1_23_3
2023-10-05 01:32:50 +02:00
Claus-Peter Huebner
04e6a7b0d0
Merge remote-tracking branch 'origin/update_mariadb_image_name' into 3187-feature-x-sendcoind-23-invoke-settlement-of-x-pending-tx
2023-10-05 00:49:42 +02:00
Claus-Peter Huebner
5fd48fd491
linting
2023-10-05 00:17:19 +02:00
Claus-Peter Huebner
bb2871ae66
add CONFIG.FEDERATION_XCOM_SENDCOINS_ENABLED=true in X-Com-Test
2023-10-05 00:08:46 +02:00
Claus-Peter Huebner
b954ad27ea
reduce backend coverage again
2023-10-04 23:50:22 +02:00
Claus-Peter Huebner
890724872b
Merge remote-tracking branch 'origin/update_mariadb_image_name' into 2947-refactor-the-existing-sendcoins-resolver-methode-to-distingue-between-local-transaction-and-x-transaction
2023-10-04 19:10:14 +02:00
Claus-Peter Huebner
c0a09c2a28
extent voteSendCoins result and increase coverage for backend and
...
federation
2023-10-04 19:09:13 +02:00
Dario bb
4e5a815fbe
parameter name changed
2023-10-04 16:59:56 +02:00
Dario bb
0492913a03
update mariadb docker image
2023-10-04 16:45:28 +02:00
Claus-Peter Huebner
9ddecd95ac
add test for X-Com sendCoins in TransactionResolver.test
2023-10-02 17:06:57 +02:00
Claus-Peter Huebner
90fca336d2
solve merge-conflict
2023-09-28 23:08:23 +02:00
Claus-Peter Huebner
371f4a2dfa
Merge remote-tracking branch
...
'origin/3187-feature-x-sendcoind-23-invoke-settlement-of-x-pending-tx'
into 2947-refactor-the-existing-sendcoins-resolver-methode-to-distingue-between-local-transaction-and-x-transaction
2023-09-28 23:07:43 +02:00
Claus-Peter Huebner
04b8819def
linting
2023-09-28 22:01:18 +02:00
Claus-Peter Huebner
2bee69c10b
linting
2023-09-28 18:00:09 +02:00
Claus-Peter Huebner
4d005c410b
comment unused/untested code to increase coverage
2023-09-28 16:49:58 +02:00
clauspeterhuebner
e5de711b4a
Merge branch 'master' into 3187-feature-x-sendcoind-23-invoke-settlement-of-x-pending-tx
2023-09-28 01:58:50 +02:00
Claus-Peter Huebner
c51a084c14
increase coverage
2023-09-28 01:11:31 +02:00
Claus-Peter Huebner
f21a31a736
remove duplicate code
2023-09-28 00:58:04 +02:00
Claus-Peter Huebner
1a3acc77e2
Merge branch '3187-feature-x-sendcoind-23-invoke-settlement-of-x-pending-tx' of github.com:gradido/gradido into 3187-feature-x-sendcoind-23-invoke-settlement-of-x-pending-tx
2023-09-28 00:41:52 +02:00
Claus-Peter Huebner
fade56a557
additional tests for x-com-sendcoins
2023-09-28 00:40:48 +02:00
einhornimmond
abe54d420f
Merge pull request #3207 from gradido/iota7.1_add_community
...
feat(dlt): add community, use dlt-database
2023-09-27 10:28:14 +02:00
einhorn_b
936fcfce04
remove unneccessary file
2023-09-27 09:03:34 +02:00
einhorn_b
2e662b86cb
merge with master, #3199
2023-09-27 09:01:43 +02:00
einhornimmond
a2f9604213
Merge pull request #3199 from gradido/iota6_protobuf_models
...
feat(dlt): protobuf entities for blockchain protocol
2023-09-27 08:42:05 +02:00
einhornimmond
67fe8b64a8
Merge branch 'master' into iota6_protobuf_models
2023-09-26 18:51:58 +02:00
einhornimmond
9b3307f53e
Merge branch 'master' into iota7.1_add_community
2023-09-26 18:51:44 +02:00
Claus-Peter Huebner
d5be82ad7e
insert in transactionList the remoteUser of X-Com-Tx
2023-09-22 19:53:12 +02:00
Claus-Peter Huebner
f4e2588d0e
remove check of receiver balance after calculation
2023-09-22 01:24:19 +02:00
Claus-Peter Huebner
2e326e123c
correct accidental checkin of log4j.config
2023-09-22 00:42:54 +02:00
Claus-Peter Huebner
dfa2a223db
next try x-com-sendCoins
2023-09-22 00:30:30 +02:00
Claus-Peter Huebner
31d47d7537
next try for x-com sendCoins
2023-09-21 18:45:53 +02:00
Claus-Peter Huebner
7561025c99
next try of graphql mutation
2023-09-21 16:11:00 +02:00
Claus-Peter Huebner
34be808472
change SendCoinsArgs to @InputType()
2023-09-21 00:10:34 +02:00
Claus-Peter Huebner
d5ea0b7724
next try for graphql api definition
2023-09-20 17:48:24 +02:00
Claus-Peter Huebner
2fe9b4e55e
changed CONFIG.VERSION distributable in .env.template for deployment
2023-09-20 17:01:25 +02:00
Claus-Peter Huebner
fe85e45d38
correct graphql result definition for voteForSendCoins
2023-09-20 16:47:59 +02:00
Claus-Peter Huebner
32496a0353
introduce tx-switch for local and x-com sendcoins
2023-09-20 14:24:23 +02:00
clauspeterhuebner
9c37e8f3c3
Update federation/src/graphql/util/checkTradingLevel.ts
...
Co-authored-by: einhornimmond <dario.rekowski@gmx.de>
2023-09-20 12:35:33 +02:00
clauspeterhuebner
ee8498daf3
Update backend/src/graphql/resolver/util/processXComSendCoins.ts
...
Co-authored-by: einhornimmond <dario.rekowski@gmx.de>
2023-09-20 12:24:00 +02:00
Claus-Peter Huebner
f726b9b564
Merge remote-tracking branch
...
'origin/3187-feature-x-sendcoind-23-invoke-settlement-of-x-pending-tx'
into 2947-refactor-the-existing-sendcoins-resolver-methode-to-distingue-between-local-transaction-and-x-transaction
2023-09-20 01:08:52 +02:00
Claus-Peter Huebner
12cca94f0b
Merge remote-tracking branch 'origin/master' into 2947-refactor-the-existing-sendcoins-resolver-methode-to-distingue-between-local-transaction-and-x-transaction
2023-09-19 23:18:25 +02:00
Claus-Peter Huebner
c3bc7182b7
temporary reduce coverage
2023-09-19 23:12:53 +02:00
clauspeterhuebner
cacf50e2c6
Merge branch 'master' into 3187-feature-x-sendcoind-23-invoke-settlement-of-x-pending-tx
2023-09-19 23:10:14 +02:00
Claus-Peter Huebner
dcc221fb05
no homeComUuid for local users in transactions
2023-09-19 23:09:46 +02:00
Claus-Peter Huebner
4aeb1b60a2
lokaler zwischenstand
2023-09-19 21:19:22 +02:00
