14700 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Hannes Heine	74bfc5d065	Merge branch 'master' into 2878-trigger-export-klicktipp	2023-06-29 07:51:29 +02:00
Ulf Gebhardt	b1036c9d5b	Merge pull request #3090 from gradido/fix-forget-password-deleted-user ... fix(backend): forget password not for deleted users	2023-06-28 16:49:50 +02:00
Ulf Gebhardt	e05e4cbf37	Merge branch 'master' into fix-forget-password-deleted-user	2023-06-28 15:11:03 +02:00
Ulf Gebhardt	29476190fd	Merge pull request #3086 from gradido/fix-gdt-error ... fix(backend): gdt server error & gdt refetch policy	2023-06-28 15:10:50 +02:00
Ulf Gebhardt	3d4ee1de9f	Merge branch 'master' into fix-gdt-error	2023-06-28 14:35:55 +02:00
Moriz Wahl	402c2d1683	Merge pull request #3072 from gradido/message-type-admin ... feat(backend): contribution message type moderator	2023-06-28 13:34:05 +02:00
Moriz Wahl	4771d2a0ca	Merge branch 'master' into message-type-admin	2023-06-28 12:46:10 +02:00
Ulf Gebhardt	31446aaa0e	do not allow to reset password when user is deleted	2023-06-28 11:16:48 +02:00
mahula	5e9113373c	Merge pull request #3089 from gradido/3088-bug-linting-in-e2e-tests-directory-does-not-work ... fix(other): linting in e2e tests directory does not work	2023-06-28 11:01:40 +02:00
Ulf Gebhardt	70260925fb	Merge branch 'master' into fix-gdt-error	2023-06-28 10:54:50 +02:00
Ulf Gebhardt	f86d0e9162	fix tests for new network policy in transactions	2023-06-28 10:55:05 +02:00
mahula	fb6ec71b3d	lint cypress support files	2023-06-28 10:17:06 +02:00
mahula	8db179c517	lint e2e stepdefinition files files	2023-06-28 09:48:11 +02:00
mahula	a0af5d87ae	lint e2e model files	2023-06-28 09:46:06 +02:00
mahula	61133870e7	lint cypress config	2023-06-28 09:42:34 +02:00
mahula	42fc73ab1b	fix linting config for e2e-tests directory	2023-06-28 09:38:28 +02:00
mahula	8a6fd0ac6e	Merge pull request #3070 from gradido/2936-featureend-to-end-user-story-send-coin ... feat(other): end-to-end test feature send coins	2023-06-28 07:30:31 +02:00
mahula	236d2d9757	Merge branch 'master' into 2936-featureend-to-end-user-story-send-coin	2023-06-28 07:03:09 +02:00
Ulf Gebhardt	e62a677668	fixed network policy for gdt query	2023-06-27 22:37:37 +02:00
Ulf Gebhardt	ccada453c0	fixed vue error	2023-06-27 22:37:20 +02:00
Ulf Gebhardt	87e5b7437f	properly construct result objects, return an empty GDT list on success=false	2023-06-27 22:19:28 +02:00
Ulf Gebhardt	421f5e6355	Merge pull request #3085 from gradido/dht-node-dev-dependencies ... refactor(dht): move typescript related packages in dev Dependencies	2023-06-27 22:19:19 +02:00
Ulf Gebhardt	c5cbb9e120	rework GdtEntryList	2023-06-27 22:18:56 +02:00
Ulf Gebhardt	76603d82cf	rework GdtEntry	2023-06-27 22:18:44 +02:00
mahula	dd83f52570	Merge branch 'master' into 2936-featureend-to-end-user-story-send-coin	2023-06-27 22:11:17 +02:00
Ulf Gebhardt	4b58603a12	Merge branch 'master' into dht-node-dev-dependencies	2023-06-27 21:26:38 +02:00
Ulf Gebhardt	21f4ab26bf	Merge pull request #3084 from gradido/eslint-jest-env ... fix(backend): jest environment	2023-06-27 21:26:06 +02:00
mahula	b2d15a4854	Merge branch 'master' into 2936-featureend-to-end-user-story-send-coin	2023-06-27 21:21:36 +02:00
Ulf Gebhardt	ec50b98d73	Merge branch 'master' into eslint-jest-env	2023-06-27 20:51:19 +02:00
Hannes Heine	44d1e98d64	Merge pull request #3081 from gradido/3007-transaction-list-page-style ... feat(frontend): transaction list page change style for small device	2023-06-27 20:39:16 +02:00
mahula	11e3ba4886	Merge branch 'master' into 2936-featureend-to-end-user-story-send-coin	2023-06-27 20:39:16 +02:00
mahula	6ec3701cf6	move transaction data from step definition to scenario line	2023-06-27 19:29:00 +02:00
mahula	e763ac3d7a	move transaction details data from step definition to scenario line	2023-06-27 18:52:19 +02:00
mahula	a612f2e305	change value type in send coin step for coherence	2023-06-27 18:03:32 +02:00
mahula	07e11fe788	use more example data in e2e send coin scenario	2023-06-27 17:30:47 +02:00
Hannes Heine	409c74a3f3	Merge branch 'master' into 3007-transaction-list-page-style	2023-06-27 15:05:28 +02:00
Hannes Heine	39a826c37b	Merge pull request #3082 from gradido/2671-refactor-state-to-status ... refactor(other): refactor state to status	2023-06-27 14:08:55 +02:00
Moriz Wahl	689705f465	improved describe	2023-06-27 14:03:03 +02:00
Hannes Heine	e02c650174	Merge branch 'master' into 2671-refactor-state-to-status	2023-06-27 13:33:30 +02:00
Ulf Gebhardt	26437d5e5f	move typescripted related packages in devDependencies	2023-06-27 12:25:06 +02:00
Ulf Gebhardt	3cff9bce79	include jest environment	2023-06-27 12:23:18 +02:00
Hannes Heine	c20d48571f	Merge pull request #3080 from gradido/3008-change-deny-button-color ... feat(admin): change deny contribution btn-warning color and background-color to #e1a908	2023-06-27 11:38:13 +02:00
elweyn	45b3dc8295	Refactor state to status for contribution in admin.	2023-06-27 10:04:54 +02:00
elweyn	af60cc2638	Refactor state to status for contribution in frontend.	2023-06-27 10:04:40 +02:00
elweyn	48498ee729	Refactor state to status for contribution.	2023-06-27 10:04:21 +02:00
elweyn	9ceb5383cf	Set cols from 12 to 6, px from 2 to 1 and remove offset.	2023-06-27 09:14:20 +02:00
elweyn	3af471aebb	Change btn-warning color and background color to #e1a908	2023-06-26 20:00:24 +02:00
mahula	dfc1880195	adapt e2e email step to email changes	2023-06-26 09:51:48 +02:00
mahula	d73b128216	adapt e2e email step to email changes	2023-06-26 09:11:01 +02:00
Ulf Gebhardt	be1aa808c2	Merge branch 'master' into 2936-featureend-to-end-user-story-send-coin	2023-06-22 15:40:31 +02:00