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

10152 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
ogerly
938079d8b4 Merge branch '2131-crud-for-messages' into Contribution-Messages 2022-08-24 16:35:17 +02:00
ogerly
8b063639f6 add apollo mutation createContributionMessage 2022-08-24 16:34:23 +02:00
elweyn
59df924e1d Add User to Contribution link, query the messages user in the listContributions query. 2022-08-24 16:27:28 +02:00
ogerly
8adf366c52 Merge branch '2133-Messages-in-Admin-Interface' into Contribution-Messages 2022-08-24 14:52:30 +02:00
ogerly
5aee0ac7bb resolve conflict 2022-08-24 14:52:05 +02:00
ogerly
95abc61964 Merge branch '2131-crud-for-messages' into Contribution-Messages 2022-08-24 14:50:03 +02:00
ogerly
2e0820ca9c yarn locales 2022-08-24 14:47:18 +02:00
ogerly
7bc82db3c4 add apollo mutation adminCreateContributionMessage 2022-08-24 12:45:13 +02:00
ogerly
250c444722 Merge branch '2131-crud-for-messages' into 2133-Messages-in-Admin-Interface 2022-08-24 11:12:17 +02:00
ogerly
39c51a6698 Merge branch '2131-crud-for-messages' into 2132-Messages-in-Wallet 2022-08-24 11:07:13 +02:00
ogerly
a0d765c7f2 add list and formular for contribution messages 2022-08-24 11:04:28 +02:00
elweyn
5dfe330168 Merge branch '2131-crud-for-messages' of https://github.com/gradido/gradido into 2131-crud-for-messages 2022-08-24 10:58:00 +02:00
elweyn
dd2022df25 Add new values to query for contributions in frontend. 2022-08-24 10:57:52 +02:00
elweyn
bda04f87d2 Add messages and state to the contribution model. 2022-08-24 10:57:03 +02:00
elweyn
0271a42741 Use user entity instead of user model. 2022-08-24 10:56:19 +02:00
ogerly
1ac50875c0 Merge branch '2131-crud-for-messages' into 2132-Messages-in-Wallet 2022-08-24 07:45:28 +02:00
Hannes Heine
9c609665e0
Merge branch 'master' into 2131-crud-for-messages 2022-08-23 16:06:20 +02:00
ogerly
0def6472d5 add files for ContributionMessages 2022-08-23 14:30:03 +02:00
ogerly
2855615462 add components ContributionMessagesList.vue 2022-08-23 14:13:58 +02:00
elweyn
41fb0d2a9f Change export name of ContributionMessageResolver class. 2022-08-23 13:46:55 +02:00
clauspeterhuebner
bc83a15ab5
Merge pull request #2073 from gradido/2072-feature-usecase-contribution-messaging 
2072 feature usecase contribution messaging
 2022-08-23 13:46:29 +02:00
clauspeterhuebner
456fbd4b15
Merge branch 'master' into 2072-feature-usecase-contribution-messaging 2022-08-23 13:37:15 +02:00
mahula
b6a2516426
Merge pull request #2158 from gradido/2151-add-hint-to-redeem-link 
2151 add hint to redeem link
 2022-08-23 12:03:02 +02:00
elweyn
e3e4b61c57 Rename export of ContributionArgs to ContributionMessageArgs. 2022-08-23 11:59:24 +02:00
elweyn
2c459a8fae Changed the Contribution.find so that we can throw a specific error, added an GraphQL Model as return value instead of DbEntity. 2022-08-23 11:55:34 +02:00
elweyn
1c433e2d57 Add graphql object that will be returned instead of dbEntity. 2022-08-23 11:53:19 +02:00
mahula
1ea43130dc adapt unit tests to link text changes 2022-08-23 11:41:01 +02:00
mahula
f55851e4d0 add hint text to copyLinkWithText method 2022-08-23 11:39:43 +02:00
elweyn
e70a18c6bb Change thrown error message. 2022-08-23 11:09:41 +02:00
ogerly
8bfc505c5c contribution messages locales 2022-08-23 11:08:01 +02:00
mahula
d6c81d21d3 add redeem link hint to locales 2022-08-23 10:08:31 +02:00
Alexander Friedland
2028eb435f
Merge branch 'master' into 2133-Messages-in-Admin-Interface 2022-08-23 09:30:30 +02:00
clauspeterhuebner
7126c7832d
Merge branch 'master' into 2072-feature-usecase-contribution-messaging 2022-08-22 16:47:02 +02:00
elweyn
27fd42f097 Change import for enum. 2022-08-22 12:27:46 +02:00
elweyn
5ca422c6d3 Change import for enum and arg. 2022-08-22 12:27:06 +02:00
elweyn
710d47b594 Add adminCreateContributionMessage. 2022-08-22 12:21:38 +02:00
elweyn
bca2f49483 Add admin right to create contribution message. 2022-08-22 12:17:11 +02:00
elweyn
c5b84694d0 Withdrew admin part of user createContributionMessage. 2022-08-22 12:16:20 +02:00
elweyn
281f6cde3f Update contributionStatus to new state. 2022-08-22 10:39:56 +02:00
elweyn
0376cffb19 First steps createContributionMessage method of ContributionMessageResolver. 2022-08-22 10:30:48 +02:00
elweyn
a59967d767 Add new Arg for ContributionMessage 2022-08-22 10:30:14 +02:00
elweyn
8f117f23b4 Add new right CREATE_CONTRIBUTION_MESSAGE 2022-08-22 10:13:11 +02:00
Hannes Heine
a2cd06b063
Merge pull request #2137 from gradido/create-message-table 
🍰 Create `contribution messages` table
 2022-08-22 09:58:28 +02:00
Hannes Heine
eb29df38ee
Merge branch 'master' into create-message-table 2022-08-22 09:49:33 +02:00
clauspeterhuebner
43aac4dfcb
Merge branch 'master' into 2072-feature-usecase-contribution-messaging 2022-08-19 15:51:30 +02:00
Alexander Friedland
c3805f0e36
Merge pull request #2138 from gradido/2135-add-the-languages-french-and-dutch 
feat: 🍰 Add The Languages French And Dutch
 2022-08-19 14:20:13 +02:00
elweyn
49e25bef36 Fix prettier. 2022-08-19 12:22:12 +02:00
elweyn
13ddb961c8 Merge master 2022-08-19 12:19:46 +02:00
elweyn
0a2c8c6a08 Add import for deletedatecolumn. 2022-08-19 12:18:55 +02:00
Hannes Heine
159fb96502
Merge branch 'master' into create-message-table 2022-08-19 12:17:45 +02:00