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,594 Commits 1 Branch 0 Tags
Commit Graph

7594 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Moriz Wahl
e9e97549a7 rename right to GDT_BALANCE, rename query to gdtBalance, ensure gdtBalance is null when API call fails 2022-03-29 01:12:07 +02:00
Moriz Wahl
d584651fc1 rename right to GDT_BALANCE 2022-03-29 01:11:25 +02:00
Moriz Wahl
a26aaae71a Merge branch 'master' into refactor-balance-resolver 2022-03-29 01:03:52 +02:00
Alexander Friedland
50806d9505
Merge pull request #1680 from gradido/1594-Show-transaction-was-created-by-link 
1594 show transaction was created by link
 2022-03-28 14:01:57 +02:00
Alexander Friedland
453d23a7c9
Merge branch 'master' into 1594-Show-transaction-was-created-by-link 2022-03-28 13:52:38 +02:00
Alexander Friedland
193e085439
sorting properties 2022-03-28 13:51:24 +02:00
Moriz Wahl
f20b8e8f75
Merge pull request #1675 from gradido/increase-max-memo-length 
refactor: Memo Text Length to 255 Characters
 2022-03-28 13:50:22 +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
Moriz Wahl
4b970bfed5
Merge branch 'master' into increase-max-memo-length 2022-03-25 14:34:30 +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
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
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