7819 Commits

Author SHA1 Message Date
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
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
8e5a1b524d clear form.email if click send per link, tests if clicked 2022-03-23 11:01:27 +01:00
Moriz Wahl
807922a8d5 redeem code in email link config 2022-03-23 09:17:15 +01:00
Moriz Wahl
767387bb7c change {code} to {optin} to avoid confusion when redeem code is provided 2022-03-23 09:05:39 +01:00
Moriz Wahl
042e05dc75
Update frontend/src/pages/Send.spec.js
Co-authored-by: Alexander Friedland <ogerly@users.noreply.github.com>
2022-03-23 08:53:30 +01:00
Moriz Wahl
9c1ad7405a
Update frontend/src/pages/Send.spec.js
Co-authored-by: Alexander Friedland <ogerly@users.noreply.github.com>
2022-03-23 08:53:19 +01:00
Moriz Wahl
1e39767525 Merge branch '1555-Admin-see-user-generated-link' of github.com:gradido/gradido into 1555-Admin-see-user-generated-link 2022-03-23 08:20:55 +01:00
Moriz Wahl
d1770ccb1a default values for filters 2022-03-23 08:20:37 +01:00
ogerly
245f447b99 rename file from LinksTransactionListFormular to TransactionLinkList 2022-03-23 08:02:50 +01:00
ogerly
4692802d6f show no table if items 0 2022-03-23 07:53:58 +01:00
Moriz Wahl
d0b2a28ae2 add simple filter for list transaction link admin query 2022-03-23 07:43:16 +01:00
Moriz Wahl
3575d2d2aa sort locales 2022-03-23 06:47:10 +01:00
Alexander Friedland
ad73d1f6d3
Update admin/src/locales/de.json
Co-authored-by: Moriz Wahl <moriz.wahl@gmx.de>
2022-03-22 20:17:41 +01:00
Alexander Friedland
34944d6b25
Update admin/src/locales/en.json
Co-authored-by: Moriz Wahl <moriz.wahl@gmx.de>
2022-03-22 20:17:29 +01:00
Moriz Wahl
1c8e1df1b5 100% test of Reset Password, better naming of variables 2022-03-22 20:11:34 +01:00
Moriz Wahl
9b53458655 fix test 2022-03-22 19:38:51 +01:00
Moriz Wahl
9c8599528e allow null for redeemCode 2022-03-22 19:24:58 +01:00
Moriz Wahl
296749d207 shorthand 2022-03-22 19:06:55 +01:00
Moriz Wahl
752228a7ea query transaction links as admin 2022-03-22 19:06:22 +01:00