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
einhornimmond
f9e3ee8582
Merge pull request #3210 from gradido/fix_frontend_invisible_community
...
fix(frontend): make invisible community visible
2023-09-19 21:10:15 +02:00
einhorn_b
d53073783c
should prevent crash in empty tables
2023-09-19 21:06:22 +02:00
einhorn_b
979641be82
remove css
2023-09-19 20:51:03 +02:00
einhorn_b
0c8c1cd7e0
remove irreführende Testdaten
2023-09-19 16:17:46 +02:00
einhorn_b
232b88f72c
Merge branch 'iota6_protobuf_models' of github.com:gradido/gradido into iota6_protobuf_models
2023-09-19 15:50:58 +02:00
einhornimmond
04b6238612
Update backend/src/apis/DltConnectorClient.test.ts
...
Co-authored-by: clauspeterhuebner <86960882+clauspeterhuebner@users.noreply.github.com>
2023-09-19 15:50:44 +02:00
einhornimmond
e40ff0b05d
Update backend/src/apis/DltConnectorClient.test.ts
...
Co-authored-by: clauspeterhuebner <86960882+clauspeterhuebner@users.noreply.github.com>
2023-09-19 15:41:49 +02:00
einhorn_b
fb309a5ee0
fix missing number
2023-09-19 15:31:16 +02:00
einhorn_b
2ad92ed3d2
use internal EntityRepository
2023-09-19 11:55:55 +02:00
einhorn_b
410854054b
remove one dummy query
2023-09-19 11:20:48 +02:00
einhorn_b
f2ce9e2aa2
refacte datetime precision
2023-09-19 11:11:55 +02:00
einhorn_b
6ff4652271
clean up yarn.lock
2023-09-19 09:58:14 +02:00
Claus-Peter Huebner
a013fd241a
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-18 23:49:31 +02:00
Claus-Peter Huebner
6133c708a8
Merge remote-tracking branch 'origin/master' into
...
2947-refactor-the-existing-sendcoins-resolver-methode-to-distingue-between-local-transaction-and-x-transaction
2023-09-18 23:46:09 +02:00
