Andrew Welker 436db82006 fix weird merge conflicts

2020-08-26 14:49:11 -06: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 branch 'development' into hotfix/bridge-registration

2020-07-08 11:33:20 -07:00

Devices

Updating more device factories in Essentials and Devices.Common

2020-04-22 17:51:22 -06:00

Example Configuration

Updates to correct 'hardware' references accidentally changed to 'sensor'. Updated SIMPLBridge example config to include GLS-PART-CN configuration

2020-06-30 12:03:48 -05:00

Factory

fix device factory

2020-07-14 11:19:03 -06:00

Fusion

Update to support Cisco Codec External Sources using Essentials Room logic.

2020-08-14 15:51:37 -04:00

PluginLoading

Merge branch 'feature/rework-plugin-loading-process-to-avoid-assembly-conflicts' into feature/ecs-1209

2020-04-01 11:19:30 -06:00

Properties

Updates AssemblyInfo.cs files to include AssemblyInformationalVersion and resets default versions to 0.0.0.*. Updates assembly version script to accomodate changes

2020-03-05 16:49:03 -07:00

Room

Adds null check before running RunRouteAction event in Cisco Spark class.

2020-08-18 10:00:53 -04: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

Fixed incorrect join for dark background logo. Updates CodecInfo class to correclty poppulate values

2020-08-07 08:56:29 -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

fix weird merge conflicts

2020-08-26 14:49:11 -06: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

Resolves #16

2020-08-19 17:07:11 -05: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 branch 'main' into release/1.6.2

2020-08-25 12:05:41 -06:00