5569 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Hannes Heine	1b9f432c71	Merge branch 'master' into test-admin-creation	2021-12-11 06:23:49 +01:00
Hannes Heine	1080c9d341	Merge branch 'master' into database_docker_fixes	2021-12-11 06:18:28 +01:00
Hannes Heine	508bb774de	Update Login.vue ... Correct own typo	2021-12-11 06:17:45 +01:00
ogerly	ea1352d571	more tests for Navbar.vue, yarn lint --fix	2021-12-10 19:16:53 +01:00
Alexander Friedland	d4a7ee63e0	Merge branch 'master' into Error-handling-in-GddTransactionList	2021-12-10 17:52:45 +01:00
Ulf Gebhardt	fba757228c	renamed pendingCreations into loginPendingTasksAdmin as to our naming conventions	2021-12-10 17:03:34 +01:00
ogerly	cb2c5173f1	test: renders text saying that there are no transactions	2021-12-10 15:22:36 +01:00
ogerly	0bb3b04436	remove error text for decay not found.	2021-12-10 15:22:36 +01:00
Ulf Gebhardt	a9b922505d	Merge branch 'master' into 533-Refactor-menu-remove-tim	2021-12-10 15:04:09 +01:00
Ulf Gebhardt	f752960e81	Merge pull request #1180 from gradido/fix_i18n ... fix_i18n	2021-12-10 14:51:54 +01:00
Ulf Gebhardt	83a2269a42	Update frontend/src/views/Pages/Login.vue ... Co-authored-by: Hannes Heine <heine.hannes@gmail.com>	2021-12-10 14:51:10 +01:00
Alexander Friedland	7f50f82bb5	Merge branch 'master' into Error-handling-in-GddTransactionList	2021-12-10 14:40:02 +01:00
Ulf Gebhardt	5683f4bbd3	Merge branch 'master' into fix_i18n	2021-12-10 14:39:03 +01:00
Alexander Friedland	e924948c65	Merge branch 'master' into 533-Refactor-menu-remove-tim	2021-12-10 14:38:58 +01:00
Ulf Gebhardt	8f143824c5	Merge pull request #1178 from gradido/fix_corrupted_sender_balance ... fix_corrupted_sender_balance	2021-12-10 14:38:12 +01:00
Hannes Heine	9b90b42953	Merge branch 'master' into wrong_login_is_not_password_reset	2021-12-10 12:58:31 +01:00
Alexander Friedland	04819a1156	Update frontend/src/components/Menu/Sidebar.spec.js ... Co-authored-by: Hannes Heine <heine.hannes@gmail.com>	2021-12-10 12:55:32 +01:00
Alexander Friedland	49c192ebbf	Update frontend/src/components/Menu/Sidebar.spec.js ... Co-authored-by: Hannes Heine <heine.hannes@gmail.com>	2021-12-10 12:55:19 +01:00
Alexander Friedland	0aa2154abd	Update frontend/src/components/Menu/Navbar.spec.js ... Co-authored-by: Hannes Heine <heine.hannes@gmail.com>	2021-12-10 12:55:03 +01:00
Alexander Friedland	11fc0c16e9	Update frontend/src/components/Menu/Navbar.spec.js ... Co-authored-by: Hannes Heine <heine.hannes@gmail.com>	2021-12-10 12:54:38 +01:00
Alexander Friedland	1b873dd2b9	Merge branch 'master' into fix_i18n	2021-12-10 12:53:46 +01:00
elweyn	0a3db57b7f	Remove SideBar test, side bar remove changed the dashboard-plugin	2021-12-10 12:51:22 +01:00
ogerly	47f8ce38b1	change error text for transactionCount is FALSE or undefind	2021-12-10 12:48:46 +01:00
ogerly	ae317a95db	yarn lint, yarn locales --fixed	2021-12-10 12:19:07 +01:00
ogerly	3abbb6def1	error handling gddTransactionList locales fixed	2021-12-10 12:17:49 +01:00
ogerly	1d2fc1a9f4	error handling icon, text and position	2021-12-10 12:10:47 +01:00
elweyn	cb3c600216	Adding decay calculation to the creation.	2021-12-10 12:10:38 +01:00
elweyn	40dff50364	state-balance balanceDate can't get the date of the last transaction cause creation is a new transaction.	2021-12-10 11:54:00 +01:00
ogerly	e91314f695	merge master	2021-12-10 11:00:37 +01:00
ogerly	118dd886b8	test for reactivitat DashboardLayout_gdd.spec.js	2021-12-10 10:26:24 +01:00
ogerly	7cbafbdee3	test props elopageUri	2021-12-10 10:08:06 +01:00
Hannes Heine	9b36c4db46	Merge branch 'master' into fix_corrupted_sender_balance	2021-12-10 10:05:36 +01:00
ogerly	b874abb4f8	getElopageLink to data and props elopageUri	2021-12-10 10:03:53 +01:00
Hannes Heine	4aaaec18c6	Merge pull request #1181 from gradido/fix-state-user-transaction-handling ... Withdrew * 10000 and / 10000 since we need to store the full value.	2021-12-10 09:51:10 +01:00
ogerly	d6b32b6ba5	remove target text from b-navbar-toggle, yarn lint --fix	2021-12-10 09:40:56 +01:00
ogerly	0fff9798e1	yarn lint --fix	2021-12-10 09:37:17 +01:00
ogerly	b9b28a37a3	sidebar test all navbar-items	2021-12-10 09:36:48 +01:00
ogerly	057debeee8	navbar test all navbar-items	2021-12-10 09:33:44 +01:00
elweyn	56dd218ee2	Fix updatePendingCreation amount that is send back.	2021-12-10 09:14:22 +01:00
ogerly	152d0db542	navbar brand add click visible = false	2021-12-10 09:09:42 +01:00
elweyn	9eb4e8603a	Withdrew * 10000 and / 10000 since we need to store the full value.	2021-12-10 09:08:54 +01:00
ogerly	7f92621361	router-link remove to b-link in navbar	2021-12-10 09:04:54 +01:00
ogerly	63ce5c4b93	yarn test DashboardLayout_gdd.spec.js	2021-12-10 08:33:31 +01:00
ogerly	14c6e11d8b	yarn lint --fix	2021-12-10 08:20:19 +01:00
ogerly	9425f7ad99	remove componente status from sendformular	2021-12-10 08:17:25 +01:00
ogerly	5e2bb9bf25	amount in send formular	2021-12-10 08:16:54 +01:00
ogerly	96f03ebf34	navbar color and size by :hover	2021-12-10 08:01:04 +01:00
ogerly	4b05e55d72	navbar collaps box-shadow to grey	2021-12-10 07:51:59 +01:00
ogerly	2c7ab38f39	add area icons in sidebar edit profil	2021-12-10 07:49:49 +01:00
ogerly	8582d554f0	add area icons in sidebar	2021-12-10 07:48:13 +01:00