9441 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Alexander Friedland	a438c5c680	Merge branch 'master' into 2038-Community-contribution-site-and-form	2022-07-15 14:34:56 +02:00
Moriz Wahl	d7eb65014a	Merge pull request #2059 from gradido/do-not-log-IntrospectionQuery ... feat: Do not log IntrospectionQuery from Query Browser	2022-07-15 14:32:58 +02:00
Moriz Wahl	07093c466d	Merge branch 'master' into do-not-log-IntrospectionQuery	2022-07-15 13:47:11 +02:00
Moriz Wahl	175bc514be	feat: Do not log IntrospectionQuery from Query Browser	2022-07-15 13:36:31 +02:00
Alexander Friedland	fb2673284e	Merge branch 'master' into 2038-Community-contribution-site-and-form	2022-07-15 11:43:24 +02:00
Hannes Heine	ceae3915f9	Merge pull request #2052 from gradido/2051-list-contribution-add-deleted ... Feat: Add confirmedBy and confirmedAt for the contribution query.	2022-07-15 11:40:33 +02:00
Moriz Wahl	66f10df1d0	improve logic and date handling. use v-model for form	2022-07-15 11:23:03 +02:00
Moriz Wahl	9efb83b2af	fix tests	2022-07-15 11:01:36 +02:00
ogerly	c170c48ac4	change for tests	2022-07-15 10:11:40 +02:00
Alexander Friedland	6d948cd3b1	Merge branch 'master' into 2051-list-contribution-add-deleted	2022-07-15 09:10:49 +02:00
Alexander Friedland	6ce1fb2082	Merge branch 'master' into 2038-Community-contribution-site-and-form	2022-07-15 09:06:01 +02:00
ogerly	4215f62311	change props and data.form for update contribution	2022-07-15 09:05:27 +02:00
ogerly	dfc20a3254	change code, to review from moriz	2022-07-15 09:05:27 +02:00
Alexander Friedland	8ad1e2920f	Update frontend/src/pages/Community.vue ... Co-authored-by: Moriz Wahl <moriz.wahl@gmx.de>	2022-07-15 08:36:26 +02:00
Alexander Friedland	8b4f0499c8	Merge pull request #2048 from gradido/add-creations-to-user-webapp ... Add open creations to webapp	2022-07-15 07:50:13 +02:00
Alexander Friedland	1bf8c289ef	Merge branch 'master' into add-creations-to-user-webapp	2022-07-15 07:40:08 +02:00
Alexander Friedland	8f742ce1d1	Merge branch 'master' into 2051-list-contribution-add-deleted	2022-07-15 07:37:37 +02:00
mahula	703a9107c8	Merge pull request #2054 from gradido/session-timer ... Prevent session expiration modal from displaying negative seconds, when session is expired for more than 0 seconds	2022-07-14 16:22:31 +02:00
ogerly	af0f434d01	add updateContribution	2022-07-14 15:22:38 +02:00
ogerly	84706e430b	add slot ContributionListItem.vue, add verifyLogin, update store for creation	2022-07-14 11:50:17 +02:00
mahula	be22ac3da3	Merge branch 'master' into session-timer	2022-07-13 19:43:26 +02:00
mahula	90d90ca9bd	fix linting	2022-07-13 19:04:38 +02:00
mahula	2302da9054	Update frontend/src/components/SessionLogoutTimeout.vue ... Co-authored-by: Moriz Wahl <moriz.wahl@gmx.de>	2022-07-13 15:36:40 +02:00
mahula	1d1cc7e960	Update frontend/src/components/SessionLogoutTimeout.spec.js ... Co-authored-by: Moriz Wahl <moriz.wahl@gmx.de>	2022-07-13 15:36:15 +02:00
Hannes Heine	6cb4b376e7	Merge pull request #2032 from gradido/2000-contribution-update ... feat: mutation contribution update	2022-07-13 15:11:14 +02:00
mahula	b2164e6d1d	add unit test for this fix	2022-07-13 14:54:47 +02:00
mahula	ed10d7d1a0	set session timer to 0, if expiration is greater then 0 seconds	2022-07-13 14:54:17 +02:00
Hannes Heine	8d727f5e5c	Merge branch 'master' into 2000-contribution-update	2022-07-13 14:42:02 +02:00
ogerly	c1d6a57e41	Merge branch '2051-list-contribution-add-deleted' into 2038-Community-contribution-site-and-form	2022-07-13 11:29:21 +02:00
ogerly	ffe8831d09	change listContributions query add confirmedBy and confirmedAt	2022-07-13 11:28:35 +02:00
elweyn	99c4e83670	Add deleted contribution to the list of contribution.	2022-07-13 11:26:18 +02:00
ogerly	a905ff8642	Merge branch '2051-list-contribution-add-deleted' into 2038-Community-contribution-site-and-form	2022-07-13 11:15:15 +02:00
ogerly	802a629d26	remove console statement	2022-07-13 11:12:33 +02:00
ogerly	b0df5996e0	change computed lastMonthObject	2022-07-13 11:06:29 +02:00
elweyn	9d9d1a78f1	Add confirmedBy and confirmedAt for the contribution query.	2022-07-13 11:01:44 +02:00
elweyn	e1d50cacb5	Fix linting.	2022-07-13 09:55:21 +02:00
ogerly	6dd11a961f	resolve merge conflict for ContributionResolver.ts 2	2022-07-13 09:04:14 +02:00
ogerly	910ba6bbdf	moved from v-html to computed	2022-07-13 09:03:09 +02:00
ogerly	0ddd732da6	show open creation in contribution form	2022-07-13 09:03:09 +02:00
ogerly	e5e594c3a2	fix lint	2022-07-13 09:03:09 +02:00
ogerly	72d912dbdb	add creation on login query and store	2022-07-13 09:03:09 +02:00
ogerly	ee886f42e5	resolve merge conflict for ContributionResolver.ts	2022-07-13 09:02:53 +02:00
ogerly	4dffa377cc	resolve merge conflict	2022-07-13 08:57:38 +02:00
ogerly	3162a1e6b6	change test for disable button	2022-07-13 08:55:11 +02:00
ogerly	c8234ea54e	add test for Community.vue	2022-07-13 08:55:11 +02:00
ogerly	8ddc6c5604	add test for ContributionList.vue	2022-07-13 08:55:11 +02:00
ogerly	f93351dcdd	add test for ContributionForm.vue	2022-07-13 08:55:11 +02:00
ogerly	5a4a713c25	change formular text	2022-07-13 08:55:11 +02:00
elweyn	801e223cfd	Implement that adminUpdateContribution is not allowed when moderator is null.	2022-07-13 08:27:05 +02:00
elweyn	c6bab99a2c	Add Test that adminUpdateContribution is not allowed on creation made by createContribution mutation.	2022-07-13 08:26:30 +02:00