7578 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Alexander Friedland	193e085439	sorting properties	2022-03-28 13:51:24 +02:00
Alexander Friedland	640923dd50	sorting properties	2022-03-28 13:47:45 +02:00
Alexander Friedland	666f176b35	remove comma from via link	2022-03-28 13:46:34 +02:00
Alexander Friedland	3f7d9e73b3	remove comma from via link	2022-03-28 13:45:11 +02:00
ogerly	6b5288ca8f	change, via_link text outer link	2022-03-26 16:58:50 +01:00
ogerly	4909254a02	remove comma in text	2022-03-26 09:39:46 +01:00
ogerly	543b389f8c	add comma on via_link	2022-03-26 09:39:14 +01:00
ogerly	871a8ed14d	add props transactionLinkId in TransactionSend	2022-03-26 09:36:48 +01:00
ogerly	f9cc754ca0	add props transactionLinkId in TransactionReceive	2022-03-26 09:36:35 +01:00
ogerly	eecab9248d	add link icon and locales via_link if redeemed	2022-03-26 09:35:29 +01:00
ogerly	bcfc60150b	remove linkk icon if redeemed	2022-03-26 09:34:53 +01:00
ogerly	184b948916	add locales via_link	2022-03-26 09:33:48 +01:00
ogerly	5c099cd01f	add props transactionLinkId	2022-03-25 21:49:35 +01:00
ogerly	fe2d1caa10	add icon if transactionLinkId on transaction	2022-03-25 21:48:47 +01:00
ogerly	095dffc7e6	add locales redeemed-title	2022-03-25 21:47:16 +01:00
ogerly	62831a71df	add transactionLinkId on query	2022-03-25 21:46:38 +01:00
Alexander Friedland	94d0589cb9	Merge pull request #1678 from gradido/1649-Admin-does-not-properly-refresh-its-user-list ... adminarea: fetchPolicy on searchUser deleted User	2022-03-25 12:39:49 +01:00
ogerly	b3dbef0668	add fetchPolicy: 'no-cache' on searchUser	2022-03-25 10:59:02 +01:00
clauspeterhuebner	f74912cf4c	Merge pull request #1313 from gradido/1223-community_communication_concept ... 1223 community communication concept	2022-03-24 21:46:23 +01:00
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