3954 Commits

Author SHA1 Message Date
Alexander Friedland
ecdf79d7cd
Merge branch 'master' into 2709-the-bell-symbol-must-appear-text 2023-03-02 12:15:44 +01:00
Alexander Friedland
69aa1fae73
Merge branch 'master' into 2613-Answer-moderator-question-clickable 2023-03-01 15:50:35 +01:00
Alexander Friedland
5df9aecef4
Merge branch 'master' into 2682-Desktop-Sidebar-Style 2023-03-01 14:43:41 +01:00
Alexander Friedland
ea99826faf
Merge branch 'master' into 2613-Answer-moderator-question-clickable 2023-02-28 18:58:55 +01:00
Alexander Friedland
215a77a2dc
Update frontend/src/components/Menu/Sidebar.spec.js
Co-authored-by: Moriz Wahl <moriz.wahl@gmx.de>
2023-02-28 14:52:41 +01:00
Alexander Friedland
cbc6018595
Update frontend/src/components/Menu/Sidebar.spec.js
Co-authored-by: Moriz Wahl <moriz.wahl@gmx.de>
2023-02-28 14:49:57 +01:00
Alexander Friedland
3a162b358d
Update frontend/src/components/Menu/Sidebar.spec.js
Co-authored-by: Moriz Wahl <moriz.wahl@gmx.de>
2023-02-28 14:49:45 +01:00
21b6e35391
Merge branch 'master' into combine_listTransactionLinks_and_listTransactionLinksAdmin 2023-02-27 15:53:59 +01:00
ogerly
fc11149f1f add visible event an answer question text in my contribution list 2023-02-27 10:31:10 +01:00
ogerly
0faf32b071 rename files after merge :( 2023-02-24 08:17:09 +01:00
Alexander Friedland
7e044f5269
Merge branch 'master' into 2682-Desktop-Sidebar-Style 2023-02-24 07:46:02 +01:00
ogerly
affb0fd2b7 fix test 2023-02-24 07:45: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
Hannes Heine
896f949227
Merge branch 'master' into fix-frontend-admin-imports 2023-02-23 16:01:41 +01:00
ogerly
35d81f889c fix tests 2023-02-22 13:53:51 +01:00
ogerly
fe8214df89 change contribution design an all and my contribution icons 2023-02-22 09:46:34 +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
elweyn
e37c2aacdb Remove .vue as imports 2023-02-21 07:18:45 +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
9de2149c8f
Merge branch 'master' into combine_listTransactionLinks_and_listTransactionLinksAdmin 2023-02-17 14:10:51 +01:00
Moriz Wahl
e1c0534866
Merge branch 'master' into refactor-community-routes 2023-02-17 12:59:11 +01:00
Moriz Wahl
625b4cb3d0 fix unit tests 2023-02-17 12:56:37 +01:00
Moriz Wahl
9910e2e201 improve code, fix button highlight 2023-02-17 12:04:57 +01:00
Moriz Wahl
df468b9b1d change to named tab param 2023-02-17 11:15:19 +01:00
Moriz Wahl
86742d0158 refactor(frontend): community routes 2023-02-17 09:48:05 +01:00
ogerly
7f182a5927 change fetchPolicy, add scripts.update 2023-02-16 15:21:55 +01:00
361bdb0ab2
Merge branch 'master' into 2592-Gradido-Logo-blurred 2023-02-16 14:37:08 +01:00
Alexander Friedland
09c75bc204
Merge branch 'master' into 2592-Gradido-Logo-blurred 2023-02-16 14:30:49 +01:00
mahula
d68c43c10b
Merge branch 'master' into 2352-feat-user-story-user-authentication-reset-password 2023-02-16 14:02:09 +01:00
66a5175dc1
combine logic for both listTransactionLinks and listTransactionLinksAdmin 2023-02-14 21:28:58 +01:00
Alexander Friedland
0af478071c
Merge branch 'master' into 2598-Register-Login-buttons-not-full-size 2023-02-14 16:02:53 +01:00
Alexander Friedland
5cf445d16b
Merge branch 'master' into 2590-To-long-text-has-submit-button-still-enabled 2023-02-14 15:26:19 +01:00
Alexander Friedland
49f123fa6b
Merge branch 'master' into 2589-Missing-Message-on-old-Transactions 2023-02-14 14:21:54 +01:00
Hannes Heine
833271a76c
Merge branch 'master' into 2352-feat-user-story-user-authentication-reset-password 2023-02-14 08:11:59 +01:00
Hannes Heine
cffced76ab
Merge branch 'master' into 2598-Register-Login-buttons-not-full-size 2023-02-14 07:58:01 +01:00
Moriz Wahl
ac250181ef chore(release): version 1.18.2 2023-02-10 16:09:33 +01:00
Alexander Friedland
6b91b408da
Merge branch 'master' into 2589-Missing-Message-on-old-Transactions 2023-02-10 15:30:13 +01:00
Alexander Friedland
016d35cc26
Merge branch 'master' into 2598-Register-Login-buttons-not-full-size 2023-02-10 15:25:27 +01:00
Alexander Friedland
8d89409e21
Merge branch 'master' into 2592-Gradido-Logo-blurred 2023-02-10 15:24:49 +01:00
Alexander Friedland
e22f085726
Merge branch 'master' into 2590-To-long-text-has-submit-button-still-enabled 2023-02-10 15:23:38 +01:00
Moriz Wahl
05f9917ac7 feat(release): Version 1.18.1 2023-02-10 14:42:16 +01:00
Moriz Wahl
ea298aaaea
Merge branch 'master' into fix-is-this-month 2023-02-10 14:22:02 +01:00
Moriz Wahl
04fd66dbc4 test to 100% 2023-02-10 14:16:55 +01:00
Moriz Wahl
2e18ca41c9 get it working 2023-02-10 13:33:38 +01:00