10130 Commits

Author SHA1 Message Date
Alexander Friedland
e726ac80b2
Merge branch 'master' into 2157-remove-fetchPolicy-network-only-from-statistics 2022-08-25 09:07:09 +02:00
Alexander Friedland
97e173ebc3
Merge pull request #2147 from gradido/2145-Corrections-style-for-frontend
2145 corrections style for frontend
2022-08-25 09:06:07 +02:00
Alexander Friedland
b48c638c75
Merge branch 'master' into 2145-Corrections-style-for-frontend 2022-08-23 13:54:34 +02:00
ogerly
c2b4a4d082 test fix 2022-08-23 13:49:12 +02:00
Alexander Friedland
b08867bf9c
Merge branch 'master' into 2157-remove-fetchPolicy-network-only-from-statistics 2022-08-23 13:49:01 +02:00
clauspeterhuebner
bc83a15ab5
Merge pull request #2073 from gradido/2072-feature-usecase-contribution-messaging
2072 feature usecase contribution messaging
2022-08-23 13:46:29 +02:00
clauspeterhuebner
456fbd4b15
Merge branch 'master' into 2072-feature-usecase-contribution-messaging 2022-08-23 13:37:15 +02:00
Alexander Friedland
ab641792d6
Merge branch 'master' into 2157-remove-fetchPolicy-network-only-from-statistics 2022-08-23 13:30:14 +02:00
mahula
b6a2516426
Merge pull request #2158 from gradido/2151-add-hint-to-redeem-link
2151 add hint to redeem link
2022-08-23 12:03:02 +02:00
ogerly
2eecd472b4 delete fetchPolicy: 'network-only' from getCommunityStatistics 2022-08-23 11:57:23 +02:00
ogerly
f04e99cc48 deleted fetchPolicy: 'network-only from getContributionLinks' 2022-08-23 11:47:54 +02:00
mahula
1ea43130dc adapt unit tests to link text changes 2022-08-23 11:41:01 +02:00
mahula
f55851e4d0 add hint text to copyLinkWithText method 2022-08-23 11:39:43 +02:00
ogerly
f24461f924 delete unused locales 2022-08-23 11:23:45 +02:00
ogerly
a531d37c07 add components ContributionMessagesList.vue 2022-08-23 11:19:10 +02:00
mahula
d6c81d21d3 add redeem link hint to locales 2022-08-23 10:08:31 +02:00
Alexander Friedland
3ba1e99b13
Merge branch 'master' into 2145-Corrections-style-for-frontend 2022-08-23 09:28:38 +02:00
clauspeterhuebner
7126c7832d
Merge branch 'master' into 2072-feature-usecase-contribution-messaging 2022-08-22 16:47:02 +02:00
Hannes Heine
a2cd06b063
Merge pull request #2137 from gradido/create-message-table
🍰 Create `contribution messages` table
2022-08-22 09:58:28 +02:00
Hannes Heine
eb29df38ee
Merge branch 'master' into create-message-table 2022-08-22 09:49:33 +02:00
Alexander Friedland
f4689165c8
Merge branch 'master' into 2145-Corrections-style-for-frontend 2022-08-20 08:36:07 +02:00
clauspeterhuebner
43aac4dfcb
Merge branch 'master' into 2072-feature-usecase-contribution-messaging 2022-08-19 15:51:30 +02:00
Alexander Friedland
c3805f0e36
Merge pull request #2138 from gradido/2135-add-the-languages-french-and-dutch
feat: 🍰 Add The Languages French And Dutch
2022-08-19 14:20:13 +02:00
elweyn
49e25bef36 Fix prettier. 2022-08-19 12:22:12 +02:00
elweyn
13ddb961c8 Merge master 2022-08-19 12:19:46 +02:00
elweyn
0a2c8c6a08 Add import for deletedatecolumn. 2022-08-19 12:18:55 +02:00
Hannes Heine
159fb96502
Merge branch 'master' into create-message-table 2022-08-19 12:17:45 +02:00
Alexander Friedland
2621408404
Update frontend/src/locales/fr.json
Co-authored-by: Hannes Heine <heine.hannes@gmail.com>
2022-08-19 11:57:02 +02:00
Alexander Friedland
08e6d01794
Update frontend/src/locales/fr.json
Co-authored-by: Hannes Heine <heine.hannes@gmail.com>
2022-08-19 11:56:52 +02:00
Alexander Friedland
93022a74f4
Update frontend/src/locales/fr.json
Co-authored-by: Hannes Heine <heine.hannes@gmail.com>
2022-08-19 11:56:38 +02:00
ogerly
19c62e1c12 fix lint 2022-08-19 10:37:30 +02:00
ogerly
85e962ac3a remove navbar if not mobil 2022-08-19 10:36:47 +02:00
ogerly
2810e12c1c fix test 2022-08-19 10:13:39 +02:00
ogerly
3836522918 remove unused locales 2022-08-19 10:09:27 +02:00
ogerly
0b0d2fde42 delete mobil cover image 2022-08-19 10:06:45 +02:00
clauspeterhuebner
e4dcbd43b2
Merge branch 'master' into 2072-feature-usecase-contribution-messaging 2022-08-19 01:14:10 +02:00
Claus-Peter Hübner
86de2c1fc4 rework PR-comments 2022-08-19 01:01:57 +02:00
ogerly
b36227b49f close collapse by selected language 2022-08-18 19:01:03 +02:00
ogerly
6926125c9c add missing locales for FR and NL 2022-08-18 18:22:06 +02:00
Alexander Friedland
b7bf0dbae6
Merge branch 'master' into 2135-add-the-languages-french-and-dutch 2022-08-18 17:54:43 +02:00
Alexander Friedland
73f06ba16b
Merge pull request #1975 from gradido/1973-List-open-contribution-links-in-the-wallet
1973 list open contribution links in the wallet
2022-08-18 17:54:33 +02:00
ogerly
fa8d3ef32a remove unused code 2022-08-18 17:48:11 +02:00
Alexander Friedland
d7fbeb4220
Merge branch 'master' into 2135-add-the-languages-french-and-dutch 2022-08-18 17:43:33 +02:00
Alexander Friedland
c2cd7fff69
Merge branch 'master' into 1973-List-open-contribution-links-in-the-wallet 2022-08-18 17:43:03 +02:00
Alexander Friedland
1e246ef6b2
Merge pull request #2124 from gradido/2044-Admin-Interface-Displays-Statistics
feat: 🍰 Admin Interface Displays Statistics
2022-08-18 17:42:38 +02:00
Alexander Friedland
f9fa29a002
Update frontend/src/locales/de.json
Co-authored-by: Wolfgang Huß <wolle.huss@pjannto.com>
2022-08-18 17:34:28 +02:00
Alexander Friedland
87a4929d39
Update frontend/src/locales/en.json
Co-authored-by: Wolfgang Huß <wolle.huss@pjannto.com>
2022-08-18 17:33:07 +02:00
Alexander Friedland
0e17951d1c
Update admin/src/locales/de.json
Co-authored-by: Wolfgang Huß <wolle.huss@pjannto.com>
2022-08-18 17:29:17 +02:00
Alexander Friedland
3ab588416d
Update admin/src/locales/en.json
Co-authored-by: Wolfgang Huß <wolle.huss@pjannto.com>
2022-08-18 17:21:20 +02:00
ogerly
2ad3f83028 change router info to information 2022-08-18 17:16:45 +02:00