|
|
fa5b7e6b81
|
Merge branch 'master' into dissolve_admin_resolver
# Conflicts:
# backend/src/graphql/resolver/TransactionResolver.ts
# backend/src/graphql/resolver/UserResolver.test.ts
# backend/src/graphql/resolver/UserResolver.ts
|
2022-11-29 06:15:31 +01:00 |
|
joseji
|
e350307e6a
|
removing keys and passphrases
|
2022-11-28 23:59:57 +01:00 |
|
Wolfgang Huß
|
dc7957a0fb
|
Merge branch 'master' of github.com:gradido/gradido into 2392-refactor-more-emails-to-translatables
# Conflicts:
# backend/src/util/utilities.ts
|
2022-11-28 11:22:25 +01:00 |
|
Wolfgang Huß
|
3903e29e16
|
Refactor 'sendTransactionReceivedEmail' email to HTML and translatable
|
2022-11-28 10:54:10 +01:00 |
|
Wolfgang Huß
|
224613f6d4
|
Refactor 'sendTransactionLinkRedeemedEmail' email to HTML and translatable
|
2022-11-26 15:42:44 +01:00 |
|
Moriz Wahl
|
b3e880d45f
|
undo refactoring
|
2022-11-24 13:03:50 +01:00 |
|
|
|
4554b01b89
|
order and correct imports of resolvers
|
2022-11-22 13:01:38 +01:00 |
|
joseji
|
f0c39703f1
|
fixed wrong removals of negative numbers
|
2022-10-24 22:05:17 +02:00 |
|
|
|
42040e5562
|
Merge branch 'master' into test-transaction-resolver
|
2022-10-21 12:46:37 +02:00 |
|
joseji
|
259475755c
|
fixed wrong responsabilities of exception throwing and implementation of calculateBalance()
|
2022-10-18 23:24:43 +02:00 |
|
Moriz Wahl
|
26249f361c
|
fix query to get email of linked user
|
2022-10-18 15:24:06 +02:00 |
|
joseji
|
2fd37a7503
|
fixed tests and negative numbers are now detected
|
2022-10-14 13:59:41 +02:00 |
|
joseji
|
91c05fcb9b
|
events implemented and tested
|
2022-10-13 14:13:23 +02:00 |
|
joseji
|
0b68f2f74b
|
tests up and working
|
2022-10-13 13:44:39 +02:00 |
|
Claus-Peter Hübner
|
b3bf7fecc4
|
Merge remote-tracking branch 'origin/master' into
1798-feature-gradidoid-1-adapt-and-migrate-database-schema
|
2022-09-23 01:32:44 +02:00 |
|
elweyn
|
6c0cb17196
|
Refactor sendTransactionLinkredeemed
.
|
2022-09-21 12:41:25 +02:00 |
|
Claus-Peter Hübner
|
86b12f98ed
|
set overall resolvers the isolationlevel to REPEATABLE READ
|
2022-09-16 15:20:51 +02:00 |
|
Claus-Peter Hübner
|
3fcc62539a
|
changes after merge from master
|
2022-09-16 15:14:51 +02:00 |
|
clauspeterhuebner
|
d592c57024
|
Merge branch 'master' into 1798-feature-gradidoid-1-adapt-and-migrate-database-schema
|
2022-09-15 17:56:21 +02:00 |
|
Claus-Peter Hübner
|
411e03c843
|
rework PR comments
|
2022-09-15 02:40:59 +02:00 |
|
Claus-Peter Hübner
|
228451574d
|
adapt backend on database migration of UserContacts
|
2022-08-26 02:28:04 +02:00 |
|
Hannes Heine
|
37d9ef1c30
|
Merge branch 'master' into 2010-send-email-to-transaction-link-sender
|
2022-08-11 14:40:42 +02:00 |
|
elweyn
|
8aa6bc540e
|
Change CONTRIBUTIONLINK_MEMO_..._CHARS to MEMO_..._CHARS and using it on ContributionResolver, TransactionResolver and AdminResolver.
|
2022-07-25 12:41:11 +02:00 |
|
elweyn
|
93e0451124
|
Fix linting.
|
2022-07-19 12:24:42 +02:00 |
|
elweyn
|
97a83e633a
|
Add block to send the email to the sender of a transactionLink after the receiver redeemed it.
|
2022-07-19 12:11:57 +02:00 |
|
Moriz Wahl
|
5cac5d9cfb
|
loggers are created only once, unify logger for unit tests
|
2022-05-16 16:02:12 +02:00 |
|
Moriz Wahl
|
9893cc78aa
|
add context user with user.id instead of public key
|
2022-05-10 19:33:26 +02:00 |
|
Claus-Peter Hübner
|
cb83027bef
|
additional log output
|
2022-05-10 04:18:09 +02:00 |
|
Wolfgang Huß
|
8205e88b2f
|
Comply Ulf's suggestions
|
2022-04-14 14:19:40 +02:00 |
|
Wolfgang Huß
|
f94dc967c0
|
Merge branch 'master' of github.com:gradido/gradido into 1734-emails-get-wallet-link
# Conflicts:
# backend/src/graphql/resolver/TransactionResolver.ts
|
2022-04-13 10:26:49 +02:00 |
|
Wolfgang Huß
|
563afcbf2a
|
Add EMAIL_CLIENT_URI in config
- Increment config version.
- Correct usage of EMAIL_CLIENT_URI.
|
2022-04-12 15:36:05 +02:00 |
|
Wolfgang Huß
|
ea5589a840
|
Add wallet link to transaction mail, first approach
|
2022-04-12 12:18:04 +02:00 |
|
Moriz Wahl
|
d7bec83d25
|
use Context interface in Transaction resolver
|
2022-04-11 16:22:32 +02:00 |
|
Moriz Wahl
|
69dae586d8
|
check that recipient user has activated account in send coins
|
2022-04-05 15:12:36 +02:00 |
|
Moriz Wahl
|
447fdb6057
|
Merge branch 'master' into fix_decay
|
2022-03-31 22:30:52 +02:00 |
|
Moriz Wahl
|
681d34b1dc
|
rounding in virtual decay transaction, pass hold available amount to virtual decay creation
|
2022-03-31 22:17:36 +02:00 |
|
|
|
a9ba92f67b
|
Transaction Resolver: transmit Redeem Link to calculateBalance
|
2022-03-31 12:32:35 +02:00 |
|
|
|
592e16e260
|
virtual decay transaction is based on full sum not including the link values
|
2022-03-31 12:09:00 +02:00 |
|
Moriz Wahl
|
0ab4f73f3b
|
subtract the hold available amount from last transaction balance for virtual decay transaction
|
2022-03-30 15:10:36 +02:00 |
|
Moriz Wahl
|
90e6798a7d
|
rename context.count to context.transactionCount
|
2022-03-29 16:10:06 +02:00 |
|
Moriz Wahl
|
27ad1d2e22
|
transaction list model contains balance, user balance resolver to create transacton list result
|
2022-03-29 01:54:13 +02:00 |
|
Moriz Wahl
|
e9e97549a7
|
rename right to GDT_BALANCE, rename query to gdtBalance, ensure gdtBalance is null when API call fails
|
2022-03-29 01:12:07 +02:00 |
|
Moriz Wahl
|
a26aaae71a
|
Merge branch 'master' into refactor-balance-resolver
|
2022-03-29 01:03:52 +02:00 |
|
Moriz Wahl
|
30543942d8
|
check for valid min/max length of memeo before executing transaction
|
2022-03-24 14:36:16 +01:00 |
|
Moriz Wahl
|
a1ac6600b7
|
refactor resolvers to use balance resolver and model
|
2022-03-23 19:06:12 +01:00 |
|
Moriz Wahl
|
243058ee5a
|
get GDT sum via GDT resolver
|
2022-03-23 18:18:07 +01:00 |
|
Moriz Wahl
|
9ed400f511
|
add sender email to transaction received email
|
2022-03-23 17:27:47 +01:00 |
|
Moriz Wahl
|
577ca00c46
|
refactor transaction list query, do not allow user id an only creations as args any more. this query only return the transactions of the logged in user
|
2022-03-17 10:46:29 +01:00 |
|
Moriz Wahl
|
b44ef71756
|
no double DB calls to get user from db in resolvers
|
2022-03-17 10:05:07 +01:00 |
|
Moriz Wahl
|
bb14c07747
|
sum of hold available and hold available decay is negative
|
2022-03-14 08:56:26 +01:00 |
|