Neil Dorin 676526ed48 Merge remote-tracking branch 'origin/bugfix/mob-470' into feature/ecs-967 ...

# Conflicts:
#	PepperDashEssentials/AppServer/CotijaSystemController.cs
#	PepperDashEssentials/AppServer/RoomBridges/CotijaDdvc01RoomBridge.cs
#	PepperDashEssentials/ControlSystem.cs
#	PepperDashEssentials/OTHER/Fusion/EssentialsHuddleSpaceFusionSystemControllerBase.cs
#	PepperDashEssentials/OTHER/Fusion/EssentialsHuddleVtc1FusionController.cs
#	PepperDashEssentials/Properties/AssemblyInfo.cs
#	PepperDashEssentials/UIDrivers/EssentialsHuddle/EssentialsHuddlePanelAvFunctionsDriver.cs
#	devjson commands.json

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

..

AppServer

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

2018-12-12 13:34:32 -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

Testing SytemMonitorBridge

2018-12-12 12:59:00 -07:00

Configuration Original

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

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

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

OTHER/Fusion

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

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

Properties

DDVC01 bridge, repaired device controls

2018-10-08 15:17:02 -06: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/bugfix/mob-470' into feature/ecs-967

2018-12-12 13:34:32 -07: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

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

2018-12-12 13:34:32 -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