12509 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Hannes Heine	837efc7cb8	Merge pull request #2506 from gradido/add_hide_amount_to_users ... feat(backend): add hideAmountGDD & hideAmountGDT to users table.	2023-01-10 16:05:35 +01:00
Hannes Heine	40ce03bf87	Merge branch 'master' into add_hide_amount_to_users	2023-01-10 15:49:02 +01:00
Alexander Friedland	8dc0218fd7	Merge branch 'master' into 2474-Incorrectly-Email-Label-on-InputEmail	2023-01-10 15:36:42 +01:00
Alexander Friedland	1165917725	Merge pull request #2530 from gradido/2529-Avatar-always-has-2-letters ... fix(frontend): avatar initials always has 2 letters	2023-01-10 15:36:32 +01:00
Hannes Heine	447d252e58	Merge branch 'master' into 2332-mark-contribution-as-rejected	2023-01-10 14:41:10 +01:00
elweyn	676283449c	Fix 'second call to API' test of Gdt- and GddAmount	2023-01-10 14:35:56 +01:00
Alexander Friedland	6833480a65	Merge branch 'master' into 2529-Avatar-always-has-2-letters	2023-01-10 14:09:19 +01:00
Alexander Friedland	f5ec665333	Merge branch 'master' into 2474-Incorrectly-Email-Label-on-InputEmail	2023-01-10 14:09:14 +01:00
Alexander Friedland	82b246e679	Merge branch 'master' into 2513-Leaves-are-over-the-user-symbol	2023-01-10 14:08:57 +01:00
Alexander Friedland	fce645f594	Merge branch 'master' into 2478-Investigate-Pagination-on-GDT	2023-01-10 14:08:49 +01:00
elweyn	95e1cd4b6d	Merge branch 'master' into add_hide_amount_to_users	2023-01-10 14:00:47 +01:00
Alexander Friedland	e315c6d66a	Merge branch 'master' into 2531-Sending-GDD-does-not-work	2023-01-10 13:59:02 +01:00
ogerly	775240d13c	fix test	2023-01-10 13:58:34 +01:00
elweyn	01f054c181	Tests on GdtAmount	2023-01-10 13:56:52 +01:00
elweyn	74c575882a	Tests on GddAmount	2023-01-10 13:56:39 +01:00
clauspeterhuebner	de124a3c70	Merge branch 'master' into 1489-feature-backup-cron	2023-01-10 13:49:05 +01:00
Moriz Wahl	640018b5e7	Merge pull request #2460 from gradido/seed-contributions ... refactor(backend): seed contributions as user	2023-01-10 13:47:52 +01:00
Ulf Gebhardt	0444567579	Merge branch 'master' into remove-jest-from-dependencies	2023-01-10 13:21:49 +01:00
Moriz Wahl	456b48650b	mock and instead of using vue router	2023-01-10 12:33:06 +01:00
Ulf Gebhardt	10008fa682	cleaned dht-node of ballast	2023-01-10 12:27:47 +01:00
ogerly	34014affa0	send gdd and send link gdd is running	2023-01-10 12:20:55 +01:00
elweyn	dded791586	Fix linting and locales	2023-01-10 11:54:44 +01:00
Ulf Gebhardt	904003377a	cleaned package.json description	2023-01-10 11:26:32 +01:00
mahula	3406aa115d	Merge branch 'master' into 1257-feature-fake-email-server	2023-01-10 11:16:15 +01:00
mahula	1e265b1078	set email username and password to empty string in backend config	2023-01-10 11:07:16 +01:00
elweyn	d71a73ec3b	Add new mutation variables to the tests mutation in backend.	2023-01-10 10:56:08 +01:00
elweyn	427a0a6865	Change test of returned login datas.	2023-01-10 10:55:41 +01:00
Ulf Gebhardt	754140dcbc	removed jest from dependencies - only present in dev dependencies now	2023-01-10 10:54:57 +01:00
ogerly	b139834729	add methodes to update hide amounts	2023-01-10 10:07:47 +01:00
ogerly	ae5c5984b8	change hide amounts to optional	2023-01-10 10:06:58 +01:00
Alexander Friedland	11c2b3900c	Merge branch 'master' into add_hide_amount_to_users	2023-01-10 09:10:50 +01:00
ogerly	7cde62b843	change path in /community	2023-01-10 08:45:06 +01:00
ogerly	11061239a2	balanceGDT changes undone again	2023-01-10 08:25:58 +01:00
Alexander Friedland	b7bbb97a04	Merge branch 'master' into 2478-Investigate-Pagination-on-GDT	2023-01-10 07:35:22 +01:00
Alexander Friedland	f6f6695d54	Merge branch 'master' into 2513-Leaves-are-over-the-user-symbol	2023-01-10 07:35:17 +01:00
Alexander Friedland	d1047ab6e7	Merge branch 'master' into 2516-Creation-menu-is-not-highlighted-on-all-submenus	2023-01-10 07:34:27 +01:00
Alexander Friedland	526770fe27	Merge branch 'master' into 2474-Incorrectly-Email-Label-on-InputEmail	2023-01-10 07:34:06 +01:00
Alexander Friedland	352b672f47	Merge branch 'master' into 2529-Avatar-always-has-2-letters	2023-01-10 07:31:55 +01:00
Claus-Peter Hübner	74ffb8872a	correct the docu	2023-01-10 01:21:31 +01:00
Claus-Peter Hübner	2dccc325cf	add description for daily backup cronjob	2023-01-10 01:13:16 +01:00
Claus-Peter Hübner	ed93963af8	remove unused/unnecessary files	2023-01-10 00:13:06 +01:00
Claus-Peter Hübner	a3318a3f10	Merge remote-tracking branch 'origin/master' into 2428-feature-federation-implement-multiple-apollo-graphql-endpoints	2023-01-09 23:19:44 +01:00
Claus-Peter Hübner	022c3d0173	Merge remote-tracking branch 'origin/master' into ... 2501-feature-federation-implement-a-graphql-client-to-request-getpublickey	2023-01-09 23:03:34 +01:00
Claus-Peter Hübner	49c131a684	use own versioned classes to request versioned publicKey	2023-01-09 22:46:38 +01:00
Moriz Wahl	712c62e6da	Merge branch 'master' into seed-contributions	2023-01-09 21:01:45 +01:00
Ulf Gebhardt	4c2a609f92	Merge pull request #2503 from gradido/fix_logger_middleware ... fix(backend): fix logger middleware	2023-01-09 20:29:53 +01:00
Ulf Gebhardt	9a9de722c8	Merge branch 'master' into fix_logger_middleware	2023-01-09 19:57:50 +01:00
Ulf Gebhardt	913235c186	Merge pull request #2523 from gradido/2522-correct-email-text ... fix(backend): fix email text	2023-01-09 19:57:35 +01:00
Ulf Gebhardt	1d3ecd3339	Merge branch 'master' into 2522-correct-email-text	2023-01-09 19:38:31 +01:00
Ulf Gebhardt	15ae49d8f0	Merge pull request #2489 from gradido/lintpr-new-scopes ... feat(other): new scopes for lint pr	2023-01-09 19:38:15 +01:00