IT4Change/gradido
3
0
Fork 0
mirror of https://github.com/IT4Change/gradido.git synced 2025-12-13 07:45:54 +00:00
Code Issues Packages Projects Releases Wiki Activity
5,569 Commits 1 Branch 0 Tags
Commit Graph

5569 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Ulf Gebhardt
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
einhornimmond
7c27b8eaa6 add user object to return of unsecureLogin and login via email verification code 2021-04-21 17:24:01 +02:00
einhornimmond
fd6febabd3 change from file format utf8 BOM to utf8, seems that filter test only worky as utf8 without BOM file 2021-04-21 17:00:28 +02:00
Moriz Wahl
31782d28c8 remove import of loginAPI 2021-04-21 16:57:25 +02:00
Moriz Wahl
810bd6d0ba remove loginAPI calls from store 2021-04-21 16:51:46 +02:00
Moriz Wahl
4a8ba8d385 API call for logout in compomemt 2021-04-21 16:24:06 +02:00
Moriz Wahl
3a3dcf989f
Merge pull request #214 from gradido/no-password-rules 
fix: Remove Rules for Password on Login
 2021-04-21 16:20:18 +02:00
einhornimmond
00947aa8f3
Merge pull request #198 from gradido/community_15_04_2021 
Community 15 04 2021
 2021-04-21 16:17:40 +02:00
einhornimmond
6eb6062a32 fix passphrase examples because long time ago I have changed the word2 list and also updated passphrases on production server but not in tests 2021-04-21 16:16:06 +02:00
Moriz Wahl
72517bc999
Merge pull request #204 from gradido/179-menu 
refactor: Remove Right Menu
 2021-04-21 16:05:27 +02:00
Moriz Wahl
3c84382e45 remove beforeDestroy as noone can say what is it for 2021-04-21 15:52:09 +02:00
Moriz Wahl
3c65eebc61 merge into master 2021-04-21 15:45:08 +02:00
einhornimmond
ad5ff66157 don't show calculation time over expectations in test builds 2021-04-21 15:37:56 +02:00
einhornimmond
0d71a37601 check for null ptr to prevent exception 2021-04-21 15:36:55 +02:00
Moriz Wahl
f2de1f6c38 remove test for password rules on login 2021-04-21 15:28:15 +02:00
Dario Rekowski on RockPI
457aedc54b fix linting 2021-04-21 13:25:09 +00:00
Moriz Wahl
29a718116a removed rules for password on login 2021-04-21 15:24:16 +02:00