6203 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Alexander Friedland	4e1d4ac9ee	Merge branch 'master' into klicktipp_config	2022-01-27 10:25:01 +01:00
elweyn	d938814f1a	Check if user account is not disabled to make a creation.	2022-01-27 10:24:03 +01:00
Ulf Gebhardt	96025adfeb	Merge branch 'master' into 996-ReleasePlan_V1.6.0	2022-01-27 10:15:29 +01:00
Alexander Friedland	b22983c38c	Merge branch 'master' into 1351-form-to-create-incorrect-due-to-change-of-bootstrap-version	2022-01-27 10:14:46 +01:00
Alexander Friedland	9410e250f3	Merge pull request #1354 from gradido/1353-Rechtschreibfehler-beheben ... Rechtschreibfehler behoben, entgültig zu endgültig	2022-01-27 10:14:29 +01:00
Ulf Gebhardt	86bac9d415	Merge branch 'master' into 996-ReleasePlan_V1.6.0	2022-01-27 10:09:45 +01:00
ogerly	7d596651fa	Rechtschreibfehler behoben, entgültig zu endgültig	2022-01-27 09:33:29 +01:00
ogerly	9861148e75	style change EditCreationFormular.vue for bootstrap4	2022-01-27 09:02:53 +01:00
ogerly	14efa9f072	yarn lint fix for CreationFormular.vue	2022-01-27 08:59:52 +01:00
ogerly	e65e5078f9	style change CreationFormular.vue for bootstrap4	2022-01-27 08:58:43 +01:00
ogerly	74fe726214	bootstrap version swapped from 5 to 4	2022-01-27 08:16:16 +01:00
Claus-Peter Hübner	18e1d1c224	first draft of releaseplan	2022-01-27 02:34:06 +01:00
Ulf Gebhardt	cc78849a46	typo	2022-01-27 01:30:57 +01:00
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
Moriz Wahl	409280316c	refactor edit compoenents form and test it	2022-01-26 18:20:25 +01:00
Moriz Wahl	50062f2415	Merge branch 'fix-creation-confirmation' into localize-datetime-admin	2022-01-26 16:32:34 +01:00
Moriz Wahl	7cebada816	Merge branch 'master' into localize-datetime-admin	2022-01-26 16:30:43 +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
Moriz Wahl	56577cfe9c	Merge branch 'master' into localize-datetime-admin	2022-01-26 13:19:57 +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
Moriz Wahl	dd7b95b9af	create radio buttons in mixin	2022-01-25 17:25:58 +01:00
Moriz Wahl	daa8684cc6	remove unused data	2022-01-25 17:15:18 +01:00
Moriz Wahl	57f4231ec3	change fetch policy	2022-01-25 17:03:24 +01:00
Ulf Gebhardt	8b8213a3b7	try some docker compose fixes	2022-01-25 16:50:06 +01:00