14886 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
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
Moriz Wahl	27006be4ae	undo changed comming from user query for find contributions	2023-06-26 14:21:35 +02:00
Moriz Wahl	5355ad88cb	Merge branch 'update-typeorm' into user-query-on-find-contributions	2023-06-26 14:11:17 +02:00
Moriz Wahl	d5af6c3b21	federation running with new typeorm version	2023-06-26 14:08:12 +02:00
Moriz Wahl	ec4b8294b2	dht node running on ne typeorm version	2023-06-26 14:04:32 +02:00
Moriz Wahl	e35104faa8	get backend running with new typeorm version	2023-06-26 13:59:42 +02:00
mahula	ba98797009	add deleted user and not registered user scenarios to e2e password reset feature	2023-06-26 13:55:45 +02:00
Moriz Wahl	89a6305c45	feat(database): update typeorm	2023-06-26 13:12:42 +02:00
ogerly	1d53de99c2	check for userId to filter moderators	2023-06-26 11:35:53 +02:00
ogerly	e14cfff6d6	Added missing locales	2023-06-26 10:20:09 +02:00
ogerly	0b8f822a94	Added missing locales	2023-06-26 10:19:02 +02:00
ogerly	c3f7b30e32	messages only visible for moderators	2023-06-26 10:11:13 +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
Moriz Wahl	49c8599097	add user query on find contributions	2023-06-22 15:23:33 +02:00
Claus-Peter Huebner	a3b60faa50	change/correct relation user:user_role	2023-06-22 01:27:45 +02:00
Moriz Wahl	95acf084f7	get it working	2023-06-21 19:20:03 +02:00