11611 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Ulf Gebhardt	ac578b3f10	Merge branch 'master' into dissolve_admin_resolver	2022-12-01 21:45:19 +01:00
Moriz Wahl	2caa0ad4c9	Merge branch 'master' into 2285-mark-creation-via-link	2022-12-01 18:46:24 +01:00
Moriz Wahl	d3678bb81c	feat(backend): log client timezone offset	2022-12-01 17:44:56 +01:00
Moriz Wahl	caa16c0488	insert correct email id	2022-12-01 17:36:17 +01:00
Moriz Wahl	fed61bf888	kack typescript	2022-12-01 17:16:56 +01:00
Moriz Wahl	251f87554c	kack typescript	2022-12-01 17:14:44 +01:00
Moriz Wahl	345123af11	add user contact for missing users	2022-12-01 17:10:35 +01:00
Moriz Wahl	ed3a76dfdc	update database version	2022-12-01 16:56:24 +01:00
Moriz Wahl	c5f4e95847	fix(database): create missing users for transactions	2022-12-01 16:54:48 +01:00
Moriz Wahl	54c1786406	Merge branch 'master' into consistent-user-contacts-table	2022-12-01 16:21:53 +01:00
Moriz Wahl	e458a7dd8d	Merge pull request #2452 from gradido/fix-jest-run-all-timeers ... fix(backend): run all timers for high values	2022-12-01 16:21:37 +01:00
Moriz Wahl	41495c2c65	fix(backend): run all timers for high values	2022-12-01 15:53:09 +01:00
elweyn	0b2887b86f	Correct joins between contribution and transaction	2022-12-01 15:21:49 +01:00
Moriz Wahl	7f1e69c1bd	update database version	2022-12-01 14:52:08 +01:00
Moriz Wahl	4a27fa07f0	fix(database): consistent deleted at bewteen users and user contacts	2022-12-01 14:49:56 +01:00
elweyn	ec396e8521	Merge master.	2022-12-01 12:45:15 +01:00
elweyn	96fd4cb14c	Merge branch 'master' into 2285-mark-creation-via-link	2022-12-01 12:07:52 +01:00
elweyn	46014adc6d	Database join contribution to transaction table, add new join to query.	2022-12-01 12:07:25 +01:00
Claus-Peter Hübner	f7a7049e99	linting	2022-12-01 01:04:29 +01:00
Claus-Peter Hübner	783f81a410	remove the test-code for pure update against insert on duplicate key ... update	2022-12-01 00:32:22 +01:00
Claus-Peter Hübner	52d2c546db	Merge remote-tracking branch 'origin/master' into 2420-feature-federation-implement-exchange-of-api-versions-persist-in-table	2022-12-01 00:27:31 +01:00
Claus-Peter Hübner	7ab8922e33	rework PR comments	2022-12-01 00:26:46 +01:00
Moriz Wahl	a91158a963	Merge pull request #2443 from gradido/fix-negative-amount-on-send-coins ... fix(backend): critical bug	2022-11-30 20:40:59 +01:00
Moriz Wahl	272c7ee491	Merge branch 'master' into fix-negative-amount-on-send-coins	2022-11-30 18:04:26 +01:00
Ulf Gebhardt	37ffbd28b3	Merge branch 'master' into dissolve_admin_resolver	2022-11-30 17:19:02 +01:00
Ulf Gebhardt	bed31ab3ec	Merge pull request #2442 from gradido/fix_docker_production_build ... fix(other): missing files for docker production build	2022-11-30 17:18:29 +01:00
Moriz Wahl	796f5af2c6	remove unused function, count resent by admin	2022-11-30 14:45:02 +01:00
Moriz Wahl	bbd163f1e0	integrate export const checkEmailVerificationCode = async (	2022-11-30 14:34:09 +01:00
Moriz Wahl	10781b2e6b	Merge branch 'master' into test-validation-of-optin-codes	2022-11-30 14:15:21 +01:00
Moriz Wahl	bc20bfa8f6	fix(backend): delete / undelete email contact as well	2022-11-30 12:46:46 +01:00
Moriz Wahl	c0096aa26c	fix(backend): critical bug	2022-11-30 12:15:47 +01:00
Claus-Peter Hübner	6c043a0eb0	rework PR comments	2022-11-30 01:57:40 +01:00
Claus-Peter Hübner	0bb0d40300	Merge branch '2420-feature-federation-implement-exchange-of-api-versions-persist-in-table' of github.com:gradido/gradido into 2420-feature-federation-implement-exchange-of-api-versions-persist-in-table	2022-11-30 00:38:10 +01:00
Claus-Peter Hübner	0657753826	Merge remote-tracking branch 'origin/master' into 2420-feature-federation-implement-exchange-of-api-versions-persist-in-table	2022-11-30 00:36:40 +01:00
Claus-Peter Hübner	8db3c0f9d6	rework PR comments	2022-11-30 00:35:50 +01:00
Ulf Gebhardt	2db6329a46	Merge branch 'master' into fix_docker_production_build	2022-11-29 23:45:54 +01:00
Ulf Gebhardt	10ad42babe	missing files to be copied	2022-11-29 16:37:25 +01:00
Wolfgang Huß	84b5479610	Merge branch 'master' of github.com:gradido/gradido into 2392-refactor-more-emails-to-translatables	2022-11-29 14:21:50 +01:00
Wolfgang Huß	317224db7a	Refactor some readme's by moving their content into 'CONTRIBUTING.md'	2022-11-29 14:09:15 +01:00
Wolfgang Huß	a7ee30fc3f	Fix some comments and readme spellings	2022-11-29 13:42:37 +01:00
Wolfgang Huß	3d55c7da9e	Fix production by copying missing email templates and locale files into the build folder	2022-11-29 13:41:42 +01:00
Wolfgang Huß	88cae0e528	Move email '*.pug' templates in 'templates' folder	2022-11-29 13:40:08 +01:00
joseji	7fe7b98dfe	removing non necessary functions	2022-11-29 13:10:33 +01:00
joseji	81f6066754	removed unused code	2022-11-29 13:06:17 +01:00
joseji	7e78f1c893	migration fixed	2022-11-29 13:03:10 +01:00
mahula	e00fe51017	Merge pull request #2424 from gradido/2342-bug-moderators-can-send-messages-twice-by-clicking-fast ... fix(frontend): in contribution messages formular a message can be send twice, when clicking the submit button fast	2022-11-29 11:36:41 +01:00
mahula	b662f957b4	Merge branch 'master' into 2342-bug-moderators-can-send-messages-twice-by-clicking-fast	2022-11-29 11:06:19 +01:00
mahula	403e68480c	change variable name to our standard naming	2022-11-29 11:05:26 +01:00
Wolfgang Huß	8afe0aaf3b	Merge branch 'master' of github.com:gradido/gradido into 2392-refactor-more-emails-to-translatables	2022-11-29 07:58:17 +01:00
Ulf Gebhardt	7f9190f276	lint fix	2022-11-29 06:31:57 +01:00