9538 Commits

Author SHA1 Message Date
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
ogerly
5b16d687ac add bootstrap pagination on GDD Transaction List, tests adapted 2022-03-25 09:48:28 +01:00
ogerly
bae1b85482 add bootstrap pagination on GDD Transaction List, tests adapted 2022-03-25 09:29:42 +01:00
ogerly
9332f81187 yarn lint && yarn locales --fix 2022-03-25 08:42:52 +01:00
ogerly
56cfd93985 change locales vrom expired to valid_until 2022-03-25 08:41:35 +01:00
ogerly
76d6b308cf add deletedAt in query, change locales expired to valid_until 2022-03-25 08:27:36 +01:00
ogerly
45c8a719bc add pagination, add row prepared for linkList Count 2022-03-25 08:14:20 +01:00
Alexander Friedland
33fb3bbe8c
Merge branch 'master' into 1555-Admin-see-user-generated-link 2022-03-25 06:54:09 +01:00
Claus-Peter Hübner
c2d3f5232d start diagram for federation hyperswarm 2022-03-25 01:46:55 +01:00
Claus-Peter Hübner
0a70b09bf7 start with HyperSwarm conception 2022-03-25 00:53:50 +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
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
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
ogerly
4e006f2d84 add components FigureQrCode.vue for show qr code image with gradido coin 2022-03-24 09:13:00 +01:00
ogerly
6bd44f6eb9 test qr code button and modal 2022-03-24 09:13:00 +01:00
ogerly
8e4628c220 moved to QrCode folder 2022-03-24 09:13:00 +01:00
ogerly
a8f228f3a9 add extra order for QrCode components, add component FigureQrCode.vue 2022-03-24 09:13:00 +01:00