14905 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Alexander Friedland	ea1dec369b	Update frontend/src/components/UserSettings/UserName.spec.js ... Co-authored-by: Hannes Heine <heine.hannes@gmail.com>	2023-06-28 08:18:38 +02:00
Alexander Friedland	71b7a2adf3	Update frontend/src/components/Inputs/InputUsername.spec.js ... Co-authored-by: Hannes Heine <heine.hannes@gmail.com>	2023-06-28 08:18:27 +02:00
mahula	d6f4bd6485	update packages cypress, eslint-plugin-cypress, and eslint-plugin-promise	2023-06-28 08:06:20 +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
Claus-Peter Huebner	9c9a05e64f	userRoles as OneToMany relation	2023-06-28 02:47:51 +02:00
Claus-Peter Huebner	dcea6871ef	userRoles as OneToMany relation	2023-06-28 02:47:11 +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
Alexander Friedland	d9600bd88a	Merge branch 'master' into message-type-admin-frontend	2023-06-27 14:49:23 +02:00
ogerly	387d9e87b7	fix test for ContributionMessagesFormular.spec.js	2023-06-27 14:39:10 +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
ogerly	13657682b2	delete src/graphql/listContributionMessages.js	2023-06-27 11:46:00 +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
mahula	eb99a32433	check visibility of email list in e2e email test step	2023-06-27 11:27:27 +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
mahula	8553bf59fd	check visibility of email list in e2e email test step	2023-06-27 09:59:09 +02:00
ogerly	f4408a14ae	fix test for ContributionMessagesList.spec.js	2023-06-27 09:41:30 +02:00
ogerly	6f1bb9653b	refactor history message, fix test for ContributionMessagesListItem.spec.js	2023-06-27 09:38:39 +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
Claus-Peter Huebner	e2790a268e	modify tests, but still not working	2023-06-27 02:53:17 +02:00
Claus-Peter Huebner	2ca9af9cbf	load userRole in findUserByEmail()	2023-06-27 02:44:27 +02:00
Claus-Peter Huebner	37b2e659f0	add userRole relations	2023-06-27 02:42:42 +02:00
Claus-Peter Huebner	35eef52aef	add "isModerator" in graphql model	2023-06-27 02:39:01 +02:00
Claus-Peter Huebner	61a9f0a045	change entity relations	2023-06-27 02:36:19 +02:00
elweyn	3af471aebb	Change btn-warning color and background color to #e1a908	2023-06-26 20:00:24 +02:00
Moriz Wahl	642d2202bf	try to get repository working again	2023-06-26 17:34:32 +02:00
Moriz Wahl	95e7888d90	try to get unit tests and seeds running again	2023-06-26 15:57:43 +02:00