Merge requests · dSS - digitalSTROM Server / dss-mainline

fix warning 'Inaccessible direct base' caused by multiple inheritance

!18 · created Mar 25, 2015 by andreas.fenkart
- Merged
- 7
updated Mar 31, 2015
Implement vDC API property wrappers in dSS and offer a JSON interface

!21 · created Mar 27, 2015 by remy.mahler
- Merged
- 2
updated Mar 30, 2015
JSON setHeatingGroup

!23 · created Mar 30, 2015 by Christian Hitz
- Merged
- 0
updated Mar 30, 2015
fix memory leak in getStates()

!22 · created Mar 27, 2015 by Michael Tross
- Merged
- 0
updated Mar 27, 2015
unit test: format uploaded event as JSON

!19 · created Mar 25, 2015 by andreas.fenkart
- Merged
- 0
updated Mar 26, 2015
add link to model features documentation

!17 · created Mar 25, 2015 by Jin
- Merged
- 0
updated Mar 26, 2015
Replace ModelEvents queue by deque to pop_front/push_back elements

!13 · created Mar 23, 2015 by andreas.fenkart
- Merged
- 4
updated Mar 24, 2015
Restructure checkSensorValue

!16 · created Mar 24, 2015 by Christian Hitz
- Merged
- 0
updated Mar 24, 2015
ltmode

!15 · created Mar 23, 2015 by Christian Hitz
- Merged
- 0
updated Mar 23, 2015
Adapt callback registration

!14 · created Mar 23, 2015 by reto.fluetsch
- Merged
- 0
updated Mar 23, 2015
4858 sensor trigger and states

!12 · created Mar 20, 2015 by Michael Tross
- Merged
- 4
updated Mar 23, 2015
Delete json.h/cpp

!11 · created Mar 19, 2015 by Christian Hitz
- Merged
- 0
updated Mar 23, 2015
buttoninputmode on color change

!8 · created Mar 18, 2015 by Christian Hitz R1503
- Merged
- 1
updated Mar 18, 2015
Fix json api call

!7 · created Mar 17, 2015 by remy.mahler
- Merged
- 0
updated Mar 17, 2015
invalid property tree

!3 · created Mar 16, 2015 by Christian Hitz
- Merged
- 1
updated Mar 16, 2015
Replace json generator

!1 · created Mar 12, 2015 by Christian Hitz
- Merged
- 4
updated Mar 16, 2015