13 Commits

Author SHA1 Message Date
einhorn_b
e3e968b24f fix exception for unlock on false place, maybe from merging stage1 with stage2 2021-04-23 14:09:43 +02:00
einhornimmond
f1f4b81da0 add defaultGroup for easier integration with stage1 2021-04-08 12:51:29 +02:00
einhornimmond
fa48de44af fix bugs which came with merging into master 2021-03-31 19:04:36 +02:00
einhornimmond
910e33deff Merge branch 'master' into stage2 2021-03-31 18:06:57 +02:00
einhornimmond
436499458b fix login server that it can build again (after Ulfs rebase action) 2021-03-31 17:49:02 +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
8a143be842 removed email tasks complete 2021-03-25 11:00:00 +01:00
fa7082fd59
Merge commit 'd344551c834efd503ff5b86aa2863d1dae10effa' into stage2_login_server 2021-03-17 22:08:16 +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