15 Commits

Author SHA1 Message Date
einhornimmond
d1667e0ba9
Merge branch 'master' into api_password_reset 2021-03-31 12:38:52 +02:00
einhornimmond
363e04fbe5 put back depracted email tasks because I don't exactly know if I broke something if I remove it completly (especially model/session.cpp) 2021-03-30 18:42:07 +02:00
einhornimmond
f8d174049c
Merge branch 'master' into fix_lineendings 2021-03-30 18:29:04 +02:00
einhornimmond
3339ce9d38 change fileformat back to utf-8 with BOM, for visual studio source files which contain ä,Ä,ö,Ö,ü,Ü or ß in strings must be in format utf-8-BOM 2021-03-30 18:26:48 +02:00
f09a0017f9
lineendings login_server 2021-03-30 17:06:41 +02:00
einhornimmond
21309eada5
Update login_server/src/cpp/model/email/Email.h
Co-authored-by: Ulf Gebhardt <ulf.gebhardt@webcraft-media.de>
2021-03-29 19:17:49 +02:00
einhornimmond
8a143be842 removed email tasks complete 2021-03-25 11:00:00 +01:00
einhornimmond
a57be58197 Merge branch 'master' into api_password_reset 2021-03-24 18:09:21 +01:00
einhornimmond
b73bb64089 add send email function in API for password reset and admin email verification code resend
Describe new function in detail in docu/login_server.api.md.

Made some changes in existing code to have the option to use a custome email text,
not only the pre-formulated texte.

Use a new state for returned json, state = warning.
If function does what expected but still have a error message.
Add the new state in frontend/src/apis/loginAPI.js.
2021-03-24 14:17:58 +01:00
ogerly
15bb6f4448 merge master 2021-03-24 06:17:00 +01:00
ogerly
a99de7f5d1 dev meeting, bernd 2021-03-24 06:05:05 +01:00
einhornimmond
db99a1077e add optional paramater account state to user search to able to search users which haven't activated there account yet 2021-03-22 19:53:57 +01:00
einhornimmond
d46f9d73d9 bug fixes for stage0 production version 2021-03-19 14:00:42 +01:00
194aea6ede
Merge commit 'da1dd17887f7ca1b0af9a3bb785abff2476785dd' into monorepo_login_server 2021-03-17 22:07:03 +01:00
ac99a7097e Add 'login_server/' from commit 'ca71af1817a801db9a108c205bc298250d498c4b'
git-subtree-dir: login_server
git-subtree-mainline: 09ebb40de21084bb10ee466429d900a5e757d349
git-subtree-split: ca71af1817a801db9a108c205bc298250d498c4b
2021-03-17 22:05:25 +01:00