Claus-Peter Hübner
|
3cbbde2b89
|
small formal changes requested py PR-1219
# Conflicts:
# docu/graphics/roadmap_publicity.drawio
# docu/graphics/roadmap_publicity.png
|
2022-03-24 21:07:17 +01:00 |
|
Moriz Wahl
|
3fc167620b
|
Merge branch 'master' into optin-valid-time
|
2022-03-24 19:32:59 +01:00 |
|
Moriz Wahl
|
5456affb9c
|
fix logic (not canResendOptIn), fix error strings
|
2022-03-24 19:27:32 +01:00 |
|
Alexander Friedland
|
af90bb4c3b
|
Merge branch 'master' into 1555-Admin-see-user-generated-link
|
2022-03-24 19:26:31 +01:00 |
|
Moriz Wahl
|
9da2047e8c
|
move sendActivationEmail mutation from user to admin resolver
|
2022-03-24 19:14:59 +01:00 |
|
Moriz Wahl
|
1e3300ad5a
|
use optIn as naming convention
|
2022-03-24 18:38:24 +01:00 |
|
Alexander Friedland
|
76d510c7cb
|
Merge pull request #1660 from gradido/1659-send-formular-clear-if-click-on-send-link
clear form.email if click send per link, tests if clicked
|
2022-03-24 18:35:46 +01:00 |
|
Moriz Wahl
|
607805075c
|
refactor sendActivationEmail, get rid of getOptInCode function
|
2022-03-24 18:33:07 +01:00 |
|
Moriz Wahl
|
965ab22bab
|
create helper functions for time management, rename some functions
|
2022-03-24 18:17:46 +01:00 |
|
Moriz Wahl
|
7cd920686d
|
helper function to create a new email optin object. Use this in create user
|
2022-03-24 17:50:34 +01:00 |
|
Moriz Wahl
|
8718fdee7b
|
add comentary to explain the meaning of the constants
|
2022-03-24 17:38:03 +01:00 |
|
Moriz Wahl
|
ac000296da
|
enums for optin types
|
2022-03-24 17:37:07 +01:00 |
|
Moriz Wahl
|
e4c7a8ddda
|
linting
|
2022-03-24 17:20:06 +01:00 |
|
Moriz Wahl
|
92952f3d75
|
test same email, test memo too long
|
2022-03-24 14:54:25 +01: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
|
6fe7e4c9a2
|
set max memo length to 255
|
2022-03-24 14:30:51 +01:00 |
|
ogerly
|
7023959e48
|
yarn lint --fix
|
2022-03-24 14:08:17 +01:00 |
|
Moriz Wahl
|
0c0ce1b579
|
add new env variable to define email optin request time delay
|
2022-03-24 14:05:23 +01:00 |
|
Moriz Wahl
|
34d3893f1c
|
Merge branch 'master' into optin-valid-time
|
2022-03-24 14:00:41 +01:00 |
|
Alexander Friedland
|
0fbceea099
|
Merge branch 'master' into 1659-send-formular-clear-if-click-on-send-link
|
2022-03-24 13:55:35 +01:00 |
|
Moriz Wahl
|
3f5883904d
|
Merge pull request #1658 from gradido/linked-user-email
feat: User in Transaction Clickable to Send Directly
|
2022-03-24 13:49:09 +01:00 |
|
|
|
09360f70ee
|
Merge branch 'master' into 1555-Admin-see-user-generated-link
|
2022-03-24 11:28:58 +01:00 |
|
ogerly
|
38929102fd
|
yarn test fixed
|
2022-03-24 11:11:20 +01:00 |
|
ogerly
|
8130f85ed8
|
delete @change='form.email = ' from form-radio button
|
2022-03-24 10:58:26 +01:00 |
|
ogerly
|
8c9472c050
|
change v-show to v-if
|
2022-03-24 10:55:51 +01:00 |
|
ogerly
|
6167e6b1cc
|
SEND_TYPES becomes imported
|
2022-03-24 10:49:30 +01:00 |
|
Alexander Friedland
|
e5d28d7b8d
|
Merge branch 'master' into 1659-send-formular-clear-if-click-on-send-link
|
2022-03-24 10:42:22 +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
|
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 |
|
