From 60f24f9e18556749605ce8b78df836471fafe429 Mon Sep 17 00:00:00 2001 From: einhornimmond Date: Thu, 17 Jun 2021 14:51:14 +0200 Subject: [PATCH 1/2] add first error additional as msg --- login_server/src/cpp/JSONInterface/JsonUpdateUserInfos.cpp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/login_server/src/cpp/JSONInterface/JsonUpdateUserInfos.cpp b/login_server/src/cpp/JSONInterface/JsonUpdateUserInfos.cpp index bbec11110..a99881756 100644 --- a/login_server/src/cpp/JSONInterface/JsonUpdateUserInfos.cpp +++ b/login_server/src/cpp/JSONInterface/JsonUpdateUserInfos.cpp @@ -226,9 +226,10 @@ Poco::JSON::Object* JsonUpdateUserInfos::handle(Poco::Dynamic::Var params) result->set("errors", jsonErrorsArray); result->set("valid_values", extractet_values); if (!jsonErrorsArray.size()) { - result->set("state", "success"); + result->set("state", "success"); } else { + result->set("msg", jsonErrorsArray.get(0)); result->set("state", "error"); } From 1b6e4138efc94b68e6dfce89d1267888b6b04882 Mon Sep 17 00:00:00 2001 From: Moriz Wahl Date: Thu, 17 Jun 2021 15:13:18 +0200 Subject: [PATCH 2/2] v1.1.0 --- CHANGELOG.md | 44 +++++++++++++++++++ frontend/package.json | 2 +- .../UserProfile/UserCard_FormUserPasswort.vue | 4 +- package.json | 2 +- 4 files changed, 48 insertions(+), 4 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index a71ad2fd4..e949f98e3 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,8 +4,52 @@ 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.1.0](https://github.com/gradido/gradido/compare/1.0.2...1.1.0) + +- fix: API Call for Reset Password [`#571`](https://github.com/gradido/gradido/pull/571) +- Login reset password [`#570`](https://github.com/gradido/gradido/pull/570) +- Hide unuse components in profil [`#566`](https://github.com/gradido/gradido/pull/566) +- fix: Thousend Dividers on GDD Send Amount Field [`#567`](https://github.com/gradido/gradido/pull/567) +- reorganisiere Dockerfiles [`#550`](https://github.com/gradido/gradido/pull/550) +- hot fixes shown by test [`#551`](https://github.com/gradido/gradido/pull/551) +- fix to big text ths [`#565`](https://github.com/gradido/gradido/pull/565) +- feat: Trim Email on Blur [`#556`](https://github.com/gradido/gradido/pull/556) +- Mobile UI send gdd form [`#562`](https://github.com/gradido/gradido/pull/562) +- fix: Change Password Form [`#561`](https://github.com/gradido/gradido/pull/561) +- change userdata button disable rules [`#548`](https://github.com/gradido/gradido/pull/548) +- Change password require old password [`#519`](https://github.com/gradido/gradido/pull/519) +- feat: Test Forget Password [`#546`](https://github.com/gradido/gradido/pull/546) +- feat: Validate Change Username [`#545`](https://github.com/gradido/gradido/pull/545) +- Remove base input example login vue [`#524`](https://github.com/gradido/gradido/pull/524) +- Feature: Change Username [`#490`](https://github.com/gradido/gradido/pull/490) +- feat: Toaster to Display Messages [`#512`](https://github.com/gradido/gradido/pull/512) +- fix: Validation of GDD Send Amount Field [`#525`](https://github.com/gradido/gradido/pull/525) +- Community coverage [`#496`](https://github.com/gradido/gradido/pull/496) +- compare with last transaction sended [`#523`](https://github.com/gradido/gradido/pull/523) +- remove check decays for being at least 100 GDD cent [`#526`](https://github.com/gradido/gradido/pull/526) +- fix: Remove Target Date in Send Coins Request [`#518`](https://github.com/gradido/gradido/pull/518) +- Feature profile page bugs [`#511`](https://github.com/gradido/gradido/pull/511) +- fix: GDD Send Amount Input Field [`#491`](https://github.com/gradido/gradido/pull/491) +- change transfer confirmation email [`#485`](https://github.com/gradido/gradido/pull/485) +- Login wait on passwords with missing chars [`#487`](https://github.com/gradido/gradido/pull/487) +- fix problem with create User [`#486`](https://github.com/gradido/gradido/pull/486) +- Feature: Profile Page + Update API [`#474`](https://github.com/gradido/gradido/pull/474) +- add new API Call checkUsername [`#482`](https://github.com/gradido/gradido/pull/482) +- feat: Pagination Buttons for Transaction List [`#473`](https://github.com/gradido/gradido/pull/473) +- Login-Server & Community-Server Coverage [`#472`](https://github.com/gradido/gradido/pull/472) +- login without hedera [`#478`](https://github.com/gradido/gradido/pull/478) +- fix: Show Correct Version Number in Footer [`#475`](https://github.com/gradido/gradido/pull/475) +- refactor: Remove Element-UI [`#476`](https://github.com/gradido/gradido/pull/476) +- remove components Charts, Notification, SearchUser, ButtonCheckbox, Button RadioGroup, Breadcrumb [`159bff7`](https://github.com/gradido/gradido/commit/159bff71df20a5c48f93389b2f990f7fe54e53b9) +- fix bug, update dockerfiles to use dependencies without grpc [`dedcebd`](https://github.com/gradido/gradido/commit/dedcebdb95ee0f3dfd2ad62074d4181af38476a2) +- add warning to able to forward warnings from community server to client [`2fc3fe9`](https://github.com/gradido/gradido/commit/2fc3fe94a09bae199bf2f34f9df90e8fc3879c2b) + #### [1.0.2](https://github.com/gradido/gradido/compare/1.0.1...1.0.2) +> 27 May 2021 + +- feat: Test Transaction List [`#470`](https://github.com/gradido/gradido/pull/470) +- fixed problem with finding cpsp parse binary under windows with conan [`#471`](https://github.com/gradido/gradido/pull/471) - fix: GDD Amount is Always Displayed with Two Digits [`#468`](https://github.com/gradido/gradido/pull/468) - fix: Date Time Formats [`#469`](https://github.com/gradido/gradido/pull/469) - Community ipv6 localhost [`#466`](https://github.com/gradido/gradido/pull/466) diff --git a/frontend/package.json b/frontend/package.json index 910644e2c..b53826746 100755 --- a/frontend/package.json +++ b/frontend/package.json @@ -1,6 +1,6 @@ { "name": "bootstrap-vue-gradido-wallet", - "version": "1.0.2", + "version": "1.1.0", "private": true, "scripts": { "start": "node run/server.js", diff --git a/frontend/src/views/Pages/UserProfile/UserCard_FormUserPasswort.vue b/frontend/src/views/Pages/UserProfile/UserCard_FormUserPasswort.vue index f1733c691..269c6c7be 100644 --- a/frontend/src/views/Pages/UserProfile/UserCard_FormUserPasswort.vue +++ b/frontend/src/views/Pages/UserProfile/UserCard_FormUserPasswort.vue @@ -181,10 +181,10 @@ export default { ) if (result.success) { this.$toast.success(this.$t('site.thx.reset')) + this.cancelEdit() } else { - this.$toast.error(this.$t('error.change-password')) + this.$toast.error(result.result.message) } - this.cancelEdit() }, }, computed: { diff --git a/package.json b/package.json index c2f93ac22..7909b3d78 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "gradido", - "version": "1.0.2", + "version": "1.1.0", "description": "Gradido", "main": "index.js", "repository": "git@github.com:gradido/gradido.git",