3185 Commits

Author SHA1 Message Date
ogerly
a784a698b8 Merge branch 'master' of https://github.com/gradido/gradido 2021-04-27 11:47:26 +02:00
Alexander Friedland
c30a419820
Merge pull request #228 from gradido/221-Mouse_Pointer_on_Hover_over_Clickable_Items
fix bug #221
2021-04-27 11:24:33 +02:00
einhorn_b
68f3c3736d update modules 2021-04-27 11:04:04 +02:00
einhornimmond
018f71e5f2
Merge pull request #227 from gradido/fix_login_empty_reply_group_id_0
fix empty reply by empty group_id
2021-04-27 10:56:43 +02:00
ogerly
1813b9917c Merge branch 'master' of https://github.com/gradido/gradido 2021-04-27 09:50:21 +02:00
ogerly
bb23e178cd href to css pointer 2021-04-27 09:38:06 +02:00
ogerly
ca865958eb add toggle() methode 2021-04-27 09:27:26 +02:00
ogerly
7e5495bd34 href to css cursor pointer 2021-04-27 09:21:00 +02:00
4fe9b0c772
Merge pull request #226 from gradido/bugfix_22_04_21
Bugfix 22 04 21
2021-04-27 01:51:18 +02:00
Moriz Wahl
c9cabd5bed undo changes on dockerfile debug 2021-04-27 01:02:34 +02:00
Moriz Wahl
1fde044403 Revert "Revert "update login-server build, allow create user without group""
This reverts commit 5de88f3a42dda18d734e9dd5de499634155725d0.
2021-04-27 00:58:28 +02:00
Moriz Wahl
a0dc2531ff password can be reseted 2021-04-27 00:32:38 +02:00
einhorn_b
bd2c065cab Merge branch 'login_build_without_conan' of /home/einhornimmond/code/gradido_conan_remove into login_build_without_conan 2021-04-27 00:05:49 +02:00
einhorn_b
604755db15 rebuilding debug build strategie for minimum space and time requirements for user 2021-04-27 00:05:40 +02:00
Moriz Wahl
cd7f864a49 Merge branch 'master' into reset-password 2021-04-26 23:21:48 +02:00
Moriz Wahl
5ae77c8eed merge master 2021-04-26 18:33:34 +02:00
ogerly
92ba58858d fix bug #221 2021-04-26 14:23:18 +02:00
ogerly
19243b9a27 new clone und docker-compose up build 2021-04-26 12:56:01 +02:00
einhorn_b
0255465b5c test and fix login release docker build 2021-04-23 22:39:56 +02:00
einhorn_b
c3022a8849 update release build 2021-04-23 21:20:32 +02:00
einhorn_b
a398d4f975 build without conan 2021-04-23 20:59:11 +02:00
einhorn_b
7f7b363c9c fix empty reply by empty group_id 2021-04-23 17:21:23 +02:00
einhornimmond
75be488fab
Merge pull request #225 from gradido/rollback_use_prebuild_dependencies
Rollback use prebuild dependencies
2021-04-23 14:40:28 +02:00
einhorn_b
2fa088c232 Merge branch 'master' into bugfix_22_04_21 2021-04-23 14:12:57 +02:00
einhorn_b
f9a8e8979c Merge branch 'master' of github.com:gradido/gradido 2021-04-23 14:10:00 +02:00
einhorn_b
e3e968b24f fix exception for unlock on false place, maybe from merging stage1 with stage2 2021-04-23 14:09:43 +02:00
e859dc5e8d
Merge pull request #199 from gradido/docu
Docu
2021-04-22 22:48:16 +02:00
einhorn_b
c704ca1a95 fix some missed out things 2021-04-22 20:06:04 +02:00
einhorn_b
c458e226fb remove conan volume because no used here 2021-04-22 19:10:06 +02:00
einhorn_b
c463a15db2 use again prebuild dependencies, but with code mounted from filesystem 2021-04-22 19:09:04 +02:00
Moriz Wahl
5de88f3a42 Revert "update login-server build, allow create user without group"
This reverts commit db15f9c4381fa2ac9c1cc88b9ecaf74cac394240.
2021-04-22 19:04:32 +02:00
einhorn_b
8e1d1aa0ae fix handlung of empty transactions list 2021-04-22 17:00:20 +02:00
einhorn_b
0c68dbde9d fixing wrong var name 2021-04-22 16:56:05 +02:00
einhorn_b
33f9c58268 fix } which don't belong there 2021-04-22 16:52:14 +02:00
Moriz Wahl
90104c8ac4
Merge pull request #222 from gradido/docker_login_server_build
update login-server build
2021-04-22 15:13:06 +02:00
einhorn_b
db15f9c438 update login-server build, allow create user without group 2021-04-22 15:04:43 +02:00
Moriz Wahl
b94dd873d5 Merge branch 'master' into reset-password 2021-04-22 12:59:09 +02:00
Moriz Wahl
daca2314ba remove reset button 2021-04-22 12:58:09 +02:00
einhornimmond
6101780d42
Merge pull request #220 from gradido/login_add_language
Login add language
2021-04-22 12:33:17 +02:00
einhornimmond
9559f912af Merge branch 'master' into login_add_language 2021-04-22 11:55:26 +02:00
einhornimmond
dea2d9597e Merge branch 'master' of github.com:gradido/gradido 2021-04-22 11:55:12 +02:00
einhornimmond
7226e6aab0
Update docu/login_server.api.md
Co-authored-by: Ulf Gebhardt <ulf.gebhardt@webcraft-media.de>
2021-04-22 11:54:19 +02:00
Moriz Wahl
2638ab8f3b Merge branch 'master' into reset-password 2021-04-22 11:12:32 +02:00
Moriz Wahl
bafe77ed10
Merge pull request #219 from gradido/login_add_user_to_json_login
User Object on Json Login
2021-04-22 11:08:08 +02:00
Moriz Wahl
009714a0b7
Merge pull request #215 from gradido/logout-API-from-component
refactor: Remove loginAPI Call from Store
2021-04-22 11:05:25 +02:00
einhornimmond
e16b6ec257
Update docu/login_server.api.md
Co-authored-by: Ulf Gebhardt <ulf.gebhardt@webcraft-media.de>
2021-04-21 19:30:59 +02:00
einhornimmond
c42d681567 add user.language as option 2021-04-21 18:32:46 +02:00
einhornimmond
36ea3727f8 update doc to fit Ulf's suggestion 2021-04-21 18:22:56 +02:00
einhornimmond
a151f3a30a
Update login_server/src/cpp/JSONInterface/JsonLoginViaEmailVerificationCode.cpp
Co-authored-by: Ulf Gebhardt <ulf.gebhardt@webcraft-media.de>
2021-04-21 18:20:46 +02:00
einhornimmond
dad397ec76 add random test data to db 2021-04-21 17:50:06 +02:00