6840 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
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
Claus-Peter Hübner	da218877fc	rework after review in architecture-meeting	2022-02-09 02:17:01 +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
ogerly	399450af93	remove collaps button from decay type transaction	2022-02-08 15:30:33 +01:00
ogerly	c51fd00be5	rechtschreibfehler fixed	2022-02-08 15:18:04 +01:00
ogerly	b7c215c17c	rechtschreibfehler fixed	2022-02-08 15:14:42 +01:00
ogerly	7dadcb1701	rechtschreibfehler fixed	2022-02-08 15:13:54 +01:00
ogerly	3fe99b3de2	yarn locales --fix	2022-02-08 15:10:01 +01:00
ogerly	716de7de46	lacales in befor startblock collaps text	2022-02-08 15:10:01 +01:00
ogerly	55866ef1fe	change conflicts fixed	2022-02-08 15:09:48 +01:00
ogerly	9b22b42457	change conflicts fixed	2022-02-08 15:06:26 +01:00
Alexander Friedland	55573ea2ce	Merge branch 'master' into 1106-first-transaction-cannot-be-expanded	2022-02-08 08:31:13 +01:00
Alexander Friedland	b876d8e335	Update frontend/src/views/Pages/AccountOverview/GddTransactionList.vue ... Co-authored-by: Moriz Wahl <moriz.wahl@gmx.de>	2022-02-08 08:30:38 +01:00
Alexander Friedland	9add338ddd	Update frontend/src/views/Pages/AccountOverview/GddTransactionList.vue ... Co-authored-by: Moriz Wahl <moriz.wahl@gmx.de>	2022-02-08 08:30:24 +01:00
Alexander Friedland	f92b223d90	Update frontend/src/locales/en.json ... Co-authored-by: Moriz Wahl <moriz.wahl@gmx.de>	2022-02-08 08:30:09 +01:00
Alexander Friedland	64301776fb	Update frontend/src/locales/de.json ... Co-authored-by: Moriz Wahl <moriz.wahl@gmx.de>	2022-02-08 08:30:01 +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
Alexander Friedland	533de795df	Merge branch 'master' into 1106-first-transaction-cannot-be-expanded	2022-02-07 13:04:50 +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