10160 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Alexander Friedland	5847f723c6	Merge branch 'master' into refactor_arithmetic_merge	2022-03-07 16:18:45 +01:00
Ulf Gebhardt	a6467c4f12	Merge pull request #1568 from gradido/fix_validate_password_update_user_infos ... Fix: Validate password on UpdateUserInfos	2022-03-07 16:18:25 +01:00
Ulf Gebhardt	c8977ea749	Merge branch 'master' into fix_validate_password_update_user_infos	2022-03-07 16:09:24 +01:00
Alexander Friedland	651bb725d9	Merge branch 'master' into adminarea-creation-transactionlist-show	2022-03-07 16:09:09 +01:00
Ulf Gebhardt	ec6ed74cb9	Merge pull request #1549 from gradido/fix_send_to_use_without_transactions ... Fix: Allow sending to user without transactions	2022-03-07 16:08:59 +01:00
Hannes Heine	fb2945df71	Merge branch 'master' into fix_validate_password_update_user_infos	2022-03-07 16:01:59 +01:00
Ulf Gebhardt	5cae087a26	Merge branch 'master' into fix_send_to_use_without_transactions	2022-03-07 16:00:27 +01:00
Alexander Friedland	30269d060c	Merge branch 'master' into refactor_arithmetic_merge	2022-03-07 15:54:01 +01:00
Ulf Gebhardt	388f054e54	Merge pull request #1569 from gradido/fix_balance_type ... Fix: Balance type	2022-03-07 15:49:08 +01:00
ogerly	6f0421df08	change minus operator and unused propertys	2022-03-07 15:46:41 +01:00
Ulf Gebhardt	4773de6a34	fix balance type	2022-03-07 15:36:22 +01:00
Ulf Gebhardt	cc596df22a	validate valitity of userpassword when updating it via updateUserInfos	2022-03-07 13:31:33 +01:00
Ulf Gebhardt	3e3b5871a4	Merge branch 'master' into 1170_Send_new_Users_Gradido	2022-03-07 13:14:08 +01:00
ogerly	7c37c345a1	pull origin	2022-03-06 18:59:11 +01:00
Alexander Friedland	132de9d00f	Update frontend/src/components/DecayInformations/DecayInformation-Short.vue ... Co-authored-by: Ulf Gebhardt <ulf.gebhardt@webcraft-media.de>	2022-03-06 18:33:06 +01:00
Alexander Friedland	b1d6f36025	Update frontend/src/components/DecayInformations/DecayInformation-DecayStartblock.vue ... Co-authored-by: Ulf Gebhardt <ulf.gebhardt@webcraft-media.de>	2022-03-06 18:32:52 +01:00
ogerly	ea00ab94d2	change 'Koordinierte Weltzeit', 'Coordinated Universal Time'	2022-03-06 12:28:00 +01:00
ogerly	5ecd9a9bac	yarn locales --fix	2022-03-06 12:08:39 +01:00
ogerly	ca46f3f6a5	add locales for transactionlist.balanceDate	2022-03-06 12:08:13 +01:00
ogerly	8618d7894e	yarn test fixed	2022-03-06 12:00:38 +01:00
ogerly	25b1a5a83e	admin area creation transaction list	2022-03-06 11:52:29 +01:00
ogerly	9c6a3c2b08	yarn test fixed for frontend	2022-03-06 10:59:18 +01:00
Ulf Gebhardt	f1c4e847fe	fix previous database field definition	2022-03-06 10:52:13 +01:00
Ulf Gebhardt	433000e536	allow sending to user without transactions	2022-03-06 10:50:14 +01:00
ogerly	68df42baa2	decay startblock insert, set position center	2022-03-06 10:49:07 +01:00
ogerly	7061bdd358	add page DecayInformation-Decay.vue, minus sign inserted	2022-03-06 10:17:06 +01:00
Ulf Gebhardt	cf0710d324	changes required to have things running	2022-03-05 13:04:03 +01:00
Ulf Gebhardt	bc81a9a40f	missign change for startBlock implementation ... # Conflicts: # frontend/src/components/Transactions/TransactionCreation.vue # frontend/src/components/Transactions/TransactionReceive.vue # frontend/src/components/Transactions/TransactionSend.vue	2022-03-05 13:03:49 +01:00
Ulf Gebhardt	0ec7caac42	fix frontend	2022-03-05 12:56:16 +01:00
Ulf Gebhardt	552005e2a4	fixed database error	2022-03-05 12:43:44 +01:00
ogerly	48ab9f695f	change review from ulf gebhardt	2022-03-05 10:08:44 +01:00
ogerly	807757268c	change test TZ=UTC jest --coverage	2022-03-04 16:59:28 +01:00
ogerly	05d53261ad	merge refactor_arithmetic_transactionlist ... refactor_arithmetic_transactionlist_adminarea	2022-03-04 16:22:27 +01:00
ogerly	231602676c	yarn test fixed	2022-03-04 16:09:03 +01:00
ogerly	e39502c070	yarn lint --fix	2022-03-04 15:51:43 +01:00
Ulf Gebhardt	103f727798	Merge branch 'master' into test-login-user-resolver	2022-03-04 15:50:23 +01:00
ogerly	2bea864caa	remove console.log	2022-03-04 15:42:54 +01:00
ogerly	ed85248289	undo changes	2022-03-04 15:38:48 +01:00
ogerly	c728b13f43	undo changes	2022-03-04 15:33:49 +01:00
Ulf Gebhardt	22c65aa929	renamed TypeId to TransactiontypeId ... fixed admin creation (backend part)	2022-03-04 15:12:51 +01:00
Ulf Gebhardt	ae4ad937aa	fix transaction type id - too much change	2022-03-04 14:50:20 +01:00
Ulf Gebhardt	91fda4c097	Merge branch 'master' into refactor_arithmetic_transactionlist_adminarea	2022-03-04 14:43:39 +01:00
Alexander Friedland	b9584310b4	Merge branch 'master' into refactor_arithmetic_transactionlist	2022-03-04 14:41:26 +01:00
Ulf Gebhardt	e0490827c7	Merge pull request #1539 from gradido/refactor_arithmetic ... Refactor: arithmetic and data types	2022-03-04 14:40:20 +01:00
Ulf Gebhardt	6b6cb43247	fix decay start block info	2022-03-04 14:31:08 +01:00
Moriz Wahl	0759289a05	Merge branch 'master' into refactor_arithmetic	2022-03-04 14:27:20 +01:00
Moriz Wahl	b6618d1ffa	fix transaction seed	2022-03-04 14:11:18 +01:00
Moriz Wahl	dc72add7cd	Merge pull request #1547 from gradido/bv-toaster-admin-interface ... refactor: Bootstrap Vue Toast in Admin interface	2022-03-04 13:53:52 +01:00
ogerly	970592d00b	merge master, change tests, change operators	2022-03-04 13:40:22 +01:00
Alexander Friedland	6d17786c59	Merge branch 'master' into refactor_arithmetic_transactionlist	2022-03-04 13:40:22 +01:00