11611 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Ulf Gebhardt	fa5b7e6b81	Merge branch 'master' into dissolve_admin_resolver ... # Conflicts: # backend/src/graphql/resolver/TransactionResolver.ts # backend/src/graphql/resolver/UserResolver.test.ts # backend/src/graphql/resolver/UserResolver.ts	2022-11-29 06:15:31 +01:00
clauspeterhuebner	bbb0a7cf98	Merge branch 'master' into 2420-feature-federation-implement-exchange-of-api-versions-persist-in-table	2022-11-29 01:35:02 +01:00
clauspeterhuebner	4c3847e68f	Merge pull request #2201 from gradido/2179-bug-wrong-month-for-contribution-near-turn-of-month ... fix(backend): wrong month for contribution near turn of month	2022-11-29 01:33:58 +01:00
clauspeterhuebner	1e4d922c88	Merge branch 'master' into 2179-bug-wrong-month-for-contribution-near-turn-of-month	2022-11-29 01:06:14 +01:00
Claus-Peter Hübner	0ef185e70f	changes after merge with master	2022-11-29 00:37:52 +01:00
Claus-Peter Hübner	5b4aa35688	Merge remote-tracking branch 'origin/master' into ... 2420-feature-federation-implement-exchange-of-api-versions-persist-in-table	2022-11-29 00:28:33 +01:00
Claus-Peter Hübner	10d79e061d	exchange CommunityApiList per DHT.socket and store/update it in database	2022-11-29 00:19:50 +01:00
Claus-Peter Hübner	7fb88736fb	add community entity	2022-11-29 00:18:04 +01:00
Claus-Peter Hübner	87af3f6b88	shift enum in index.ts	2022-11-29 00:17:23 +01:00
Claus-Peter Hübner	3a17a3491b	correct publicKey length and table name of entity	2022-11-29 00:15:36 +01:00
joseji	e350307e6a	removing keys and passphrases	2022-11-28 23:59:57 +01:00
clauspeterhuebner	f2380c6dfa	Merge pull request #2374 from gradido/2367-feature-add-federation-configs ... feat(backend): add federation config properties	2022-11-28 22:56:35 +01:00
clauspeterhuebner	0d9b759bea	Update deployment/bare_metal/.env.dist ... set federation diabled as default Co-authored-by: Ulf Gebhardt <ulf.gebhardt@webcraft-media.de>	2022-11-28 15:09:00 +01:00
clauspeterhuebner	b297e81787	Merge branch 'master' into 2367-feature-add-federation-configs	2022-11-28 15:07:31 +01:00
Wolfgang Huß	dc7957a0fb	Merge branch 'master' of github.com:gradido/gradido into 2392-refactor-more-emails-to-translatables ... # Conflicts: # backend/src/util/utilities.ts	2022-11-28 11:22:25 +01:00
Wolfgang Huß	4ae96a2213	Translate 'Gradido (nicht antworten)'	2022-11-28 11:13:04 +01:00
Wolfgang Huß	3b47330c92	Remove remainders of old untranslated emails	2022-11-28 11:05:12 +01:00
Wolfgang Huß	93e3562318	Remove old untranslated email 'sendTransactionReceivedEmail'	2022-11-28 11:04:34 +01:00
Wolfgang Huß	9894b02f51	Test 'sendTransactionReceivedEmail'	2022-11-28 10:54:31 +01:00
Wolfgang Huß	3903e29e16	Refactor 'sendTransactionReceivedEmail' email to HTML and translatable	2022-11-28 10:54:10 +01:00
Wolfgang Huß	0cccdb56de	Test that 'sendEmailTranslated' on 'CONFIG.EMAIL_TEST_MODUS = true' replaces the receiver with by the fake test mail accaount	2022-11-28 09:38:19 +01:00
Ulf Gebhardt	7bc99a86dc	Merge pull request #2385 from gradido/jest_is_dev_depenency ... fix(backend): moved all jest & type-definition related packages into the `devDependencies` section	2022-11-27 00:18:55 +01:00
Ulf Gebhardt	71b1d409b9	Merge branch 'master' into jest_is_dev_depenency	2022-11-27 00:05:22 +01:00
Wolfgang Huß	2b65c6b261	Remove old untranslated email 'sendTransactionLinkRedeemedEmail'	2022-11-26 15:45:41 +01:00
Wolfgang Huß	699daa8eec	Test 'sendTransactionLinkRedeemedEmail'	2022-11-26 15:43:44 +01:00
Wolfgang Huß	224613f6d4	Refactor 'sendTransactionLinkRedeemedEmail' email to HTML and translatable	2022-11-26 15:42:44 +01:00
Moriz Wahl	45d58fe6e5	Merge pull request #2425 from gradido/v1.15.0 ... chore(release): v1.15.0	2022-11-26 13:16:36 +01:00
Wolfgang Huß	4b097f6f66	Add line ends to all 'subject.pug' files	2022-11-26 12:59:06 +01:00
Ulf Gebhardt	2caf0ee664	v1.15.0	2022-11-26 01:14:24 +01:00
Moriz Wahl	9556e196ab	Merge pull request #2423 from gradido/fix-balance-migration ... fix(database): wrong balance and decay values	2022-11-25 18:22:06 +01:00
Claus-Peter Hübner	c3971222f0	first draft on sending List of apiVersion per socket	2022-11-25 17:55:01 +01:00
Claus-Peter Hübner	3fba096682	define ApiVersion enum	2022-11-25 17:54:22 +01:00
Claus-Peter Hübner	e7f523f20f	add new config property	2022-11-25 17:53:58 +01:00
Ulf Gebhardt	48365c7bb3	Merge branch 'master' into 2367-feature-add-federation-configs	2022-11-25 17:53:48 +01:00
Claus-Peter Hübner	932c5f5133	add new config property	2022-11-25 17:53:30 +01:00
Claus-Peter Hübner	e3fa8012ab	create new communities table and entity	2022-11-25 17:52:56 +01:00
Ulf Gebhardt	2c3cac5939	Merge branch 'master' into fix-balance-migration	2022-11-25 17:48:28 +01:00
mahula	06fd7c9b9a	disable submit button of contribution messages formular until submit request is finished in wallet	2022-11-25 17:41:04 +01:00
mahula	84613af035	disable submit button of contribution messages formular until submit request is finished	2022-11-25 17:38:25 +01:00
Moriz Wahl	bd49a1e80d	Merge pull request #2422 from gradido/fix-wrong-balance ... fix(backend): wrong balance after transaction receive	2022-11-25 15:19:31 +01:00
Moriz Wahl	aa1a88bc11	Merge branch 'master' into fix-wrong-balance	2022-11-25 14:44:39 +01:00
Moriz Wahl	9253706513	remove comment	2022-11-25 14:32:23 +01:00
Moriz Wahl	62c48712a4	fix misspelled text	2022-11-25 14:32:12 +01:00
Ulf Gebhardt	bc0cbfe2f7	lint fix	2022-11-25 14:24:47 +01:00
Ulf Gebhardt	1ea8eb1815	create log folder	2022-11-25 14:23:47 +01:00
Ulf Gebhardt	0f71a486a5	log affected accounts & some fixes	2022-11-25 14:13:22 +01:00
Claus-Peter Hübner	89283fa3da	rework PR comments	2022-11-25 04:08:01 +01:00
Ulf Gebhardt	4bb82f2933	Merge branch 'master' into jest_is_dev_depenency	2022-11-25 03:42:17 +01:00
Claus-Peter Hübner	9395b5a0ba	resolve conflicts	2022-11-25 03:11:14 +01:00
Claus-Peter Hübner	efa46f50f3	resolve conflicts	2022-11-25 03:09:54 +01:00