diff --git a/CHANGELOG.md b/CHANGELOG.md index 8d9855916..8af5505e0 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,8 +4,9 @@ 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.0.0](https://github.com/gradido/gradido/compare/0.9.4...1.0.0) +#### [1.0.1](https://github.com/gradido/gradido/compare/0.9.4...1.0.1) +- Send button only click [`#427`](https://github.com/gradido/gradido/pull/427) - use new function for balance overview in old frontend, update balance… [`#422`](https://github.com/gradido/gradido/pull/422) - thx.vue coloured background removed. design adapted to app [`#426`](https://github.com/gradido/gradido/pull/426) - translation password rules in Register.vue and ResetPasswort.vue fixed [`#424`](https://github.com/gradido/gradido/pull/424) @@ -117,9 +118,9 @@ Generated by [`auto-changelog`](https://github.com/CookPete/auto-changelog). - Background color change [`#117`](https://github.com/gradido/gradido/pull/117) - Delete unused files [`#116`](https://github.com/gradido/gradido/pull/116) - store aufräumen teil 1 [`#115`](https://github.com/gradido/gradido/pull/115) -- replace \r\n with \n [`5533479`](https://github.com/gradido/gradido/commit/55334799cb4ca297978f52e52e37d0de45f1add4) - add migrations table for automatic table data migration [`40a9a8c`](https://github.com/gradido/gradido/commit/40a9a8c2b587f5bef0fcc54136ed7bd13dd91b2b) - update yarn.lock after running yarn install [`7f38c80`](https://github.com/gradido/gradido/commit/7f38c801213ad886e9d34a8d43b00ae423f5f2a0) +- use new function for balance overview in old frontend, update balance in session on every php-request [`97c570c`](https://github.com/gradido/gradido/commit/97c570c08cc51ed17a69eb8be8d987f95f3c2ce0) #### [0.9.4](https://github.com/gradido/gradido/compare/0.9.3...0.9.4) diff --git a/frontend/package.json b/frontend/package.json index aa999ffbd..21b02ee2e 100755 --- a/frontend/package.json +++ b/frontend/package.json @@ -1,6 +1,6 @@ { "name": "bootstrap-vue-gradido-wallet", - "version": "1.0.0", + "version": "1.0.1", "private": true, "scripts": { "start": "node run/server.js", diff --git a/frontend/src/views/Pages/AccountOverview/GddTable.vue b/frontend/src/views/Pages/AccountOverview/GddTable.vue index 88b336a21..f516f7cbb 100644 --- a/frontend/src/views/Pages/AccountOverview/GddTable.vue +++ b/frontend/src/views/Pages/AccountOverview/GddTable.vue @@ -100,7 +100,7 @@ export default { name: 'GddTable', props: { transactions: { default: [] }, - max: { type: Number, default: 25 }, + max: { type: Number, default: 1000 }, timestamp: { type: Number, default: 0 }, transactionCount: { type: Number, default: 0 }, }, diff --git a/login_server/src/cpp/HTTPInterface/ElopageWebhook.cpp b/login_server/src/cpp/HTTPInterface/ElopageWebhook.cpp index 67b6fa0d0..af36bcb5a 100644 --- a/login_server/src/cpp/HTTPInterface/ElopageWebhook.cpp +++ b/login_server/src/cpp/HTTPInterface/ElopageWebhook.cpp @@ -382,6 +382,7 @@ int HandleElopageRequestTask::run() DataTypeConverter::strToInt(mRequestData.get("noEmail", "0"), noEMail); if (noEMail != 1) { + emailVerification->setBaseUrl(ServerConfig::g_serverPath + "/checkEmail"); em->addEmail(new model::Email(emailVerification, newUser, model::EMAIL_USER_VERIFICATION_CODE)); } } diff --git a/login_server/src/cpp/HTTPInterface/ResetPassword.cpp b/login_server/src/cpp/HTTPInterface/ResetPassword.cpp index 5b5b95721..0d47ef89e 100644 --- a/login_server/src/cpp/HTTPInterface/ResetPassword.cpp +++ b/login_server/src/cpp/HTTPInterface/ResetPassword.cpp @@ -5,7 +5,7 @@ #include "Poco/DeflatingStream.h" -#line 6 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\resetPassword.cpsp" +#line 6 "F:\\Gradido\\gradido_local\\login_server\\src\\cpsp\\resetPassword.cpsp" #include "../SingletonManager/LanguageManager.h" #include "../SingletonManager/SessionManager.h" @@ -20,7 +20,7 @@ enum PageState { PAGE_WAIT_ADMIN, PAGE_EMAIL_ALREADY_SEND }; -#line 1 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\header.cpsp" +#line 1 "F:\\Gradido\\gradido_local\\login_server\\src\\cpsp\\header.cpsp" #include "../ServerConfig.h" @@ -33,7 +33,7 @@ void ResetPassword::handleRequest(Poco::Net::HTTPServerRequest& request, Poco::N if (_compressResponse) response.set("Content-Encoding", "gzip"); Poco::Net::HTMLForm form(request, request.stream()); -#line 20 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\resetPassword.cpsp" +#line 20 "F:\\Gradido\\gradido_local\\login_server\\src\\cpsp\\resetPassword.cpsp" PageState state = PAGE_EMAIL_ASK; auto lm = LanguageManager::getInstance(); @@ -95,7 +95,7 @@ void ResetPassword::handleRequest(Poco::Net::HTTPServerRequest& request, Poco::N // send reset password email int result = 0; if(user_exist) { - result = session->sendResetPasswordEmail(user, sendUserEmail, getBaseUrl()); + result = session->sendResetPasswordEmail(user, sendUserEmail, ServerConfig::g_serverPath + "/checkEmail"); } if(2 == result) { @@ -116,7 +116,7 @@ void ResetPassword::handleRequest(Poco::Net::HTTPServerRequest& request, Poco::N } -#line 3 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\header.cpsp" +#line 3 "F:\\Gradido\\gradido_local\\login_server\\src\\cpsp\\header.cpsp" bool withMaterialIcons = false; std::ostream& _responseStream = response.send(); @@ -131,20 +131,20 @@ void ResetPassword::handleRequest(Poco::Net::HTTPServerRequest& request, Poco::N responseStream << "\n"; responseStream << "\n"; responseStream << "Gradido Login Server: "; -#line 11 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\header.cpsp" +#line 11 "F:\\Gradido\\gradido_local\\login_server\\src\\cpsp\\header.cpsp" responseStream << ( pageName ); responseStream << "\n"; responseStream << "\n"; -#line 13 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\header.cpsp" +#line 13 "F:\\Gradido\\gradido_local\\login_server\\src\\cpsp\\header.cpsp" if(withMaterialIcons) { responseStream << "\n"; responseStream << "\n"; -#line 15 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\header.cpsp" +#line 15 "F:\\Gradido\\gradido_local\\login_server\\src\\cpsp\\header.cpsp" } responseStream << "\n"; responseStream << "\n"; responseStream << "\n"; @@ -152,20 +152,20 @@ void ResetPassword::handleRequest(Poco::Net::HTTPServerRequest& request, Poco::N responseStream << "
\n"; responseStream << "
\n"; responseStream << " \n"; responseStream << " \n"; responseStream << " \n"; responseStream << " \n"; responseStream << " \"logo\"\n"; responseStream << " \n"; @@ -174,7 +174,7 @@ void ResetPassword::handleRequest(Poco::Net::HTTPServerRequest& request, Poco::N // end include header.cpsp responseStream << "\n"; responseStream << " "; -#line 103 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\resetPassword.cpsp" +#line 103 "F:\\Gradido\\gradido_local\\login_server\\src\\cpsp\\resetPassword.cpsp" responseStream << ( getErrorsHtml() ); responseStream << "\n"; responseStream << "\t
\n"; @@ -182,36 +182,36 @@ void ResetPassword::handleRequest(Poco::Net::HTTPServerRequest& request, Poco::N responseStream << "\t

Passwort zurücksetzen

\n"; responseStream << "\t
\n"; responseStream << " "; -#line 108 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\resetPassword.cpsp" +#line 108 "F:\\Gradido\\gradido_local\\login_server\\src\\cpsp\\resetPassword.cpsp" if(state == PAGE_EMAIL_ASK) { responseStream << "\n"; responseStream << "
\n"; responseStream << "\t\t\t\t
\n"; responseStream << "\t\t\t\t\t
\n"; responseStream << "\t\t\t\t\t
\n"; responseStream << "\t\t\t\t\t\t\n"; responseStream << "\t\t\t\t\t\t\n"; responseStream << "\t\t\t\t\t
\n"; responseStream << "\t\t\t\t\t \n"; responseStream << "\t\t\t\t\t
\n"; responseStream << "\t\t\t\t
\n"; responseStream << "\t\t\t
\n"; responseStream << "\t"; -#line 120 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\resetPassword.cpsp" +#line 120 "F:\\Gradido\\gradido_local\\login_server\\src\\cpsp\\resetPassword.cpsp" } else if(state == PAGE_ASK) { responseStream << "\n"; responseStream << "
\n"; responseStream << "\t\t\t\t"; @@ -219,22 +219,22 @@ void ResetPassword::handleRequest(Poco::Net::HTTPServerRequest& request, Poco::N responseStream << "
\n"; responseStream << "
\n"; responseStream << "\t\n"; responseStream << "\t\n"; @@ -243,33 +243,33 @@ void ResetPassword::handleRequest(Poco::Net::HTTPServerRequest& request, Poco::N // end include flags.cpsp responseStream << "\n"; responseStream << "\t\t\t\t\n"; responseStream << "\t\t\t\t\t\n"; responseStream << "\t\t\t\t\t\n"; responseStream << "\t\t\t\t\t\n"; responseStream << "\t\t\t\t\t\n"; responseStream << "\t\t\t\t\t
\n"; responseStream << "\t\t\t\t\t\t
\n"; responseStream << "\t\t\t\t\t\t \n"; @@ -277,53 +277,53 @@ void ResetPassword::handleRequest(Poco::Net::HTTPServerRequest& request, Poco::N responseStream << "\t\t\t\t\t\t
\n"; responseStream << "\t\t\t\t\t\t \n"; responseStream << "\t\t\t\t\t\t
\n"; responseStream << "\t\t\t\t\t
\n"; responseStream << "\t\t\t\t\t \n"; responseStream << "\t\t\t\t\t
\n"; responseStream << "\t\t\t\t
\n"; responseStream << "\t\t\t
\n"; responseStream << "\t "; -#line 144 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\resetPassword.cpsp" +#line 144 "F:\\Gradido\\gradido_local\\login_server\\src\\cpsp\\resetPassword.cpsp" } else if(state == PAGE_WAIT_EMAIL) { responseStream << "\n"; responseStream << "\t\t\t"; -#line 145 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\resetPassword.cpsp" +#line 145 "F:\\Gradido\\gradido_local\\login_server\\src\\cpsp\\resetPassword.cpsp" responseStream << ( langCatalog->gettext("Dir wird eine E-Mail zugeschickt um dein Passwort zurückzusetzen.") ); responseStream << "\n"; responseStream << "\t "; -#line 146 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\resetPassword.cpsp" +#line 146 "F:\\Gradido\\gradido_local\\login_server\\src\\cpsp\\resetPassword.cpsp" } else if(state == PAGE_WAIT_ADMIN) { responseStream << "\n"; responseStream << "\t\t\t"; -#line 147 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\resetPassword.cpsp" +#line 147 "F:\\Gradido\\gradido_local\\login_server\\src\\cpsp\\resetPassword.cpsp" responseStream << ( langCatalog->gettext("Der Admin hat eine E-Mail bekommen und wird sich bei dir melden.") ); responseStream << "\n"; responseStream << "\t "; -#line 148 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\resetPassword.cpsp" +#line 148 "F:\\Gradido\\gradido_local\\login_server\\src\\cpsp\\resetPassword.cpsp" } else if(state == PAGE_EMAIL_ALREADY_SEND) { responseStream << "\n"; responseStream << "\t\t\t

"; -#line 149 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\resetPassword.cpsp" +#line 149 "F:\\Gradido\\gradido_local\\login_server\\src\\cpsp\\resetPassword.cpsp" responseStream << ( langCatalog->gettext("Du hast bereits eine E-Mail bekommen. Bitte schau auch in dein Spam-Verzeichnis nach. ") ); responseStream << "

\n"; responseStream << "\t\t\t

"; -#line 150 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\resetPassword.cpsp" +#line 150 "F:\\Gradido\\gradido_local\\login_server\\src\\cpsp\\resetPassword.cpsp" responseStream << ( langCatalog->gettext("Du hast wirklich keine E-Mail erhalten und auch schon ein paar Minuten gewartet?") ); responseStream << "

\n"; responseStream << "\t\t\t

"; -#line 151 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\resetPassword.cpsp" +#line 151 "F:\\Gradido\\gradido_local\\login_server\\src\\cpsp\\resetPassword.cpsp" responseStream << ( langCatalog->gettext("E-Mail an Support schicken")); responseStream << "

\n"; responseStream << "\t "; -#line 152 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\resetPassword.cpsp" +#line 152 "F:\\Gradido\\gradido_local\\login_server\\src\\cpsp\\resetPassword.cpsp" } responseStream << "\n"; responseStream << "
\n"; responseStream << "
\n"; @@ -345,14 +345,14 @@ void ResetPassword::handleRequest(Poco::Net::HTTPServerRequest& request, Poco::N responseStream << "
\n"; responseStream << "
\n"; responseStream << " "; -#line 6 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\footer.cpsp" +#line 6 "F:\\Gradido\\gradido_local\\login_server\\src\\cpsp\\footer.cpsp" responseStream << ( mTimeProfiler.string() ); responseStream << "\n"; responseStream << "
\n"; responseStream << "
\n"; responseStream << "

Login Server in Entwicklung

\n"; responseStream << "

Alpha "; -#line 10 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\footer.cpsp" +#line 10 "F:\\Gradido\\gradido_local\\login_server\\src\\cpsp\\footer.cpsp" responseStream << ( ServerConfig::g_versionString ); responseStream << "

\n"; responseStream << "
\n"; diff --git a/login_server/src/cpp/JSONInterface/JsonAdminEmailVerificationResend.cpp b/login_server/src/cpp/JSONInterface/JsonAdminEmailVerificationResend.cpp index 8a11a0840..08be3cc26 100644 --- a/login_server/src/cpp/JSONInterface/JsonAdminEmailVerificationResend.cpp +++ b/login_server/src/cpp/JSONInterface/JsonAdminEmailVerificationResend.cpp @@ -100,7 +100,9 @@ Poco::JSON::Object* JsonAdminEmailVerificationResend::handle(Poco::Dynamic::Var if (emailVerification.isNull()) { return stateError("no email verification code found"); } + emailVerification->getModel()->insertIntoDB(false); + emailVerification->setBaseUrl(ServerConfig::g_serverPath + "/checkEmail"); em->addEmail(new model::Email(emailVerification, receiverUser, model::EMAIL_ADMIN_USER_VERIFICATION_CODE_RESEND)); return stateSuccess(); diff --git a/login_server/src/cpp/JSONInterface/JsonCreateUser.cpp b/login_server/src/cpp/JSONInterface/JsonCreateUser.cpp index 4917f611a..fe31fd5a2 100644 --- a/login_server/src/cpp/JSONInterface/JsonCreateUser.cpp +++ b/login_server/src/cpp/JSONInterface/JsonCreateUser.cpp @@ -109,7 +109,7 @@ Poco::JSON::Object* JsonCreateUser::handle(Poco::Dynamic::Var params) emailOptInModel->sendErrorsAsEmail(); return stateError("insert emailOptIn failed"); } - emailOptIn->setBaseUrl(mServerHost + "/" + ServerConfig::g_frontend_checkEmailPath); + emailOptIn->setBaseUrl(user->getGroupBaseUrl() + ServerConfig::g_frontend_checkEmailPath); em->addEmail(new model::Email(emailOptIn, user, model::Email::convertTypeFromInt(emailType))); if (login_after_register && session) { diff --git a/login_server/src/cpsp/resetPassword.cpsp b/login_server/src/cpsp/resetPassword.cpsp index 3f90daf2d..393b5cf53 100644 --- a/login_server/src/cpsp/resetPassword.cpsp +++ b/login_server/src/cpsp/resetPassword.cpsp @@ -78,7 +78,7 @@ enum PageState { // send reset password email int result = 0; if(user_exist) { - result = session->sendResetPasswordEmail(user, sendUserEmail, getBaseUrl()); + result = session->sendResetPasswordEmail(user, sendUserEmail, ServerConfig::g_serverPath + "/checkEmail"); } if(2 == result) { diff --git a/package.json b/package.json index 9b37bd686..0ebef23ff 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "gradido", - "version": "1.0.0", + "version": "1.0.1", "description": "Gradido", "main": "index.js", "repository": "git@github.com:gradido/gradido.git",