IT4Change/gradido
3
0
Fork 0
mirror of https://github.com/IT4Change/gradido.git synced 2025-12-13 07:45:54 +00:00
Code Issues Packages Projects Releases Wiki Activity
7,559 Commits 1 Branch 0 Tags
Commit Graph

7559 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Claus-Peter Hübner
5da36e0448 PR-Comments 2022-03-24 21:35:11 +01:00
Claus-Peter Hübner
f2e2f77325 PR-reworks 2022-03-24 21:31:54 +01:00
Ulf Gebhardt
e0d0056ab7
Merge branch 'master' into 1223-community_communication_concept2 
# Conflicts:
#	docu/graphics/roadmap_publicity.drawio
#	docu/graphics/roadmap_publicity.png
 2022-03-24 21:18:06 +01:00
clauspeterhuebner
ae4aed21f8
Update docu/Concepts/BusinessRequirements/CommunityVerwaltung.md 
Co-authored-by: Ulf Gebhardt <ulf.gebhardt@webcraft-media.de>
 2022-03-24 21:07:57 +01:00
clauspeterhuebner
3d28160ee8
Update docu/Concepts/BusinessRequirements/CommunityVerwaltung.md 
Co-authored-by: Ulf Gebhardt <ulf.gebhardt@webcraft-media.de>
 2022-03-24 21:07:52 +01:00
clauspeterhuebner
f43106003b
Update docu/Concepts/BusinessRequirements/CommunityVerwaltung.md 
Co-authored-by: Ulf Gebhardt <ulf.gebhardt@webcraft-media.de>
 2022-03-24 21:07:45 +01:00
Claus-Peter Hübner
5c1973a136
manueller CherryPic aus #1055 2022-03-24 21:07:28 +01:00
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
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
ogerly
7023959e48 yarn lint --fix 2022-03-24 14:08:17 +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
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
Ulf Gebhardt
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
Ulf Gebhardt
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
Ulf Gebhardt
9cda1c5bb2
Merge branch 'master' into 1559-frontend-transport-redeem-link-through-register 2022-03-23 20:00:54 +01:00
Ulf Gebhardt
c0c6630873
make redeemCode nullable 2022-03-23 19:59:29 +01:00
Ulf Gebhardt
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