879 Commits

Author	SHA1	Message	Date
ogerly	cdbd5f59b5	after remove conflicts, fix lint	2021-09-20 08:58:58 +02:00
Alexander Friedland	e8e0eb4d8d	Merge branch 'master' into 636-Display-of-Decay-in-Transaction-Details	2021-09-20 08:29:04 +02:00
ogerly	e7d925b794	transmit and receive, calculation of the decay as text: 'total'	2021-09-17 09:07:01 +02:00
Ulf Gebhardt	5038cff0bf	Merge pull request #811 from gradido/webpack_update ... webpack update	2021-09-16 18:19:40 +02:00
ogerly	00219c049e	decay calculation is calculated and displayed at the transaction in a more user-friendly way	2021-09-16 15:54:35 +02:00
Moriz Wahl	4cdbea7f99	feat: Release 1.4.0	2021-09-16 15:53:25 +02:00
Moriz Wahl	ecdeb94fc0	fix test	2021-09-16 13:37:38 +02:00
Moriz Wahl	f438012099	linting	2021-09-16 13:26:14 +02:00
Moriz Wahl	eca81883a0	Merge branch 'master' into apollo-clicktipp-connector	2021-09-16 13:21:38 +02:00
Moriz Wahl	ec12a28f81	sort locales	2021-09-16 13:19:49 +02:00
elweyn	0d0c463c48	Lint fixe remove.	2021-09-16 13:15:14 +02:00
elweyn	2b73bd3019	Changed the unsubscribed mutation since we don't need language hier.	2021-09-16 13:03:20 +02:00
Moriz Wahl	a45a2baa86	Merge pull request #809 from gradido/locale-management ... feat: Locale Management	2021-09-16 12:58:29 +02:00
elweyn	123f45c853	Merge branch '531-Newsletter-subscribe-status-change-in-user-profile' into apollo-clicktipp-connector	2021-09-16 12:18:06 +02:00
Moriz Wahl	e31b7f69f8	newsletter commit in store after login	2021-09-16 12:14:40 +02:00
Moriz Wahl	d3af552339	refactor newsletter component and tests	2021-09-16 12:13:23 +02:00
Ulf Gebhardt	e9c30a65c2	install bash & jq since they are not present on the alpine image. Install it only for test so we do not bloat our production image	2021-09-16 11:54:53 +02:00
elweyn	33d7a05f66	Initial state of store state language is null.	2021-09-16 11:25:03 +02:00
Moriz Wahl	8b16e772c1	newsletterState in store	2021-09-16 11:14:22 +02:00
elweyn	ad1aa402f4	KlickTipp subscribe and unsubscribe, merge master.	2021-09-16 10:38:08 +02:00
Moriz Wahl	3c061bcb8d	feat: Increase Coverage	2021-09-15 15:23:59 +02:00
Moriz Wahl	5c7ddb0ce4	Merge pull request #806 from gradido/refactor-pagination-buttons ... refactor: Pagination Buttons	2021-09-15 15:08:15 +02:00
ogerly	11384e4060	style fix, locale fix, all settings fix	2021-09-15 15:01:14 +02:00
Ulf Gebhardt	28ee08c819	webpack update	2021-09-15 14:34:49 +02:00
Moriz Wahl	ddb8d2aef5	use no slash	2021-09-15 13:28:23 +02:00
Moriz Wahl	1b957466c7	getting CI worklfow running	2021-09-15 13:11:22 +02:00
Moriz Wahl	aba4f4d20e	feat: Unify and Sort Locales	2021-09-15 11:58:35 +02:00
ogerly	f619a3d1dc	add BFormCheckbox switch for edit, fix test for BFormCheckbox switch	2021-09-15 07:28:44 +02:00
ogerly	8e508b7f84	add newsletter UserCard_Newsletter.vue and UserCard_Newsletter.spec.js	2021-09-15 06:22:02 +02:00
ogerly	5dd8444ca2	add newsletter settings	2021-09-14 21:35:52 +02:00
Moriz Wahl	23e3e1f007	tests for pagination buttons	2021-09-14 18:20:41 +02:00
Moriz Wahl	39fad42571	better tests for GDD Transaction List	2021-09-14 17:57:46 +02:00
Moriz Wahl	8af43bd788	bug fixes	2021-09-14 17:42:57 +02:00
Moriz Wahl	4f5ca22363	refactoring is working	2021-09-14 17:28:40 +02:00
ogerly	007c1f00d5	register and settings add components langunage fix	2021-09-14 16:40:19 +02:00
ogerly	d5a37f23b6	delete files with username	2021-09-14 16:27:49 +02:00
Moriz Wahl	7ede572f4b	refactor: Pagination Buttons	2021-09-14 16:25:14 +02:00
Moriz Wahl	0427a31790	Merge branch 'master' into 557-Switch-language-only-in-user-profile	2021-09-14 14:03:31 +02:00
Moriz Wahl	6f4d15ecf1	fix test for register.spec.js	2021-09-14 13:55:45 +02:00
ogerly	f3fbab8c6b	rechtschreibfehler behoben collapse	2021-09-14 10:43:38 +02:00
ogerly	19efb09ab9	change text gdt.action to gdt.gdt-receive	2021-09-14 10:29:40 +02:00
ogerly	6cbd798c72	remove tests in transaction.vue Move test to the back	2021-09-14 10:24:14 +02:00
ogerly	fa32b35f55	add gdtEntryType 2,3,5,6	2021-09-14 10:05:17 +02:00
Moriz Wahl	2539504ba8	Merge branch 'master' into 732-use-slots-and-templates-instead-of-if-else	2021-09-13 20:34:42 +02:00
Moriz Wahl	12a5f58376	no token in login response. token is inside response header	2021-09-13 13:30:53 +02:00
Moriz Wahl	02a962c83b	JWT is updated in frontend from response header	2021-09-13 13:04:09 +02:00
ogerly	e56ba22dcb	tests for all gdtEntryTypes	2021-09-13 11:08:06 +02:00
ogerly	25e42683f3	more tests	2021-09-13 10:43:34 +02:00
ogerly	c1bef57015	fix test register	2021-09-10 14:37:37 +02:00
ogerly	296f830f78	add form and fix test	2021-09-10 14:34:52 +02:00