Commit Graph

47 Commits

Author SHA1 Message Date
Christian
dbed05ccb2 cb 2018-11-22 14:05:45 +01:00
Christian
40ebcc80fc cb 2018-10-08 11:57:16 +02:00
Christian
cc642e9838 CB 2018-06-29 16:35:19 +02:00
Christian
48c19361e2 CB neue Reports 2018-06-26 17:18:59 +02:00
Christian
a9a0b46368 Merge branch 'master' of ssh://float.beyondsoft.de/git/beyondSoft/BeWo
# Conflicts:
#	BeWoPlanerMobil/Views/Main/Main.cshtml
2018-06-13 14:38:35 +02:00
Christian
bb25b9f7ff cb 2018-05-28 15:02:55 +02:00
Christian
63bfc113bc CB 2018-05-23 12:12:20 +02:00
Christian
d20b2ec5bf cb 2018-05-21 16:39:24 +02:00
Christian
1069217aa6 cb 2018-04-27 14:13:42 +02:00
Christian
b76d6ea7d1 Merge branch 'master' of ssh://float.beyondsoft.de/git/beyondSoft/BeWo
# Conflicts:
#	Data/Access/SearchDAO.cs
2018-03-02 16:24:55 +01:00
Christian
fde167c475 CB 2018-01-08 22:29:10 +01:00
Christian
5d82fcfe75 cb 2017-12-15 10:47:43 +01:00
Christian
42fbe5c66f CB 2017-12-07 11:14:50 +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
0fd18016ba cb bugfixes 2017-10-20 11:41:39 +02:00
Christian
15c91ecaec dies und das 2017-09-14 19:03:26 +02:00
Christian
36d19d213e QueryService entfernt 2017-08-23 17:11:53 +02:00
Christian
0480df61a8 CB 14.08. 2017-08-14 11:59:31 +02:00
Christian
f4e8bd6a73 cb 2017-07-25 10:52:20 +02:00
Christian
bce313c146 Reports 2017-06-28 09:00:09 +02:00
Christian
bb7a90af9e Bugfixing+Reports Upgrade auf devexpress 13.2. 2017-06-14 08:28:21 +02:00
Christian
cf90774667 bugfixing 2017-06-11 15:50:31 +02:00
Christian
8a1101bbf0 Merge 2017-06-08 14:56:01 +02:00
Waldi
4a94d2c530 Sultan Sahin Reports 2017-05-29 09:24:16 +02:00
Waldi
71185c79f6 BeWo Leverkusen 2017-05-22 12:52:58 +02:00
Christian
f40a005f13 dies und das 2017-05-18 21:47:09 +02:00
Waldi
750e08d358 Lebenshilfe MAnnheim e.V 2017-05-04 08:53:32 +02:00
Christian
8afc248626 Merge branch 'master' of ssh://float.beyondsoft.de/git/beyondSoft/BeWo
# Conflicts:
#	BeWo/SchulbegleitenderDienst/NewSchulbegleitenderDienstView.xaml
#	BeWo/ServiceProxy/Generated.cs
#	BeWo/View/Detail/ServiceRecordView2.xaml.cs
#	BeWo/ViewModel/VertretungVM.cs
#	Data/Entities/Vertretung.cs
#	ReportImp/HphBersenbrueckAtz/HphBersenbrueckAtz.csproj
#	Service/DCEntityMapper/VertretungDC_Vertretung.cs
#	Service/Plugins/PluginLoader.cs
#	Service/ServiceContracts/IOperationsService.cs
#	Service/ServiceImplementations/OperationsServiceImp.cs
#	Shared/DataContracts/VertretungDC.cs
2017-04-26 13:52:04 +02:00
Christian
ad42184e6b Diverses 2017-04-25 18:07:24 +02:00
Christian
e15b8cdcf7 Merge 2017-04-03 13:39:11 +02:00
Waldi
12a612c77c Merge branch 'master' of ssh://float.beyondsoft.de/git/beyondSoft/BeWo 2017-03-29 11:14:13 +02:00
Waldi
5becef884c Bielefelder Ambulante Pflege 2017-03-29 11:10:48 +02:00
Christian
1748e8db21 Bugfixing 2017-03-28 16:11:01 +02:00
Christian
b8e29f47b7 Merge branch 'master' of ssh://float.beyondsoft.de/git/beyondSoft/BeWo
# Conflicts:
#	Service/Plugins/PluginLoader.cs
2017-03-24 10:32:48 +01:00
Christian
3a244446db Release Test und Bugfixes 2017-03-24 10:30:18 +01:00
Waldi
a8ae3b4c19 Pluginloader Aktualisiert 2017-03-22 11:22:18 +01:00
Waldi
11e11f226f pluginloader update 2017-03-16 14:05:53 +01:00
Waldi
688b4a7ea5 teufelskreis 2017-03-08 13:10:36 +01:00
Waldi
2f049de216 report und Zeiterfassung sekunden anpassung 2017-03-08 13:05:45 +01:00
Christian
1ac9ece4a8 Delete von ServiceRecords 2017-03-07 08:46:32 +01:00
Waldi
96e6549cbe report Prof eggers Stiftung und das löschen von Zeiterfassungen sollte wieder funktionieren. 2017-02-21 11:05:27 +01:00
Waldi
5c6de1ae7f Pluginloader vergessen 2017-02-10 11:09:10 +01:00
Waldi
2ccab62f4f Passwort stärke gelokert und Bug gefixed + link hinzugefügt der zur Passwortsicherheit führt 2017-02-08 13:47:33 +01:00
Christian
21e230e568 Merge alte Version 2017-02-01 13:53:59 +01:00
root
886b5e4fd6 moved from SVN to git 2016-06-27 01:45:38 +02:00