Jason T Alborough 6bbad2e0f9 Merge remote-tracking branch 'origin/feature/ecs-967' into JTA ...

# Conflicts:
#	PepperDashEssentials/AppServer/CotijaSystemController.cs
#	PepperDashEssentials/Bridges/BridgeBase.cs
#	PepperDashEssentials/Bridges/IBasicCommunicationBridge.cs
#	PepperDashEssentials/PepperDashEssentials.csproj
#	Release Package/PepperDashEssentials.cpz
#	Release Package/PepperDashEssentials.dll
#	essentials-framework

2018-12-17 11:11:14 -05:00

..

AppServer

Updates from testing System Monitor messaging with AppServer

2018-12-14 16:56:17 -07:00

Audio

cleaned out framework files; added framework submodule; referneced p.core to reference in framework; moved essentials.sln; changed paths in sln to match; test build

2018-06-28 13:59:14 -06:00

Bridges

Merge remote-tracking branch 'origin/feature/ecs-967' into JTA

2018-12-17 11:11:14 -05:00

Configuration Original

Merges Essentials bridges proof of concept work into new BB.org repo

2018-07-17 08:05:02 -04:00

Devices

cleaned out framework files; added framework submodule; referneced p.core to reference in framework; moved essentials.sln; changed paths in sln to match; test build

2018-06-28 13:59:14 -06:00

Factory

Renamed Config in Essentials room type classes to PropertiesConfig and modified EssentialsRoomBase to derive from ReconfigurableDevice

2018-09-13 16:50:08 -06:00

FOR REFERENCE UI

Adds SystemMonitroMessenger to bridge between SystemMonitorController and AppServer (untested)

2018-12-12 16:23:17 -07:00

Properties

Merge remote-tracking branch 'origin/feature/ecs-967' into JTA

2018-12-17 11:11:14 -05:00

References/PepperDashEssentialsBase.cplz

cleaned out framework files; added framework submodule; referneced p.core to reference in framework; moved essentials.sln; changed paths in sln to match; test build

2018-06-28 13:59:14 -06:00

Room

Merge remote-tracking branch 'origin/bugfix/mob-470' into feature/ecs-967

2018-12-12 13:34:32 -07:00

SGD

cleaned out framework files; added framework submodule; referneced p.core to reference in framework; moved essentials.sln; changed paths in sln to match; test build

2018-06-28 13:59:14 -06:00

UI

Brings in changes from On Prem BB repo. Resolves ecs-756/757/758/759

2018-07-12 16:55:49 -06:00

UI - FILES ORPHANED-DELETE

cleaned out framework files; added framework submodule; referneced p.core to reference in framework; moved essentials.sln; changed paths in sln to match; test build

2018-06-28 13:59:14 -06:00

UIDrivers

Merge remote-tracking branch 'origin/bugfix/mob-470' into feature/ecs-967

2018-12-12 13:34:32 -07:00

app.config

cleaned out framework files; added framework submodule; referneced p.core to reference in framework; moved essentials.sln; changed paths in sln to match; test build

2018-06-28 13:59:14 -06:00

ClassDiagram1.cd

cleaned out framework files; added framework submodule; referneced p.core to reference in framework; moved essentials.sln; changed paths in sln to match; test build

2018-06-28 13:59:14 -06:00

ControlSystem.cs

Merge remote-tracking branch 'origin/feature/ecs-967' into JTA

2018-12-17 11:11:14 -05:00

HttpApiHandler.cs

cleaned out framework files; added framework submodule; referneced p.core to reference in framework; moved essentials.sln; changed paths in sln to match; test build

2018-06-28 13:59:14 -06:00

PepperDash Essentials iPad.sgd

cleaned out framework files; added framework submodule; referneced p.core to reference in framework; moved essentials.sln; changed paths in sln to match; test build

2018-06-28 13:59:14 -06:00

PepperDash Essentials TSW-760.sgd

cleaned out framework files; added framework submodule; referneced p.core to reference in framework; moved essentials.sln; changed paths in sln to match; test build

2018-06-28 13:59:14 -06:00

PepperDashEssentials.csproj

Adds SystemMonitroMessenger to bridge between SystemMonitorController and AppServer (untested)

2018-12-12 16:23:17 -07:00

REMOVE EssentialsApp.cs

cleaned out framework files; added framework submodule; referneced p.core to reference in framework; moved essentials.sln; changed paths in sln to match; test build

2018-06-28 13:59:14 -06:00