5866 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Ulf Gebhardt	795c99e641	flame hannes	2022-01-27 01:24:58 +01:00
Ulf Gebhardt	61c9073712	update configs and parameterize klicktipp options	2022-01-27 01:24:51 +01:00
elweyn	afbc52c2aa	Implemented a method to add back the summ to the creations array.	2022-01-26 20:10:11 +01:00
Hannes Heine	f31b26c89c	Merge branch 'master' into fix-creation-confirmation	2022-01-26 15:59:57 +01:00
Hannes Heine	c27d43a219	Merge branch 'master' into 1330-EditCreationFormular-update-date	2022-01-26 15:59:25 +01:00
elweyn	190038eaa1	fix updatePendingCreation method logic, now it checks if the updated datas are allowed so that no user can get more than 1000 GDD per month.	2022-01-26 15:54:19 +01:00
Alexander Friedland	3942c18888	Merge branch 'master' into 1342-New-standard-text-for-Creations	2022-01-26 15:51:15 +01:00
Alexander Friedland	ee4f2a8d62	Update admin/src/locales/de.json ... Co-authored-by: Hannes Heine <heine.hannes@gmail.com>	2022-01-26 15:50:50 +01:00
Ulf Gebhardt	4e64a1eb11	Merge pull request #1341 from gradido/production_deployment ... production_deployment	2022-01-26 15:39:51 +01:00
Moriz Wahl	8af325d3d0	more compact code	2022-01-26 15:17:53 +01:00
Ulf Gebhardt	1324da1fe5	fix collate conversion due to inconsistencies with encoding	2022-01-26 15:13:54 +01:00
Moriz Wahl	eb2d2a0d3d	fix typo	2022-01-26 15:13:12 +01:00
Moriz Wahl	1c833d394f	fix and improve test	2022-01-26 15:06:37 +01:00
Moriz Wahl	43d811e2fa	fix: Creation Confirmation User Ids	2022-01-26 14:31:13 +01:00
ogerly	d13b8d0033	change standard text für cration	2022-01-26 12:05:16 +01:00
Ulf Gebhardt	1c36192a65	install curl in correct order ... note on the error of nginx ssl setup include install command for logrotate even tho its currently installed by default on debian 11	2022-01-26 00:52:58 +01:00
Ulf Gebhardt	e222d10600	change directory correctly	2022-01-26 00:50:38 +01:00
Ulf Gebhardt	c595c47d90	Merge pull request #1324 from gradido/import_production_data ... import_production_data	2022-01-25 22:23:09 +01:00
Ulf Gebhardt	ab584c7250	reduced backend coverage, renamed test file apropriatly	2022-01-25 22:14:37 +01:00
Ulf Gebhardt	869d9e303d	disabled UserResolver.test	2022-01-25 22:06:29 +01:00
Ulf Gebhardt	42984772c5	try target test_up	2022-01-25 21:57:55 +01:00
Ulf Gebhardt	6f6ba3a2e9	try to adjust jest config	2022-01-25 21:48:45 +01:00
Ulf Gebhardt	2a48133790	corrected typo, ... build database in test environment explicitly as production_up	2022-01-25 21:39:11 +01:00
Ulf Gebhardt	61bb14ac7c	dont start database in test.yml	2022-01-25 21:30:10 +01:00
Ulf Gebhardt	936161d998	docker file	2022-01-25 18:59:52 +01:00
Ulf Gebhardt	ae84907f5c	try limit stuff to be copied from src. ... reimplement reset hack	2022-01-25 18:27:02 +01:00
Ulf Gebhardt	ed105b8e7c	try copying src folder aswell	2022-01-25 18:15:37 +01:00
Ulf Gebhardt	8a9fc846f5	try copying mnemonic files in dist as solution	2022-01-25 17:59:50 +01:00
Ulf Gebhardt	a424bb8fee	try this - no database restarting what so ever	2022-01-25 17:33:33 +01:00
Ulf Gebhardt	8b8213a3b7	try some docker compose fixes	2022-01-25 16:50:06 +01:00
Ulf Gebhardt	b423773391	work with sleep again	2022-01-25 16:31:48 +01:00
Ulf Gebhardt	752c5cf62f	actually run database in test workflow	2022-01-25 16:19:44 +01:00
Ulf Gebhardt	087df935b6	sleep a bit to wait for database to finish migrations	2022-01-25 16:10:22 +01:00
Ulf Gebhardt	a6bcd5d796	Merge branch 'master' into import_production_data	2022-01-25 13:57:47 +01:00
Alexander Friedland	0e515d9e7b	Merge pull request #1339 from gradido/1338-GDT-Value-is-divided-by-100 ... remove division / 100 for GDT	2022-01-25 13:49:06 +01:00
ogerly	c51758e597	remove division / 100 for GDT	2022-01-25 10:38:47 +01:00
Ulf Gebhardt	d12017cfcc	also use hexblobs in restore.sh	2022-01-25 01:04:04 +01:00
Ulf Gebhardt	71227d8505	simplify query (thanks @hannes)	2022-01-25 00:50:27 +01:00
Ulf Gebhardt	ce16c54897	integrity test example	2022-01-25 00:50:27 +01:00
Ulf Gebhardt	be295d3fe1	also parameterize the gdt api url	2022-01-25 00:50:26 +01:00
Ulf Gebhardt	92a71cb97a	remove timezone change from setup.md	2022-01-25 00:49:54 +01:00
Ulf Gebhardt	707d4ea489	removed console logs	2022-01-25 00:49:54 +01:00
Ulf Gebhardt	1110a6fdef	minor changes + console logs for sending to debug the stage2 instance	2022-01-25 00:49:54 +01:00
Ulf Gebhardt	bf7a0f14ce	setup include timezone setup - production needs Europe/Berlin	2022-01-25 00:49:54 +01:00
Ulf Gebhardt	0aa9b920ac	changed suggested file for import_production since the old data was corrupt	2022-01-25 00:49:54 +01:00
Ulf Gebhardt	9f72ea23bc	update required db version	2022-01-25 00:49:54 +01:00
Ulf Gebhardt	0d1bb496d5	removed console and have better comments	2022-01-25 00:49:54 +01:00
Ulf Gebhardt	1da3be6863	comment and cleanp	2022-01-25 00:49:54 +01:00
Ulf Gebhardt	8fb1be64fb	formating	2022-01-25 00:49:54 +01:00
Ulf Gebhardt	6f4a04c015	comments and also check for email confirmed	2022-01-25 00:49:54 +01:00