9838 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Moriz Wahl	ca48218d33	Merge pull request #2136 from gradido/update-contributions-table ... feat: Migrate Contributions Table	2022-08-16 11:22:12 +02:00
Wolfgang Huß	68031d5401	Merge branch 'master' into update-contributions-table	2022-08-16 11:08:31 +02:00
Wolfgang Huß	bc9db6b37b	Merge pull request #2092 from gradido/2091-refactor-contribution-form-logic-and-write-tests ... chore: 🍰 Refactor Contribution Form Logic And Write Tests	2022-08-16 11:02:00 +02:00
Wolfgang Huß	7e912be184	Merge branch 'master' into 2091-refactor-contribution-form-logic-and-write-tests	2022-08-16 08:48:10 +02:00
Moriz Wahl	f2f8989746	save contribution when setting status DELETED before softDelete	2022-08-15 19:06:59 +02:00
Moriz Wahl	c417bc7a10	add contribution status enum and set it	2022-08-15 19:02:06 +02:00
Moriz Wahl	daa8d48ca6	add contribution type enum and set contribution type on creation	2022-08-15 18:50:25 +02:00
Moriz Wahl	cc2cc93b60	update db entity for contributions	2022-08-15 18:38:50 +02:00
Moriz Wahl	d4150f123c	update db version	2022-08-15 18:32:50 +02:00
Moriz Wahl	d83024cb51	feat: Add status, type, denied_at and denied_by to contributions Table	2022-08-15 18:31:42 +02:00
Hannes Heine	eed210dc9e	Merge pull request #2107 from gradido/2105-add-emailChecked-to-opt-in-check ... fix: 🍰 Add `emailChecked` Before Changing `optIn` State & Log Error On klicktipp Middleware	2022-08-12 12:25:53 +02:00
Hannes Heine	d4cd6c2b30	Update klicktippMiddleware.ts ... Change log level from info to error	2022-08-11 15:07:48 +02:00
Wolfgang Huß	df0f3e21b6	Reduce comment to a minimal	2022-08-11 15:05:43 +02:00
Hannes Heine	ad9202efed	Update backend/src/middleware/klicktippMiddleware.ts ... Co-authored-by: Moriz Wahl <moriz.wahl@gmx.de>	2022-08-11 14:57:17 +02:00
Hannes Heine	24ce920ecc	Merge branch 'master' into 2105-add-emailChecked-to-opt-in-check	2022-08-11 14:56:36 +02:00
Wolfgang Huß	774e8e1f2f	Merge branch 'master' of github.com:gradido/gradido into 2091-refactor-contribution-form-logic-and-write-tests	2022-08-11 14:17:26 +02:00
Wolfgang Huß	50fd74bb6a	Remove tests of disabled cancel button, because they are always enabled yet	2022-08-11 14:14:47 +02:00
Hannes Heine	10ad232a47	Merge pull request #2123 from gradido/2117-list-contribution-links-for-all-users ... Add RIGHTS.LIST_CONTRIBUTION_LINKS to ROLE_USER	2022-08-11 11:35:41 +02:00
Hannes Heine	186eaf238a	Merge branch 'master' into 2117-list-contribution-links-for-all-users	2022-08-11 11:17:29 +02:00
Wolfgang Huß	ef8c8619f3	Merge branch 'master' of github.com:gradido/gradido into 2091-refactor-contribution-form-logic-and-write-tests	2022-08-11 11:16:21 +02:00
Wolfgang Huß	9d5325c199	Fix date tests ... Co-Authored-By: elweyn <heine.hannes@gmail.com>	2022-08-11 11:12:55 +02:00
Alexander Friedland	cd28695844	Merge pull request #2122 from gradido/2121-Translate-locales-to-Spanish ... 2121 translate locales to spanish	2022-08-11 10:58:52 +02:00
Wolfgang Huß	59f415bd0a	Add some comments for trying to fullfil Moriz suggestion	2022-08-11 08:50:40 +02:00
Wolfgang Huß	24c763c00f	Remove comments in favor of an issue	2022-08-10 16:54:51 +02:00
Moriz Wahl	f98f38773d	fix missing translations	2022-08-10 15:57:30 +02:00
Moriz Wahl	6d2cbfbab1	add number and date formats for locale es	2022-08-10 15:57:13 +02:00
Wolfgang Huß	2aff9d7f41	Merge branch 'master' of github.com:gradido/gradido into 2091-refactor-contribution-form-logic-and-write-tests ... # Conflicts: # frontend/src/components/Contributions/ContributionForm.vue	2022-08-10 14:39:25 +02:00
Alexander Friedland	6ee5734499	Update frontend/src/locales/es.json ... Co-authored-by: Moriz Wahl <moriz.wahl@gmx.de>	2022-08-09 14:26:10 +02:00
Alexander Friedland	a72c6cc827	Update frontend/src/locales/es.json ... Co-authored-by: Moriz Wahl <moriz.wahl@gmx.de>	2022-08-09 14:25:38 +02:00
Alexander Friedland	dce0038169	Update frontend/src/locales/es.json ... Co-authored-by: Moriz Wahl <moriz.wahl@gmx.de>	2022-08-09 14:25:29 +02:00
Alexander Friedland	200af0ebd7	Update frontend/src/locales/es.json ... Co-authored-by: Moriz Wahl <moriz.wahl@gmx.de>	2022-08-09 14:25:09 +02:00
Alexander Friedland	81fd9910aa	Update frontend/src/locales/es.json ... Co-authored-by: Moriz Wahl <moriz.wahl@gmx.de>	2022-08-09 14:24:56 +02:00
Alexander Friedland	99d23990dd	Update frontend/src/locales/es.json ... Co-authored-by: Moriz Wahl <moriz.wahl@gmx.de>	2022-08-09 14:24:07 +02:00
Alexander Friedland	36e86438b1	Update frontend/src/locales/es.json ... Co-authored-by: Moriz Wahl <moriz.wahl@gmx.de>	2022-08-09 14:23:57 +02:00
Alexander Friedland	05fb34fc80	Update frontend/src/locales/es.json ... Co-authored-by: Moriz Wahl <moriz.wahl@gmx.de>	2022-08-09 14:23:45 +02:00
Alexander Friedland	262bde615c	Update frontend/src/locales/es.json ... Co-authored-by: Moriz Wahl <moriz.wahl@gmx.de>	2022-08-09 14:23:35 +02:00
Alexander Friedland	a1a103bb6d	Update frontend/src/locales/es.json ... Co-authored-by: Moriz Wahl <moriz.wahl@gmx.de>	2022-08-09 14:23:14 +02:00
Alexander Friedland	7e94822d94	Update frontend/src/locales/es.json ... Co-authored-by: Moriz Wahl <moriz.wahl@gmx.de>	2022-08-09 14:23:01 +02:00
Alexander Friedland	08b439a53d	Update frontend/src/locales/es.json ... Co-authored-by: Moriz Wahl <moriz.wahl@gmx.de>	2022-08-09 14:22:47 +02:00
Alexander Friedland	506ba5b625	Update frontend/src/locales/es.json ... Co-authored-by: Moriz Wahl <moriz.wahl@gmx.de>	2022-08-09 14:22:36 +02:00
ogerly	0284ecb926	add missing values	2022-08-09 08:54:04 +02:00
Alexander Friedland	1b012365f1	Merge branch 'master' into 2121-Translate-locales-to-Spanish	2022-08-08 20:02:55 +02:00
Alexander Friedland	eed27a82d5	Merge pull request #2115 from gradido/2112-Thousand-separator-problem ... add formatter on input amount replace point and comma	2022-08-08 17:08:16 +02:00
ogerly	3a2f27f519	refactor amount to string in ContributionForm, fix thousand error	2022-08-08 16:57:14 +02:00
ogerly	1fbea40c4d	remove regex	2022-08-08 15:27:42 +02:00
Alexander Friedland	adef450bd0	Update ContributionForm.vue	2022-08-08 15:24:50 +02:00
Alexander Friedland	dbbec33f73	Merge branch 'master' into 2112-Thousand-separator-problem	2022-08-08 15:11:58 +02:00
Alexander Friedland	5273edace6	Merge branch 'master' into 2121-Translate-locales-to-Spanish	2022-08-08 15:11:48 +02:00
Alexander Friedland	2548a4f38f	Merge pull request #2114 from gradido/2113-Delete-textarea-info-message ... remove required from form.memo	2022-08-08 15:11:02 +02:00
Wolfgang Huß	b21f52c945	Refactor 'isThisMonth' and 'minimalDate' as well as replace 'lastMonthObject' and 'thisMonthObject' by 'textForMonth'	2022-08-08 14:45:34 +02:00