13126 Commits

Author SHA1 Message Date
Alexander Friedland
d1caeb7944
Merge branch 'master' into 2682-Desktop-Sidebar-Style 2023-02-23 22:16:42 +01:00
ogerly
47d720e5a2 remove px in sidebar 2023-02-23 22:16:18 +01:00
ogerly
cd9d4b3012 remove unused key in locales 2023-02-23 22:11:27 +01:00
dec47d6dc5
Merge branch 'master' into combine_listTransactionLinks_and_listTransactionLinksAdmin 2023-02-23 22:07:08 +01:00
ogerly
a1b926da71 style sidebar, add icons 2023-02-23 22:01:30 +01:00
75d23c5daf
corrected return type of listTransactionLinks 2023-02-23 21:36:59 +01:00
Alexander Friedland
e58dacd69d
Merge branch 'master' into 2685-Desktop-Sub-Menu 2023-02-23 19:00:44 +01:00
ogerly
fa3dd714de add svg icons 2023-02-23 18:45:29 +01:00
Moriz Wahl
8205cd4a08
Merge branch 'master' into remove-adminCreateContributions 2023-02-23 16:41:09 +01:00
Hannes Heine
896f949227
Merge branch 'master' into fix-frontend-admin-imports 2023-02-23 16:01:41 +01:00
clauspeterhuebner
63c5407517
Merge pull request #2729 from gradido/2728-devops-adapt-config-and-scripts-for-federation-modules
feat(federation): add dht-node to deployment scripts
2023-02-23 15:28:04 +01:00
2b513eb9c4
Merge branch 'master' into remove-adminCreateContributions 2023-02-23 14:42:30 +01:00
ogerly
d70d19fa1f fix stylelint 2023-02-23 14:02:25 +01:00
ogerly
1a1eec9b24 style sav sub menu in community 2023-02-23 13:57:53 +01:00
Claus-Peter Hübner
b070ef5504 conditional dht-node start with message 2023-02-22 21:30:32 +01:00
Claus-Peter Hübner
9966a06630 conditional start of dht-node 2023-02-22 21:14:34 +01:00
clauspeterhuebner
fffb5fc9b3
Merge branch 'master' into 2728-devops-adapt-config-and-scripts-for-federation-modules 2023-02-22 14:11:31 +01:00
ogerly
35d81f889c fix tests 2023-02-22 13:53:51 +01:00
ogerly
9825cf8876 commnity navbar style refactor 2023-02-22 13:41:20 +01:00
ogerly
fe8214df89 change contribution design an all and my contribution icons 2023-02-22 09:46:34 +01:00
Alexander Friedland
02cdcf8751
Merge pull request #2718 from gradido/2708-button-for-chat-with-moderator-incorrect-fetch
fix(frontend): change fetchPolicy, add scripts.update
2023-02-22 09:12:21 +01:00
Alexander Friedland
05ad93a36e
Merge branch 'master' into 2708-button-for-chat-with-moderator-incorrect-fetch 2023-02-22 08:35:08 +01:00
Claus-Peter Hübner
e6291c7dd4 solve error returning ownApiList 2023-02-21 23:56:26 +01:00
Claus-Peter Hübner
d37714b468 config changes 2023-02-21 23:02:46 +01:00
Claus-Peter Hübner
93d07ca4d1 add dht-node to deployment scripts 2023-02-21 22:29:44 +01:00
Moriz Wahl
bee05397d2 fix test 2023-02-21 15:28:18 +01:00
Moriz Wahl
6e88068a88 Merge branch 'master' into remove-adminCreateContributions 2023-02-21 15:20:45 +01:00
Hannes Heine
bf9dff7d59
Merge pull request #2666 from gradido/refactor-listUnconfirmedContribution-to-adminListAllContribution
refactor(backend): list unconfirmed contribution to admin list all contribution
2023-02-21 15:01:23 +01:00
elweyn
e37c2aacdb Remove .vue as imports 2023-02-21 07:18:45 +01:00
Hannes Heine
1e7d4a779a
Update backend/src/graphql/resolver/ContributionResolver.test.ts
Co-authored-by: Moriz Wahl <moriz.wahl@gmx.de>
2023-02-21 04:02:55 +01:00
Moriz Wahl
5f1804bd0b remove admin create contributions from docu, to avoid confusion in the future 2023-02-20 15:18:04 +01:00
Moriz Wahl
23abbfa658 remove adminCreateContributions mutation 2023-02-20 14:59:57 +01:00
Moriz Wahl
313e9c6e9f fix test for wallet link in navbar to raise coverage 2023-02-20 14:59:24 +01:00
Moriz Wahl
9d60e414ad remove admin create contributions from admin interface 2023-02-20 14:53:58 +01:00
Moriz Wahl
72165ac99d fix test 2023-02-20 14:39:05 +01:00
Moriz Wahl
3cc5494736 refactor(backend): remove admin create contributions 2023-02-20 14:24:42 +01:00
Hannes Heine
2a12d03599
Merge branch 'master' into refactor-listUnconfirmedContribution-to-adminListAllContribution 2023-02-18 07:14:07 +01:00
elweyn
bf5cb142cc Remove unused In import. 2023-02-18 07:13:35 +01:00
da0679274f
Merge branch 'master' into combine_listTransactionLinks_and_listTransactionLinksAdmin 2023-02-17 23:38:59 +01:00
214970dde1
typo 2023-02-17 23:38:06 +01:00
cb058adde6
fix tests 2023-02-17 23:29:09 +01:00
c01a94aa24
potential frontend fix 2023-02-17 23:25:09 +01:00
16c3ba399e
some misssing changes 2023-02-17 23:21:37 +01:00
b887068226
remove user constant, not required 2023-02-17 23:12:11 +01:00
d21996a045
externalize transactionLinkList function into utils folder 2023-02-17 23:10:31 +01:00
12c128e072
do not requqery the user 2023-02-17 23:03:38 +01:00
elweyn
a61e66ffc4 Refactor the near functions to a single one. 2023-02-17 16:12:26 +01:00
elweyn
84c724daea Change to suggestion 2023-02-17 15:51:45 +01:00
elweyn
9ddef04f56 Change test name. 2023-02-17 15:46:53 +01:00
Moriz Wahl
7970c9410b
Merge pull request #2721 from gradido/refactor-community-routes
refactor(frontend): community routes
2023-02-17 15:46:18 +01:00