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
|
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
|
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
|
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 |
|
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
|
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
|
31e07e70ce
|
reset transaction data after success from server
|
2022-03-22 18:33:16 +01:00 |
|
Moriz Wahl
|
421ae60507
|
reset transaction formular emits set transaction with empty data
|
2022-03-22 18:25:58 +01:00 |
|
Moriz Wahl
|
9097a45cff
|
restructure and improve tests
|
2022-03-22 18:17:51 +01:00 |
|
Moriz Wahl
|
8c8d06d87c
|
bind the transaction data to the transaction form to allow data restoration after canceling transaction confirmation, use always update transaction to update balance
|
2022-03-22 17:56:34 +01:00 |
|
Moriz Wahl
|
e08e1b7ea8
|
remove update balance method and event. We want to have the data always from the backend and do no calculation in the frontend
|
2022-03-22 17:54:55 +01:00 |
|
Moriz Wahl
|
0a3f80ddc9
|
add default properties to restore data when transaction is canceled in confirmation step
|
2022-03-22 17:53:51 +01:00 |
|
Moriz Wahl
|
31dcf30c46
|
load provide from dashboard layout, test set tunneled email
|
2022-03-22 14:59:24 +01:00 |
|
Alexander Friedland
|
61bc5efb11
|
Merge branch 'master' into 1636-Generating-link-does-not-update-gdd-balance
|
2022-03-22 14:54:10 +01:00 |
|
Moriz Wahl
|
78aaf629d2
|
add listener to transaction creation
|
2022-03-22 14:38:31 +01:00 |
|
Moriz Wahl
|
1c35793245
|
Merge branch 'master' into linked-user-email
|
2022-03-22 14:14:02 +01:00 |
|
Moriz Wahl
|
aaa6137c31
|
do not use route query to pass email. try inject/provide instead
|
2022-03-22 14:02:28 +01:00 |
|
|
|
5e41b59fe7
|
fix deprecation warning: use slice instead of substr
|
2022-03-22 13:18:10 +01:00 |
|
|
|
31c6f77a78
|
include constants in the config values
|
2022-03-22 13:14:26 +01:00 |
|
|
|
1d6dace9f4
|
implement admin config checking
|
2022-03-22 13:14:13 +01:00 |
|
|
|
703217e938
|
enforce config in frontend
|
2022-03-22 13:07:01 +01:00 |
|
Alexander Friedland
|
eda69bfc47
|
Update backend/src/graphql/resolver/UserResolver.ts
Co-authored-by: Ulf Gebhardt <ulf.gebhardt@webcraft-media.de>
|
2022-03-22 12:34:17 +01:00 |
|
Alexander Friedland
|
7929b93964
|
Update backend/src/graphql/resolver/UserResolver.ts
Co-authored-by: Ulf Gebhardt <ulf.gebhardt@webcraft-media.de>
|
2022-03-22 12:33:10 +01:00 |
|
Alexander Friedland
|
fe869e12c4
|
Update backend/src/graphql/resolver/UserResolver.test.ts
Co-authored-by: Moriz Wahl <moriz.wahl@gmx.de>
|
2022-03-22 12:31:44 +01:00 |
|
|
|
2a5db25c43
|
Merge branch 'master' into 1559-frontend-transport-redeem-link-through-register
|
2022-03-22 12:21:51 +01:00 |
|
Moriz Wahl
|
9a040bb84d
|
Merge pull request #1654 from gradido/add-referrer-id-to-users
feat: Add Referrer ID to Users
|
2022-03-22 12:21:29 +01:00 |
|
Hannes Heine
|
2457371300
|
Merge branch 'master' into add-referrer-id-to-users
|
2022-03-22 09:50:09 +01:00 |
|
ogerly
|
36b4c6cce7
|
update-balance if link succesfully generated
|
2022-03-22 09:01:09 +01:00 |
|
ogerly
|
8a2ca07b2e
|
test UserResolver.test.js ok, with redeemCode
|
2022-03-22 07:09:58 +01:00 |
|
