|
|
1b9efb8f79
|
Squashed commit of the following:
commit af28476b76
Merge: b76e16946 c3b6a1e9c
Author: Marcel Hirschle <marcel.hirschle@ownsoft.de>
Date: Thu Jun 20 11:53:31 2024 +0200
Merge branch 'master' of ssh://float.ownsoft.de/git/beyondSoft/BeWo
# Conflicts:
# ReportImp/VkmHamm/CustomerMitarbeiterstundenkontoBerechnung.cs
commit b76e169462
Author: Marcel Hirschle <marcel.hirschle@ownsoft.de>
Date: Thu Jun 20 11:40:08 2024 +0200
MH: vkm hamm stundenkonto
commit c3b6a1e9c0
Author: Christian <christian.baeurle@beyondsoft.de>
Date: Thu Jun 20 10:58:05 2024 +0200
Mergemarker entfernt
commit 5ff8fe343b
Merge: c1aa61f05 fc57725f4
Author: Christian <christian.baeurle@beyondsoft.de>
Date: Thu Jun 20 10:52:16 2024 +0200
Merge branch 'master' of ssh://float.beyondsoft.de/git/beyondSoft/BeWo
commit c1aa61f058
Merge: 12faccb71 1c0a94c60
Author: Christian <christian.baeurle@beyondsoft.de>
Date: Thu Jun 20 10:51:59 2024 +0200
Merge branch 'master' of ssh://float.beyondsoft.de/git/beyondSoft/BeWo
# Conflicts:
# BeWo/ServiceProxy/Generated.cs
# Data/Security/UserRightHelper.cs
# Shared/BeWoEntityEnums.cs
# Shared/Core/EnumTranslations.cs
commit 12faccb71b
Author: Christian <christian.baeurle@beyondsoft.de>
Date: Wed Jun 19 16:13:56 2024 +0200
Perseh Hilfeplan Import + KI Prototyp,
|
2024-06-20 12:16:00 +02:00 |
|
Christian
|
00c7ae8267
|
Neues Recht "Medikation bearbeiten", Icons in Ziele Auswahl in Zeiterfassung
|
2024-02-20 12:36:59 +01:00 |
|
Christian
|
4f1251e2b9
|
Neues Fehlerfenster
|
2023-06-22 09:35:51 +02:00 |
|
Christian
|
e2e0689c1d
|
cb 2 faktor Authentifizierung
|
2021-02-22 10:14:07 +01:00 |
|
Christian
|
64ab1519d8
|
cb: Reports, bugfixing etc.
|
2020-11-25 11:40:05 +01:00 |
|
Christian
|
514c19ce3d
|
cb, letzte Bugfixes vor Version
|
2020-11-10 02:25:15 +01:00 |
|
Christian
|
710e647671
|
Merge branch 'master' of ssh://float.beyondsoft.de/git/beyondSoft/BeWo
# Conflicts:
# BeWo/View/Navigation/SupportConceptNavigationView.xaml.cs
|
2017-11-23 10:58:07 +01:00 |
|
Christian
|
75a6bb6284
|
diverses
|
2017-11-17 22:24:00 +01:00 |
|
Christian
|
eb8f40d384
|
CB
|
2017-11-07 13:46:55 +01:00 |
|
Christian
|
cf90774667
|
bugfixing
|
2017-06-11 15:50:31 +02:00 |
|
Christian
|
00ee430efb
|
SBD
|
2017-05-22 11:14:48 +02:00 |
|
root
|
886b5e4fd6
|
moved from SVN to git
|
2016-06-27 01:45:38 +02:00 |
|
