14991 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
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	dd1e14d7b1	Merge branch 'master' into eslint-dht-import	2023-06-22 16:06:48 +02:00
Ulf Gebhardt	d24666efaa	Merge branch 'master' into federation-fix-database-public-key-length	2023-06-22 16:05:00 +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
Ulf Gebhardt	142ab0d678	Merge branch 'master' into more-unit-tests-frontend	2023-06-22 15:29:25 +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
Moriz Wahl	c7b940d514	Merge branch 'message-type-admin' into message-type-admin-frontend	2023-06-21 17:37:39 +02:00
ogerly	031f58651a	add stle for hidden moderator messages 2	2023-06-21 13:31:47 +02:00
ogerly	ef22cb0b67	add stle for hidden moderator messages	2023-06-21 13:30:53 +02:00
ogerly	d742697a34	add moderator messages message type, add mutation adminListContributionMessages	2023-06-21 12:24:00 +02:00
Claus-Peter Huebner	44687e6fc3	adapt existing isAdmin treatment	2023-06-21 02:08:11 +02:00
Claus-Peter Huebner	d1d9f6c050	add_user_roles migration and entity	2023-06-21 02:05:01 +02:00
Claus-Peter Huebner	5226245b86	new entity UserRole	2023-06-21 02:02:00 +02:00
Claus-Peter Huebner	63dd8587b4	define ROLE_NAMES enum	2023-06-21 01:59:22 +02:00
einhornimmond	5963ebb6a1	Merge pull request #3041 from gradido/iota3_bootstrap_hello_welt ... feat(backend): bootstrap and Hello World Test	2023-06-20 20:56:25 +02:00
mahula	2879cd79df	adaptreceive coins test to language dependency	2023-06-20 17:14:07 +02:00
mahula	aed4b26f3a	adaptreceive coins test to language dependency	2023-06-20 17:05:54 +02:00
mahula	febc18a85d	adaptreceive coins test to language dependency	2023-06-20 16:52:15 +02:00
mahula	ba7197b2e6	adaptreceive coins test to language dependency	2023-06-20 16:35:52 +02:00
Moriz Wahl	f0eae909b9	fix authentication test	2023-06-20 13:16:35 +02:00
Moriz Wahl	1e6d4cfe4b	add admin list contribution message query	2023-06-20 13:11:36 +02:00
Moriz Wahl	4d119f8911	find contribution messages helper function	2023-06-20 12:44:35 +02:00
Moriz Wahl	732560aaac	add message type arg to admin create contribution message	2023-06-20 12:11:44 +02:00
mahula	85751f43b6	fix send coins e2e test	2023-06-20 11:48:39 +02:00
Moriz Wahl	65965a2ffd	add MODERATOR contribution message type	2023-06-20 11:34:48 +02:00