6224 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Moriz Wahl	cfee6d64be	Merge branch 'master' into fix-creation-confirmation	2022-01-27 13:17:26 +01:00
Ulf Gebhardt	08ce77e4cc	Merge pull request #1357 from gradido/v1.6.0 ... v1.6.0	2022-01-27 11:54:15 +01:00
Ulf Gebhardt	17945b1645	v1.6.0	2022-01-27 11:44:53 +01:00
Alexander Friedland	b7a4b43f43	Merge branch 'master' into 1342-New-standard-text-for-Creations	2022-01-27 11:42:11 +01:00
Hannes Heine	0ed79cdb54	Merge pull request #1346 from gradido/1330-EditCreationFormular-update-date ... fix updatePendingCreation method	2022-01-27 11:41:29 +01:00
Ulf Gebhardt	b8ab335ba5	Merge branch 'master' into 1330-EditCreationFormular-update-date	2022-01-27 11:32:29 +01:00
ogerly	648023e95c	yarn test fixed	2022-01-27 11:18:53 +01:00
ogerly	05a4e23354	if email unconfirmed then no button for creation	2022-01-27 11:18:53 +01:00
elweyn	6c81673a4b	Update creations of a user only if the old pending creation has the same month as the updated month. Throw exception before end of file.	2022-01-27 11:04:32 +01:00
Ulf Gebhardt	c7c011879b	Merge branch 'master' into fix-creation-for-not-checked-email	2022-01-27 11:03:27 +01:00
Ulf Gebhardt	77b9bd5d61	Merge pull request #1348 from gradido/klicktipp_config ... klicktipp_config	2022-01-27 10:57:44 +01:00
Ulf Gebhardt	5dfc3eb9a7	Merge branch 'master' into klicktipp_config	2022-01-27 10:46:11 +01:00
Alexander Friedland	98d048c565	Merge pull request #1352 from gradido/1351-form-to-create-incorrect-due-to-change-of-bootstrap-version ... 1351 form to create incorrect due to change of bootstrap version	2022-01-27 10:45:50 +01:00
elweyn	2f65ee8d9f	Merge branch 'fix-creation-for-not-checked-email' of https://github.com/gradido/gradido into fix-creation-for-not-checked-email	2022-01-27 10:38:48 +01:00
elweyn	9e4d2498ca	Throw exception before continuing the bussiness logic.	2022-01-27 10:38:35 +01:00
Hannes Heine	69bf5bf7e3	Merge branch 'master' into fix-creation-for-not-checked-email	2022-01-27 10:34:37 +01:00
elweyn	a12378ed8b	Checks if User has activated his Email before saving a open creation.	2022-01-27 10:33:06 +01:00
Alexander Friedland	e4900e03a5	Merge branch 'master' into 1330-EditCreationFormular-update-date	2022-01-27 10:31:17 +01:00
Ulf Gebhardt	e814b79e3a	Merge branch 'master' into 1351-form-to-create-incorrect-due-to-change-of-bootstrap-version	2022-01-27 10:30:05 +01:00
Ulf Gebhardt	a980ec0cd5	Merge branch 'master' into klicktipp_config	2022-01-27 10:29:46 +01:00
Ulf Gebhardt	12d923c980	Merge pull request #1349 from gradido/996-ReleasePlan_V1.6.0 ... first draft of releaseplan	2022-01-27 10:27:24 +01:00
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