10171 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
elweyn	8fbdbca5a8	Add new model ContributionMessageListResult.	2022-08-25 13:52:53 +02:00
Alexander Friedland	53a4813b29	Merge branch 'master' into Contribution-Messages	2022-08-25 09:27:49 +02:00
Alexander Friedland	97e173ebc3	Merge pull request #2147 from gradido/2145-Corrections-style-for-frontend ... 2145 corrections style for frontend	2022-08-25 09:06:07 +02:00
ogerly	5a0bbbf20d	add slots for messages	2022-08-24 22:36:26 +02:00
ogerly	66647d64f2	Merge branch '2131-crud-for-messages' into Contribution-Messages	2022-08-24 16:53:05 +02:00
elweyn	4dbcabf96d	Add where clause.	2022-08-24 16:52:42 +02:00
ogerly	0eb63689ee	Merge branch '2131-crud-for-messages' into Contribution-Messages	2022-08-24 16:45:59 +02:00
elweyn	057816e4c0	Change innerJoin to leftJoin, so that every contribution is shown not only the one with messages.	2022-08-24 16:43:32 +02:00
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	a9c3dd25ed	Add RIGHTS.LIST_ALL_CONTRIBUTION_MESSAGES to the ROLES of Users.	2022-08-24 16:32:58 +02:00
elweyn	e0fcdb2cee	Add new RIGHT for LIST_ALL_CONTRIBUTION_MESSAGES.	2022-08-24 16:31:36 +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
Alexander Friedland	b48c638c75	Merge branch 'master' into 2145-Corrections-style-for-frontend	2022-08-23 13:54:34 +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
ogerly	f24461f924	delete unused locales	2022-08-23 11:23:45 +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
Alexander Friedland	3ba1e99b13	Merge branch 'master' into 2145-Corrections-style-for-frontend	2022-08-23 09:28:38 +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