13355 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Claus-Peter Hübner	16a245d061	Merge remote-tracking branch 'origin/master' into 2730-devops-add-federation-modul-to-deployment-scripts	2023-03-13 22:25:56 +01:00
Moriz Wahl	b67192f108	Merge pull request #2788 from gradido/test-transaction-links ... feat(backend): test double redeem transaction links	2023-03-10 15:50:42 +01:00
Moriz Wahl	84a6eccd49	Merge branch 'master' into test-transaction-links	2023-03-10 15:36:04 +01:00
Moriz Wahl	42a2832eb0	Merge pull request #2813 from gradido/admin-open-creations-query ... feat(backend): admin open creations query	2023-03-10 15:08:04 +01:00
Moriz Wahl	8dfafaea89	Merge branch 'master' into admin-open-creations-query	2023-03-10 14:49:32 +01:00
Ulf Gebhardt	98435540f3	Merge pull request #2745 from gradido/eslint-plugin-type-graphql-fixes ... refactor(backend): eslint-plugin-type-graphql + fixes	2023-03-10 12:29:29 +01:00
Ulf Gebhardt	b4e324ce0a	Merge branch 'master' into eslint-plugin-type-graphql-fixes	2023-03-10 12:12:59 +01:00
Moriz Wahl	2af31b6bfd	better arg name	2023-03-10 11:59:01 +01:00
Moriz Wahl	73fb123036	admin open creations query	2023-03-10 11:55:24 +01:00
Hannes Heine	eb266ec93c	Merge pull request #2812 from gradido/v1.19.1 ... chore(other): upgrade version to 1.19.1	2023-03-10 11:51:10 +01:00
elweyn	e2fc7c1733	chore(other): upgrade version to 1.19.1	2023-03-10 11:36:35 +01:00
Hannes Heine	c7e7595f18	Merge pull request #2810 from gradido/fix-click-answer-question ... fix(frontend): admin question clickable	2023-03-10 08:59:18 +01:00
Hannes Heine	b8f97e0b71	Merge branch 'master' into fix-click-answer-question	2023-03-10 08:33:33 +01:00
Hannes Heine	cb4085beca	Merge pull request #2809 from gradido/fix-send-svg-to-icon ... refactor(frontend): change b-img to b-icon send	2023-03-10 08:32:59 +01:00
elweyn	ef3a9c16b2	Removed code reintroduced.	2023-03-10 08:31:15 +01:00
elweyn	8a3d66861e	Change b-img to b-icon send.	2023-03-10 08:02:25 +01:00
Hannes Heine	8d12978fea	Merge pull request #2806 from gradido/2802-update-store ... fix(admin): update openCreation in case of tab open.	2023-03-09 21:17:48 +01:00
Hannes Heine	3ec72b28eb	Merge branch 'master' into 2802-update-store	2023-03-09 21:04:46 +01:00
Ulf Gebhardt	2f6c5b92a9	Merge pull request #2804 from gradido/fix-english-language-admin-creations ... fix(admin): english language for contributions in admin	2023-03-09 20:32:51 +01:00
elweyn	fe560ff319	Change openCreation in case of tab open.	2023-03-09 20:19:01 +01:00
Ulf Gebhardt	e7f7b9b164	fix english language for contributions in admin	2023-03-09 20:13:54 +01:00
Hannes Heine	3191b3333a	Merge pull request #2760 from gradido/2710-delete-own-post-in-admin-interface-remove-icon ... refactor(admin): event buttons for myself turned off in open contributions	2023-03-09 19:12:25 +01:00
Moriz Wahl	8f6c3d45aa	a element at button match	2023-03-09 18:59:05 +01:00
elweyn	780f18f32b	Remove propsData	2023-03-09 18:40:29 +01:00
elweyn	44214e9657	Change following test of tab confirmed.	2023-03-09 18:38:17 +01:00
elweyn	52cc4e54bd	Remove clearAllMocks for 'open'	2023-03-09 18:24:02 +01:00
elweyn	75e06d46e4	Merge master.	2023-03-09 18:06:05 +01:00
elweyn	4c34f0933d	Unit test moved.	2023-03-09 18:02:49 +01:00
Hannes Heine	4b90072608	Merge pull request #2794 from gradido/2787-fix-contribution-tab-textes ... fix(admin): contribution page	2023-03-09 17:58:47 +01:00
elweyn	e7c6ecb9a1	Merge branch '2710-delete-own-post-in-admin-interface-remove-icon' of https://github.com/gradido/gradido into 2710-delete-own-post-in-admin-interface-remove-icon	2023-03-09 16:24:29 +01:00
elweyn	a0c7ad827f	Merge branch 'master' into 2710-delete-own-post-in-admin-interface-remove-icon	2023-03-09 16:24:05 +01:00
elweyn	17e19debad	Fix unit test.	2023-03-09 16:18:37 +01:00
elweyn	723cb4f238	Merge branch '2787-fix-contribution-tab-textes' of https://github.com/gradido/gradido into 2787-fix-contribution-tab-textes	2023-03-09 16:12:45 +01:00
elweyn	06186dd2d7	Change messageCount to messagesCount	2023-03-09 16:12:37 +01:00
elweyn	027376b3e0	Add contributionState check for message form	2023-03-09 15:51:21 +01:00
Hannes Heine	6bdf82c25e	Update admin/src/pages/CreationConfirm.vue ... Co-authored-by: Moriz Wahl <moriz.wahl@gmx.de>	2023-03-09 15:18:26 +01:00
elweyn	923cc5d81e	Extract format date or - to a method.	2023-03-09 15:14:16 +01:00
Ulf Gebhardt	becabb861c	fix types	2023-03-09 14:41:35 +01:00
Hannes Heine	159d1f2a51	Update admin/src/locales/en.json ... Co-authored-by: Moriz Wahl <moriz.wahl@gmx.de>	2023-03-09 14:38:27 +01:00
Ulf Gebhardt	e3add830c3	turn @typescript-eslint/prefer-regex-exec	2023-03-09 14:37:26 +01:00
Ulf Gebhardt	b530576a84	revert regex.exec to string.match	2023-03-09 14:37:26 +01:00
Ulf Gebhardt	09d2db3028	unsaved changes, include float from type-graphql	2023-03-09 14:37:26 +01:00
Ulf Gebhardt	230a47d32b	GDT Balance returns float	2023-03-09 14:37:26 +01:00
Ulf Gebhardt	18491cc380	timeUsed is a float	2023-03-09 14:37:25 +01:00
Ulf Gebhardt	2783a6c62e	gdtSum is float	2023-03-09 14:37:25 +01:00
Ulf Gebhardt	16914e3d98	gdt balance is a float	2023-03-09 14:37:25 +01:00
Ulf Gebhardt	19adc53ed7	fix newly introduced errors	2023-03-09 14:37:25 +01:00
Ulf Gebhardt	827c829306	fixes based on the unit tests	2023-03-09 14:37:25 +01:00
Ulf Gebhardt	3391b3a9ee	merge	2023-03-09 14:37:17 +01:00
Ulf Gebhardt	b34208b81a	Merge branch 'master' into eslint-plugin-type-graphql	2023-03-09 14:31:04 +01:00