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

10160 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
aba237db54
Merge branch 'master' into 1555-Admin-see-user-generated-link 2022-03-25 20:45:55 +01:00
ogerly
a445693f93 change date query for expired status 2022-03-25 20:42:40 +01:00
Claus-Peter Hübner
ec33fbf72a grafic with hyperswarm 2022-03-25 20:41:48 +01:00
ogerly
b633544f89 yarn lint --fix 2022-03-25 20:40:04 +01:00
ogerly
0117a13c8d add status for expired 2022-03-25 20:39:28 +01:00
ogerly
3ff7cc494a add locales for expired 2022-03-25 20:39:12 +01:00
ogerly
6d3a58d18c rename spec from CreationTransactionListFormular to CreationTransactionList 2022-03-25 20:29:36 +01:00
ogerly
2e904e3696 yarn locales --fix 2022-03-25 20:27:08 +01:00
ogerly
c7025831e8 yarn lint --fix 2022-03-25 20:26:45 +01:00
ogerly
334912ea6c rename from CreationTransactionListFormular to CreationTransactionList 2022-03-25 20:25:54 +01:00
ogerly
3f19a3c871 add table field status of link, deletedAt or redeemedAt or open 2022-03-25 20:24:38 +01:00
ogerly
db8e112648 add count in graphql query 2022-03-25 20:19:01 +01:00
ogerly
95e7aeacdc add locales for transactionlist status 2022-03-25 20:18:04 +01:00
ogerly
549a36cb56 add linkCount and linkList in query 2022-03-25 20:17:33 +01:00
Moriz Wahl
4b970bfed5
Merge branch 'master' into increase-max-memo-length 2022-03-25 14:34:30 +01:00
ogerly
04e3db15fd lint fixed 2022-03-25 13:51:57 +01:00
Ulf Gebhardt
33638598a0
notActivated & isDeleted are both nullable 
Admin User Search is a nightmare codewise
 2022-03-25 13:43:53 +01:00
Ulf Gebhardt
58eacb85ce
do not show unactivated emails in masscreation list 2022-03-25 13:35:33 +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
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
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
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