6224 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Alexander Friedland	748953fb39	Merge branch 'master' into 1389-TransactionsTabs-are-not-well-designed	2022-02-07 15:46:35 +01:00
Ulf Gebhardt	8e769e7b0e	Merge branch 'master' into remove_unnecessary_repositories	2022-02-07 13:07:55 +01:00
elweyn	d502b3d052	yarn lint --fix.	2022-02-07 13:05:06 +01:00
Ulf Gebhardt	11e92102e5	Merge pull request #1427 from gradido/clean_database_users ... clean_database_users	2022-02-07 13:04:13 +01:00
Hannes Heine	d332c07643	Merge branch 'master' into 1401-Admin-interface-does-user-have-member-area	2022-02-07 12:57:27 +01:00
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	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
Ulf Gebhardt	065c9d6294	debugging more bash	2022-02-07 06:15:10 +01:00
Ulf Gebhardt	6c7ab4e8ab	fix bash function calls	2022-02-07 06:12:41 +01:00
Ulf Gebhardt	4bd5942917	typo	2022-02-07 06:11:04 +01:00
Ulf Gebhardt	7433b4fed8	try to read only specific variables	2022-02-07 06:08:18 +01:00
Ulf Gebhardt	95d9ec255c	load backend/.env to get secrets and regenerate .env configs	2022-02-07 05:43:23 +01:00
Ulf Gebhardt	9e2be73163	corrected .env.dist	2022-02-07 05:41:18 +01:00
Ulf Gebhardt	148bd6286c	cleaned frontend	2022-02-07 05:20:40 +01:00
Ulf Gebhardt	817e462698	fixed backend according to migration	2022-02-07 05:01:49 +01:00
Ulf Gebhardt	e255896fdc	fix seed	2022-02-07 04:57:13 +01:00
Ulf Gebhardt	c0156d4a29	migration 20	2022-02-07 04:56:19 +01:00
Ulf Gebhardt	44c0adb0c8	Merge branch 'master' into remove_unnecessary_repositories	2022-02-07 04:07:34 +01:00
Hannes Heine	80956bcee9	Merge branch 'master' into 1401-Admin-interface-does-user-have-member-area	2022-02-05 17:23:02 +01:00