diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index a02aa4b5b..41a2c9fc2 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -281,7 +281,7 @@ jobs: # LINT BACKEND ########################################################### ########################################################################## - name: backend | Lint - run: cd backend && yarn && yarn run lint + run: cd database && yarn && cd ../backend && yarn && yarn run lint ############################################################################## # JOB: LOCALES BACKEND ####################################################### diff --git a/CHANGELOG.md b/CHANGELOG.md index ce3bd4a10..8dc91f2fa 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,8 +4,28 @@ All notable changes to this project will be documented in this file. Dates are d Generated by [`auto-changelog`](https://github.com/CookPete/auto-changelog). +#### [1.19.1](https://github.com/gradido/gradido/compare/1.19.0...1.19.1) + +- fix(frontend): admin question clickable [`#2810`](https://github.com/gradido/gradido/pull/2810) +- refactor(frontend): change b-img to b-icon send [`#2809`](https://github.com/gradido/gradido/pull/2809) +- fix(admin): update openCreation in case of tab open. [`#2806`](https://github.com/gradido/gradido/pull/2806) +- fix(admin): english language for contributions in admin [`#2804`](https://github.com/gradido/gradido/pull/2804) +- refactor(admin): event buttons for myself turned off in open contributions [`#2760`](https://github.com/gradido/gradido/pull/2760) +- fix(admin): contribution page [`#2794`](https://github.com/gradido/gradido/pull/2794) +- fix(frontend): info.svg [`#2798`](https://github.com/gradido/gradido/pull/2798) +- fix(backend): add relation messages to database query [`#2795`](https://github.com/gradido/gradido/pull/2795) +- fix(admin): header and menu [`#2793`](https://github.com/gradido/gradido/pull/2793) +- fix(frontend): send gdd - change first submit button text to 'Check Now' [`#2774`](https://github.com/gradido/gradido/pull/2774) +- refactor(frontend): creations generated by link NL [`#2771`](https://github.com/gradido/gradido/pull/2771) +- refactor(frontend): creations generated by link (FR) + (NL) [`#2770`](https://github.com/gradido/gradido/pull/2770) +- refactor(frontend): update German locales [`#2765`](https://github.com/gradido/gradido/pull/2765) +- refactor(backend): use find contributions helper for list contributions [`#2762`](https://github.com/gradido/gradido/pull/2762) + #### [1.19.0](https://github.com/gradido/gradido/compare/1.18.2...1.19.0) +> 7 March 2023 + +- chore(release): version 1.19.0 [`#2786`](https://github.com/gradido/gradido/pull/2786) - fix(frontend): change contribution design [`#2731`](https://github.com/gradido/gradido/pull/2731) - refactor(frontend): commnity navbar- & unauthenticated b-gradido styles [`#2732`](https://github.com/gradido/gradido/pull/2732) - fix(database): change downwards migration to delete entries with last_announced_at IS NULL [`#2767`](https://github.com/gradido/gradido/pull/2767) diff --git a/admin/package.json b/admin/package.json index 2b9f3032f..10399739d 100644 --- a/admin/package.json +++ b/admin/package.json @@ -3,7 +3,7 @@ "description": "Administraion Interface for Gradido", "main": "index.js", "author": "Moriz Wahl", - "version": "1.19.0", + "version": "1.19.1", "license": "Apache-2.0", "private": false, "scripts": { diff --git a/admin/src/components/ContributionMessages/ContributionMessagesList.spec.js b/admin/src/components/ContributionMessages/ContributionMessagesList.spec.js index 0092751cc..f0b6ea821 100644 --- a/admin/src/components/ContributionMessages/ContributionMessagesList.spec.js +++ b/admin/src/components/ContributionMessages/ContributionMessagesList.spec.js @@ -10,6 +10,7 @@ describe('ContributionMessagesList', () => { const propsData = { contributionId: 42, + contributionState: 'PENDING', } const mocks = { diff --git a/admin/src/components/ContributionMessages/ContributionMessagesList.vue b/admin/src/components/ContributionMessages/ContributionMessagesList.vue index 636627385..fab6b5e4a 100644 --- a/admin/src/components/ContributionMessages/ContributionMessagesList.vue +++ b/admin/src/components/ContributionMessages/ContributionMessagesList.vue @@ -1,17 +1,18 @@ - - - + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/frontend/src/components/Contributions/ContributionListItem.vue b/frontend/src/components/Contributions/ContributionListItem.vue index ffbf29fdd..56546d183 100644 --- a/frontend/src/components/Contributions/ContributionListItem.vue +++ b/frontend/src/components/Contributions/ContributionListItem.vue @@ -25,7 +25,11 @@
{{ $t('contributionText') }}
{{ memo }}
-
+
{{ $t('contribution.alert.answerQuestion') }}
diff --git a/frontend/src/components/GddSend/TransactionForm.vue b/frontend/src/components/GddSend/TransactionForm.vue index 10884d5f1..b560e0767 100644 --- a/frontend/src/components/GddSend/TransactionForm.vue +++ b/frontend/src/components/GddSend/TransactionForm.vue @@ -105,10 +105,7 @@ - {{ $t('form.check_now') }} - - {{ $t('form.generate_now') }} - + {{ $t('form.check_now') }} diff --git a/frontend/src/components/Menu/Sidebar.vue b/frontend/src/components/Menu/Sidebar.vue index c6cc4c4e0..83adcb594 100644 --- a/frontend/src/components/Menu/Sidebar.vue +++ b/frontend/src/components/Menu/Sidebar.vue @@ -13,7 +13,7 @@ {{ $t('navigation.overview') }} - + {{ $t('navigation.send') }} diff --git a/frontend/src/graphql/mutations.js b/frontend/src/graphql/mutations.js index 111eb7ab5..55858b09b 100644 --- a/frontend/src/graphql/mutations.js +++ b/frontend/src/graphql/mutations.js @@ -128,7 +128,7 @@ export const deleteContribution = gql` ` export const createContributionMessage = gql` - mutation($contributionId: Float!, $message: String!) { + mutation($contributionId: Int!, $message: String!) { createContributionMessage(contributionId: $contributionId, message: $message) { id message diff --git a/frontend/src/locales/de.json b/frontend/src/locales/de.json index 5f2b49772..719ed4cad 100644 --- a/frontend/src/locales/de.json +++ b/frontend/src/locales/de.json @@ -27,9 +27,9 @@ "moderator": "Moderator", "moderators": "Moderatoren", "myContributions": "Meine Beiträge", - "noOpenContributionLinkText": "Zur Zeit gibt es keine automatischen Schöpfungen.", - "openContributionLinks": "Öffentliche Beitrags-Linkliste", - "openContributionLinkText": "Folgende {count} automatische Schöpfungen werden zur Zeit durch die Gemeinschaft „{name}“ bereitgestellt.", + "noOpenContributionLinkText": "Zur Zeit gibt es keine per Link erzeugte Schöpfungen.", + "openContributionLinks": "Per Link erzeugte Schöpfungen", + "openContributionLinkText": "Die Gemeinschaft „{name}“ unterstützt aktuell {count} per Link erzeugte Schöpfungen:", "submitContribution": "Schreiben" }, "communityInfo": "Gemeinschaft Information", diff --git a/frontend/src/locales/en.json b/frontend/src/locales/en.json index 538d8cd05..a0c06dc56 100644 --- a/frontend/src/locales/en.json +++ b/frontend/src/locales/en.json @@ -27,9 +27,9 @@ "moderator": "Moderator", "moderators": "Moderators", "myContributions": "My contributions", - "noOpenContributionLinkText": "Currently there are no automatic creations.", - "openContributionLinks": "Open contribution-link list", - "openContributionLinkText": "The following {count} automatic creations are currently provided by the \"{name}\" community.", + "noOpenContributionLinkText": "Currently there are no link-generated creations.", + "openContributionLinks": "Creations generated by link", + "openContributionLinkText": "The \"{name}\" community currently supports {count} link-generated creations:", "submitContribution": "Contribute" }, "communityInfo": "Community Information", diff --git a/frontend/src/locales/es.json b/frontend/src/locales/es.json index 9441a10a2..725eb10ad 100644 --- a/frontend/src/locales/es.json +++ b/frontend/src/locales/es.json @@ -26,8 +26,9 @@ "moderator": "Moderador", "moderators": "Moderadores", "myContributions": "Mis contribuciones al bien común", - "openContributionLinks": "lista de enlaces de contribuciones públicas", - "openContributionLinkText": "La comunidad \"{name}\" proporciona actualmente las siguientes {count} creaciones automáticas.", + "noOpenContributionLinkText": "Actualmente no hay creaciones generadas por enlaces.", + "openContributionLinks": "Creaciones generadas por enlace", + "openContributionLinkText": "La comunidad \"{name}\" admite actualmente {count} creaciones generadas por enlaces:", "other-communities": "Otras comunidades", "statistic": "Estadísticas", "submitContribution": "escribir", diff --git a/frontend/src/locales/fr.json b/frontend/src/locales/fr.json index 9e2c11fc5..102825acc 100644 --- a/frontend/src/locales/fr.json +++ b/frontend/src/locales/fr.json @@ -27,9 +27,9 @@ "moderator": "Modérateur", "moderators": "Modérateurs", "myContributions": "Mes contributions", - "noOpenContributionLinkText": "Currently there are no automatic creations.", - "openContributionLinks": "liste de liens de contribution publique", - "openContributionLinkText": "Les {count} créations automatiques suivantes sont actuellement fournies par la communauté \"{name}\".", + "noOpenContributionLinkText": "Actuellement, il n'y a pas de créations générées par lien.", + "openContributionLinks": "Créations générées par lien", + "openContributionLinkText": "La communauté \"{name}\" soutient actuellement {count} créations générées par lien:", "submitContribution": "Contribuer" }, "communityInfo": "Information communauté^^", diff --git a/frontend/src/locales/nl.json b/frontend/src/locales/nl.json index 0ac052c47..f1306eda8 100644 --- a/frontend/src/locales/nl.json +++ b/frontend/src/locales/nl.json @@ -26,8 +26,9 @@ "moderator": "Moderator", "moderators": "Moderators", "myContributions": "Mijn bijdragen voor het algemeen belang", - "openContributionLinks": "openbare lijst van bijdragen", - "openContributionLinkText": "De volgende {count} automatische creaties worden momenteel aangeboden door de gemeenschap \"{name}\".", + "noOpenContributionLinkText": "Er zijn momenteel geen link-gegenereerde creaties.", + "openContributionLinks": "Creaties gegenereerd door link", + "openContributionLinkText": "De community \"{name}\" ondersteunt momenteel {count} link-gegenereerde creaties:", "other-communities": "Verdere gemeenschappen", "statistic": "Statistieken", "submitContribution": "schrijf", diff --git a/package.json b/package.json index c28757c68..cba894803 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "gradido", - "version": "1.19.0", + "version": "1.19.1", "description": "Gradido", "main": "index.js", "repository": "git@github.com:gradido/gradido.git",