7205 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Ulf Gebhardt	c66f4c95a4	Merge branch 'master' into clean_database_users	2022-02-07 12:55:57 +01:00
Ulf Gebhardt	c0ac84b975	Merge pull request #1431 from gradido/remove_gradido_node ... remove_gradido_node	2022-02-07 12:50:31 +01:00
Ulf Gebhardt	347db4d62d	Merge branch 'master' into remove_gradido_node	2022-02-07 12:38:28 +01:00
Alexander Friedland	53c1a4f808	Merge branch 'master' into 1389-TransactionsTabs-are-not-well-designed	2022-02-07 12:29:46 +01:00
Alexander Friedland	3f89dc1e3b	Merge pull request #1423 from gradido/1400-No-GDD-value-when-reloading-User-Profile ... add updateTransactions function for GDD balance if reload page	2022-02-07 12:28:23 +01:00
Alexander Friedland	4b805dafbf	Update frontend/public/index.html ... Co-authored-by: Ulf Gebhardt <ulf.gebhardt@webcraft-media.de>	2022-02-07 12:27:24 +01:00
Alexander Friedland	99e20fce58	Update frontend/public/index.html ... Co-authored-by: Ulf Gebhardt <ulf.gebhardt@webcraft-media.de>	2022-02-07 12:27:17 +01:00
Alexander Friedland	b3909391af	Update frontend/public/index.html ... Co-authored-by: Ulf Gebhardt <ulf.gebhardt@webcraft-media.de>	2022-02-07 12:27:09 +01:00
Alexander Friedland	56d4caf278	Update frontend/public/index.html ... Co-authored-by: Ulf Gebhardt <ulf.gebhardt@webcraft-media.de>	2022-02-07 12:27:00 +01:00
elweyn	90ef04b465	yarn lint --fix && yarn locales --fix	2022-02-07 12:22:33 +01:00
elweyn	50c87e8e00	add localize on transactionlist	2022-02-07 12:21:21 +01:00
elweyn	e1abedc8ff	add localize first_transaction	2022-02-07 12:18:25 +01:00
elweyn	e1d07e3642	get firstTransaction from Transactionlist, add collaps block for firstTransaction	2022-02-07 12:13:12 +01:00
ogerly	e76bae4585	Add firstTransaction to transactionList transactions query.	2022-02-07 12:01:39 +01:00
ogerly	21da7f4ffb	Removed the firstTransaction property initialization in TransactionList.	2022-02-07 11:56:50 +01:00
ogerly	111894bc3e	Move case firstTransaction in case their is no previous Transaction.	2022-02-07 11:44:32 +01:00
ogerly	e22c701c88	Add firstTransaction boolean to Transaction.	2022-02-07 11:40:26 +01:00
elweyn	520cb22350	Revert "Add firstTransaction boolean to Transaction." ... This reverts commit 8c6aafcedb80e6212fe80d04c60e9340a0a762f6.	2022-02-07 11:38:46 +01:00
ogerly	d3123e00fc	Fill firstTransaction in case decay can not be created.	2022-02-07 11:32:56 +01:00
ogerly	8c6aafcedb	Add firstTransaction boolean to Transaction.	2022-02-07 11:32:09 +01:00
ogerly	27d4623137	Remove firstTransaction from TransactionList.	2022-02-07 11:31:44 +01:00
ogerly	801033138f	Add firstTransaction boolean to TransactionList.	2022-02-07 11:14:07 +01:00
Alexander Friedland	a7544a5151	Merge branch 'master' into refactor_remove_community_server	2022-02-07 10:50:19 +01:00
elweyn	346ca8fc35	Merge conflict resolved.	2022-02-07 10:45:27 +01:00
Ulf Gebhardt	d3e5e48d3f	missing updated gitmodules	2022-02-07 10:40:20 +01:00
ogerly	c66e459572	Add hasElopage for each user to the graphql query searchUsers.	2022-02-07 10:40:15 +01:00
ogerly	4dc4f30097	Add hasElopage to the UserAdmin model.	2022-02-07 10:39:01 +01:00
ogerly	3806beb01e	Add hasElopage flag to user entity for the admin user search.	2022-02-07 10:38:35 +01:00
ogerly	555420a568	Remove unused imports, extract hasElopageBuys to utility.	2022-02-07 10:36:43 +01:00
ogerly	9d79e35f36	Refactor hasElopageBuys method to a utility method.	2022-02-07 10:34:54 +01:00
Ulf Gebhardt	7c20c981d8	removed node server (was never used)	2022-02-07 08:15:56 +01:00
Ulf Gebhardt	c6e2d2cf1c	updated version string	2022-02-07 07:57:14 +01:00
Ulf Gebhardt	3f0aa00dc3	fix frontend tests	2022-02-07 07:51:50 +01:00
Ulf Gebhardt	8e922a6d1a	unsaved file	2022-02-07 07:38:38 +01:00
Ulf Gebhardt	296c56ff3b	include .env.bak in gitignore	2022-02-07 07:37:53 +01:00
Ulf Gebhardt	4d258ee4a5	removed todo - thats now done	2022-02-07 07:33:07 +01:00
Ulf Gebhardt	31c5627598	quotes not needed	2022-02-07 07:28:33 +01:00
Ulf Gebhardt	9676672a34	.env-template needs quotes? ... adjusted start.sh and install.sh	2022-02-07 07:17:20 +01:00
Ulf Gebhardt	4e87e5a7bf	different approach	2022-02-07 07:13:39 +01:00
Ulf Gebhardt	68d67366d6	quotes are not working	2022-02-07 06:47:29 +01:00
Ulf Gebhardt	068aa1cec0	quote the whole thing	2022-02-07 06:45:20 +01:00
Ulf Gebhardt	b8a500f60f	\n delimiter	2022-02-07 06:44:27 +01:00
Ulf Gebhardt	0406b24001	another try	2022-02-07 06:43:28 +01:00
Ulf Gebhardt	510ae1ecd8	try -0 for xargs delimiter	2022-02-07 06:41:45 +01:00
Ulf Gebhardt	ea320c825a	different loading approach	2022-02-07 06:38:51 +01:00
Ulf Gebhardt	8e8f1097b2	more debug symbols for community name & description	2022-02-07 06:36:07 +01:00
Ulf Gebhardt	43bcc8b8f2	try xargs \n delimiter	2022-02-07 06:30:16 +01:00
Ulf Gebhardt	6ef64bd2a9	removed debug symbols	2022-02-07 06:25:02 +01:00
Ulf Gebhardt	5024ca726a	more fixes	2022-02-07 06:22:26 +01:00
Ulf Gebhardt	b9a29a67ae	more fixes	2022-02-07 06:20:50 +01:00