6203 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Moriz Wahl	a53864a72f	move css	2022-02-09 10:09:52 +01:00
Moriz Wahl	547ce903a6	fix test	2022-02-09 09:57:36 +01:00
Moriz Wahl	9ef575d6b1	open creations table	2022-02-09 09:50:17 +01:00
Alexander Friedland	67181263ed	Merge pull request #1440 from gradido/profil-settings-distance ... Profil settings and footer refactor	2022-02-09 09:45:52 +01:00
Moriz Wahl	d0a189b329	toggle row details as mixin	2022-02-09 09:02:48 +01:00
Moriz Wahl	7b76e18444	localize creation confirm table head	2022-02-09 08:37:01 +01:00
Moriz Wahl	ae2d5355d6	User Search Table	2022-02-09 08:21:07 +01:00
ogerly	81b3dc08ae	margin footer refactor, more margin to top	2022-02-08 20:51:55 +01:00
ogerly	cbaa0162b9	profil settings header info refactor style	2022-02-08 20:48:40 +01:00
Ulf Gebhardt	529066f8e1	Merge pull request #1438 from gradido/v1.6.2 ... v1.6.2	2022-02-08 16:40:11 +01:00
Ulf Gebhardt	0b874235a9	v1.6.2	2022-02-08 16:29:18 +01:00
Hannes Heine	04c93d051f	Merge pull request #1437 from gradido/update_changelog_lib ... updated_changelog_library	2022-02-08 16:23:01 +01:00
Ulf Gebhardt	38bf05887f	updated changelog library	2022-02-08 16:16:10 +01:00
Alexander Friedland	bd7aab1437	Merge pull request #1416 from gradido/1401-Admin-interface-does-user-have-member-area ... admin interface does user have member area	2022-02-08 16:08:06 +01:00
Ulf Gebhardt	7e8a789260	Merge branch 'master' into 1401-Admin-interface-does-user-have-member-area	2022-02-08 15:59:15 +01:00
Ulf Gebhardt	ee94c655ef	fix elopage buys not using repository but entity	2022-02-08 15:59:59 +01:00
ogerly	6601d0ec4a	yarn lint fix	2022-02-08 15:56:31 +01:00
ogerly	75a37b6af8	change icons in for hasElopage adminarea	2022-02-08 15:56:31 +01:00
ogerly	afae9f47e1	remove button, add icon	2022-02-08 15:56:31 +01:00
Alexander Friedland	af3dd430e7	Merge branch 'master' into 1401-Admin-interface-does-user-have-member-area	2022-02-08 15:56:31 +01:00
Hannes Heine	47cdaafc13	Merge pull request #1408 from gradido/refactor_remove_community_server ... Refactor - Remove community_server	2022-02-08 15:56:00 +01:00
Hannes Heine	712a92b8ba	Merge branch 'master' into refactor_remove_community_server	2022-02-08 15:45:43 +01:00
Alexander Friedland	e12fb6c3da	Merge pull request #1425 from gradido/1389-TransactionsTabs-are-not-well-designed ... 1389 transactions tabs are not well designed	2022-02-08 15:31:59 +01:00
Alexander Friedland	6526f86e63	Merge branch 'master' into 1389-TransactionsTabs-are-not-well-designed	2022-02-08 07:59:43 +01:00
Ulf Gebhardt	4f37e1f675	Merge pull request #1429 from gradido/fix_community_name_description ... fix_community_name_description	2022-02-07 21:55:50 +01:00
Ulf Gebhardt	b04445c13d	Merge branch 'master' into fix_community_name_description	2022-02-07 19:57:07 +01:00
Ulf Gebhardt	4743255681	Merge pull request #1406 from gradido/remove_unnecessary_repositories ... remove_unnecessary_repositories	2022-02-07 19:56:59 +01:00
Alexander Friedland	8a04d2be51	Merge branch 'master' into fix_community_name_description	2022-02-07 17:04:52 +01:00
ogerly	c9ff626890	style margin-left and margin-right remove from dashboard template ad add on subsites	2022-02-07 17:01:07 +01:00
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