Alexander Friedland
|
90261caf4b
|
Merge branch 'master' into 1633-Display-QR-Code-on-link-in-transaction-list
|
2022-03-24 07:37:26 +01:00 |
|
Claus-Peter Hübner
|
a241e14118
|
small changes
|
2022-03-24 03:27:09 +01:00 |
|
Claus-Peter Hübner
|
59333d905e
|
Merge remote-tracking branch 'origin/master' into 1574-Concept_to_introduce_Gradido-ID
|
2022-03-24 03:17:48 +01:00 |
|
Moriz Wahl
|
605806fdd3
|
Merge branch 'master' into linked-user-email
|
2022-03-23 21:10:45 +01:00 |
|
Moriz Wahl
|
bc494206e6
|
Merge pull request #1664 from gradido/add-sender-email-to-transaction-mail
feat: Add Sender Email to Transaction Received Mail
|
2022-03-23 21:10:24 +01:00 |
|
Moriz Wahl
|
4c0b4600d9
|
Merge branch 'master' into linked-user-email
|
2022-03-23 21:06:08 +01:00 |
|
Moriz Wahl
|
bd79d63783
|
Merge branch 'master' into add-sender-email-to-transaction-mail
|
2022-03-23 20:59:31 +01:00 |
|
Moriz Wahl
|
3509087166
|
Update backend/src/mailer/text/transactionReceived.ts
Co-authored-by: Ulf Gebhardt <ulf.gebhardt@webcraft-media.de>
|
2022-03-23 20:59:13 +01:00 |
|
Moriz Wahl
|
80a8217217
|
Update backend/src/mailer/sendTransactionReceivedEmail.test.ts
Co-authored-by: Ulf Gebhardt <ulf.gebhardt@webcraft-media.de>
|
2022-03-23 20:58:57 +01:00 |
|
|
|
9848f1a3a7
|
Merge pull request #1627 from gradido/enforce_config_version
Feature: Enforce config versions
|
2022-03-23 20:50:32 +01:00 |
|
Moriz Wahl
|
29f7746a3d
|
disable test for restore email. I suppose this is an interaction with provided. I have no idea why this is not working anymore
|
2022-03-23 20:46:15 +01:00 |
|
Alexander Friedland
|
933b55eac2
|
Update frontend/src/components/GddSend/TransactionForm.spec.js
Co-authored-by: Moriz Wahl <moriz.wahl@gmx.de>
|
2022-03-23 20:37:45 +01:00 |
|
Alexander Friedland
|
0e05bded0a
|
Update frontend/src/components/GddSend/TransactionForm.spec.js
Co-authored-by: Moriz Wahl <moriz.wahl@gmx.de>
|
2022-03-23 20:37:38 +01:00 |
|
|
|
20318546a8
|
Merge branch 'master' into enforce_config_version
|
2022-03-23 20:33:23 +01:00 |
|
Alexander Friedland
|
0ae08dc08b
|
Merge branch 'master' into 1633-Display-QR-Code-on-link-in-transaction-list
|
2022-03-23 20:17:03 +01:00 |
|
Alexander Friedland
|
b46d31f7bb
|
Merge branch 'master' into 1659-send-formular-clear-if-click-on-send-link
|
2022-03-23 20:16:50 +01:00 |
|
Moriz Wahl
|
0ed539b098
|
Merge branch 'master' into linked-user-email
|
2022-03-23 20:16:49 +01:00 |
|
Alexander Friedland
|
1680a15b8a
|
Merge branch 'master' into 1555-Admin-see-user-generated-link
|
2022-03-23 20:16:25 +01:00 |
|
Alexander Friedland
|
1f3a3835b1
|
Merge pull request #1647 from gradido/1559-frontend-transport-redeem-link-through-register
1559 frontend transport redeem link through register
|
2022-03-23 20:13:33 +01:00 |
|
|
|
9cda1c5bb2
|
Merge branch 'master' into 1559-frontend-transport-redeem-link-through-register
|
2022-03-23 20:00:54 +01:00 |
|
|
|
c0c6630873
|
make redeemCode nullable
|
2022-03-23 19:59:29 +01:00 |
|
|
|
eaed95cdf8
|
Merge branch 'master' into enforce_config_version
|
2022-03-23 19:56:36 +01:00 |
|
Moriz Wahl
|
ff8c71cf7f
|
Merge pull request #1655 from gradido/1636-Generating-link-does-not-update-gdd-balance
update-balance if link succesfully generated
|
2022-03-23 19:55:38 +01:00 |
|
Moriz Wahl
|
65fb882f63
|
Update backend/src/webhook/elopage.ts
Co-authored-by: Ulf Gebhardt <ulf.gebhardt@webcraft-media.de>
|
2022-03-23 19:40:36 +01:00 |
|
Moriz Wahl
|
3a8229f60f
|
include hold available amount in balance calculation
|
2022-03-23 19:18:18 +01:00 |
|
Moriz Wahl
|
a1ac6600b7
|
refactor resolvers to use balance resolver and model
|
2022-03-23 19:06:12 +01:00 |
|
Moriz Wahl
|
f46bd23c11
|
refactor balance model
|
2022-03-23 19:05:19 +01:00 |
|
Moriz Wahl
|
243058ee5a
|
get GDT sum via GDT resolver
|
2022-03-23 18:18:07 +01:00 |
|
Moriz Wahl
|
8277773006
|
add gdtSum query
|
2022-03-23 18:13:54 +01:00 |
|
Moriz Wahl
|
17256c27ba
|
test presence of sender email in transaction received email
|
2022-03-23 17:30:52 +01:00 |
|
Moriz Wahl
|
9ed400f511
|
add sender email to transaction received email
|
2022-03-23 17:27:47 +01:00 |
|
Moriz Wahl
|
174e1ab597
|
fix test
|
2022-03-23 17:12:09 +01:00 |
|
Moriz Wahl
|
cc0efb2204
|
test link duration in mails
|
2022-03-23 17:02:53 +01:00 |
|
Moriz Wahl
|
f1686523df
|
add link information to reset password email
|
2022-03-23 16:57:04 +01:00 |
|
Moriz Wahl
|
d1644ad2ae
|
add information about link duration and how to get a new link in email
|
2022-03-23 16:49:30 +01:00 |
|
Moriz Wahl
|
3d613e72f5
|
add link to forgot-password
|
2022-03-23 16:48:35 +01:00 |
|
Moriz Wahl
|
b0300e5a08
|
test regexp to catch error message
|
2022-03-23 16:16:04 +01:00 |
|
Moriz Wahl
|
40520c6718
|
regexp to check for error message
|
2022-03-23 16:11:19 +01:00 |
|
Moriz Wahl
|
ca0d97c47c
|
test printEmailCodeValidTime
|
2022-03-23 16:03:52 +01:00 |
|
Moriz Wahl
|
662285161c
|
time span for email code valid time
|
2022-03-23 14:28:24 +01:00 |
|
Moriz Wahl
|
2faad50919
|
set email code valid time to 24h
|
2022-03-23 13:33:07 +01:00 |
|
ogerly
|
0bc968fe5a
|
yarn test fixed, :hideHeaderClose
|
2022-03-23 13:19:15 +01:00 |
|
ogerly
|
0a3302f7c6
|
svg new line at the end of file
|
2022-03-23 12:45:54 +01:00 |
|
ogerly
|
5925b87597
|
add hideHeaderClose: false
|
2022-03-23 12:43:56 +01:00 |
|
ogerly
|
741c65a1c6
|
add show qr-code from transaction link
|
2022-03-23 12:33:24 +01:00 |
|
ogerly
|
5ee6e7173e
|
add image gdd coin for qr code
|
2022-03-23 12:32:44 +01:00 |
|
ogerly
|
dadba15870
|
add qr-code button outline color success
|
2022-03-23 11:41:53 +01:00 |
|
ogerly
|
5df9eaae1e
|
add qr-code button on list transaction link
|
2022-03-23 11:40:30 +01:00 |
|
ogerly
|
1733fc68a7
|
add seperated svg for qr-code from bootstrap 5
|
2022-03-23 11:39:25 +01:00 |
|
ogerly
|
8e5a1b524d
|
clear form.email if click send per link, tests if clicked
|
2022-03-23 11:01:27 +01:00 |
|
