Neil Dorin f27b6fadb9 Merge branch 'development' into feature/ecs-1209 ... # Conflicts: # PepperDashEssentials/Room/Types/EssentialsHuddleSpaceRoom.cs # PepperDashEssentials/Room/Types/EssentialsHuddleVtc1Room.cs # essentials-framework/Essentials Devices Common/Essentials Devices Common/DSP/DspBase.cs # essentials-framework/Essentials Devices Common/Essentials Devices Common/Power Controllers/Digitallogger.cs		2020-03-10 14:23:17 -06:00
..
Config	Merge branch 'development' into feature/ecs-1209	2020-03-10 14:23:17 -06:00
Crestron	Adds debug statement to Hardware_OnlineStatusChange callback to help figure out issues with devices not reporting online status correctly. Removes IsRegistered from Feedbacks and fires update manually.	2020-02-12 16:07:43 -07:00
Crestron IO	ECS-1245 Added C2nRths Controller and Bridge	2020-01-23 13:02:42 -07:00
DeviceControlsParentInterfaces	Removes essentials-framework as a submodule and brings the files back into the main repo	2019-07-09 17:21:53 -06:00
Devices	Merge branch 'development' into feature/ecs-1209	2020-03-10 14:23:17 -06:00
DeviceTypeInterfaces	Removes essentials-framework as a submodule and brings the files back into the main repo	2019-07-09 17:21:53 -06:00
Display	Major repo cleanout. Removes all files marked as REMOVE or MOVED and removes Cues and all assciated referenced.	2020-01-30 14:38:00 -07:00
Ethernet	Major repo cleanout. Removes all files marked as REMOVE or MOVED and removes Cues and all assciated referenced.	2020-01-30 14:38:00 -07:00
Factory	ECS-1245 Added C2nRths Controller and Bridge	2020-01-23 13:02:42 -07:00
Feedbacks	Major repo cleanout. Removes all files marked as REMOVE or MOVED and removes Cues and all assciated referenced.	2020-01-30 14:38:00 -07:00
Fusion	Updates to IRunRouteAction to require specification of sourceListKey	2019-12-04 22:36:25 -07:00
Global	Closes #26. If specified SGD file isnt' found in User/sgd directory, we look in application/SGD directory for embedded resource file. Updates PD.Core to latest.	2020-02-14 14:28:40 -07:00
InUseTracking	Removes essentials-framework as a submodule and brings the files back into the main repo	2019-07-09 17:21:53 -06:00
JoinMaps	Merge branch 'development' into feature/ecs-1209	2020-03-10 14:23:17 -06:00
License	Major repo cleanout. Removes all files marked as REMOVE or MOVED and removes Cues and all assciated referenced.	2020-01-30 14:38:00 -07:00
Lighting	Removes essentials-framework as a submodule and brings the files back into the main repo	2019-07-09 17:21:53 -06:00
Microphone Privacy	Merge branch 'feature/ecs-1188' into bugfix/ecs-1192	2019-11-27 11:22:27 -07:00
Monitoring	Major repo cleanout. Removes all files marked as REMOVE or MOVED and removes Cues and all assciated referenced.	2020-01-30 14:38:00 -07:00
Plugins	Added MinimumEssentialsFrameworkVersion to plugin interface	2020-02-15 15:10:22 -07:00
Presets	Adds PresetBase class and new IHasCameraPresets interface	2019-11-26 14:20:28 -07:00
Properties	Merge branch 'development' into feature/action-testing	2020-03-06 12:46:37 -07:00
Ramps and Increments	Removes essentials-framework as a submodule and brings the files back into the main repo	2019-07-09 17:21:53 -06:00
References	Removes essentials-framework as a submodule and brings the files back into the main repo	2019-07-09 17:21:53 -06:00
Room	Merge branch 'development' into feature/ecs-1209	2020-03-10 14:23:17 -06:00
Routing	Merge branch 'feature/ecs-1188' into bugfix/ecs-1192	2019-11-27 11:22:27 -07:00
Routing-CHECK REMOVE	Removes essentials-framework as a submodule and brings the files back into the main repo	2019-07-09 17:21:53 -06:00
Shades	Removes essentials-framework as a submodule and brings the files back into the main repo	2019-07-09 17:21:53 -06:00
SmartObjects	Major repo cleanout. Removes all files marked as REMOVE or MOVED and removes Cues and all assciated referenced.	2020-01-30 14:38:00 -07:00
Timers	Adds new joins to DmTxControllerJoinMap and associated bridge	2020-02-20 15:32:49 -07:00
Touchpanels	Major repo cleanout. Removes all files marked as REMOVE or MOVED and removes Cues and all assciated referenced.	2020-01-30 14:38:00 -07:00
TriListBridges	Removes essentials-framework as a submodule and brings the files back into the main repo	2019-07-09 17:21:53 -06:00
UI PageManagers	Removes essentials-framework as a submodule and brings the files back into the main repo	2019-07-09 17:21:53 -06:00
VideoStatus	Major repo cleanout. Removes all files marked as REMOVE or MOVED and removes Cues and all assciated referenced.	2020-01-30 14:38:00 -07:00
app.config	Removes essentials-framework as a submodule and brings the files back into the main repo	2019-07-09 17:21:53 -06:00
PepperDash_Essentials_Core.csproj	Merge branch 'development' into feature/ecs-1209	2020-03-10 14:23:17 -06:00
SigHelper.cs	Removes essentials-framework as a submodule and brings the files back into the main repo	2019-07-09 17:21:53 -06:00