6765 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Moriz Wahl	881b8a37c2	Merge branch 'master' into refactor-backend-relative-paths	2022-03-08 13:46:00 +01:00
Alexander Friedland	650163c00a	Merge pull request #1578 from gradido/show-community-name-in-creation-transaction ... community name in creation transaction is displayed cleanly	2022-03-08 13:39:51 +01:00
ogerly	680d43b2cd	community name in creation transaction is displayed cleanly	2022-03-08 09:41:05 +01:00
Alexander Friedland	412ce993f5	Merge branch 'master' into refactor-backend-relative-paths	2022-03-08 09:33:45 +01:00
clauspeterhuebner	034828a6f8	Merge pull request #1567 from gradido/1170_Send_new_Users_Gradido ... Planning: send new users gradido	2022-03-08 01:20:56 +01:00
clauspeterhuebner	c3e2168d17	Merge branch 'master' into 1170_Send_new_Users_Gradido	2022-03-08 00:31:57 +01:00
Moriz Wahl	75a1feb7ee	no relative paths in tests	2022-03-07 22:03:54 +01:00
Moriz Wahl	9879c4550e	path to models	2022-03-07 21:58:30 +01:00
Moriz Wahl	7e4c3ec3ce	more resolved paths	2022-03-07 21:56:03 +01:00
Moriz Wahl	b361f12325	resolve relative paths in directives	2022-03-07 21:44:29 +01:00
Moriz Wahl	f0e7cc2a50	resolve relative paths in arg	2022-03-07 21:42:57 +01:00
Moriz Wahl	8b57327d22	remove empty files, resolve relative paths in model	2022-03-07 21:40:41 +01:00
Moriz Wahl	0136a22f0c	resolve relative paths in resolvers	2022-03-07 21:35:50 +01:00
Moriz Wahl	e44bc316bf	refactor: Resolve Relative Paths in Backend	2022-03-07 21:35:23 +01:00
Alexander Friedland	77f5668648	Merge pull request #1548 from gradido/refactor_arithmetic_merge ... Refactor arithmetic merge	2022-03-07 17:24:30 +01:00
Moriz Wahl	a430d9cd6e	remove depricated test	2022-03-07 16:46:07 +01:00
Alexander Friedland	187deba1a8	Merge branch 'master' into refactor_arithmetic_merge	2022-03-07 16:38:37 +01:00
Alexander Friedland	ef3a0ea9be	Merge pull request #1550 from gradido/adminarea-creation-transactionlist-show ... Adminarea creation transactionlist show	2022-03-07 16:36:48 +01:00
Ulf Gebhardt	31721337ba	Merge branch 'master' into adminarea-creation-transactionlist-show	2022-03-07 16:24:29 +01:00
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