Trevor Payne
486c951982
Fix some merge conflicts
2020-08-18 17:35:03 -05:00
Andrew Welker
fc67c53f4c
Merge pull request #381 from PepperDash/feature/push-to-nuget.org
...
Re-add nuget stuff
2020-08-18 18:28:37 -04:00
Trevor Payne
f0a887981d
Resolved Tracking Packages
2020-08-18 17:13:41 -05:00
Andrew Welker
7628b0ffff
Merge branch 'development' into feature/push-to-nuget.org
2020-08-18 18:11:45 -04:00
Trevor Payne
63d8cf27fd
gMerge branch 'bugfix/ScreenSaver-Never-Starts' of https://github.com/PepperDash/Essentials into bugfix/ScreenSaver-Never-Starts
2020-08-18 16:37:36 -05:00
Trevor Payne
eb9149b96a
More gitignore changes
2020-08-18 16:37:28 -05:00
Trevor Payne
f5410c0786
Merge branch 'development' into bugfix/ScreenSaver-Never-Starts
2020-08-18 16:27:09 -05:00
Trevor Payne
7624445b4b
Merge pull request #369 from PepperDash/bugfix/SystemMonitor-IndexOutOfRange
...
Fix system monitor index out of range exception
2020-08-18 16:26:45 -05:00
Trevor Payne
ece05caa28
Merge branch 'bugfix/ScreenSaver-Never-Starts' of https://github.com/PepperDash/Essentials into bugfix/ScreenSaver-Never-Starts
2020-08-18 16:25:25 -05:00
Trevor Payne
702c186c2c
Fixed Gitignore
2020-08-18 16:24:32 -05:00
Andrew Welker
22ce57e628
add packages folder to .gitignore
2020-08-18 15:04:35 -06:00
Andrew Welker
10f1f5b1d6
update version for PepperDashCore to match the correct version
2020-08-18 14:57:05 -06:00
Trevor Payne
182499a79b
Merge branch 'development' into bugfix/ScreenSaver-Never-Starts
2020-08-18 15:35:18 -05:00
Trevor Payne
6e148e7d62
Resolves #378
...
Fixed improperly set up device extender
2020-08-18 15:30:58 -05:00
Andrew Welker
6a31504cf8
Merge branch 'development' into bugfix/SystemMonitor-IndexOutOfRange
2020-08-18 15:42:56 -04:00
Andrew Welker
b53282e3e0
Merge pull request #376 from PepperDash/feature/test-build-image
...
Update docker build image to use Crestron DB 200.00.004.00 & Device DB 200.00.015.00
2020-08-18 15:42:28 -04:00
Andrew Welker
4ad966d909
back to main image
2020-08-18 12:20:31 -06:00
Andrew Welker
f61db7f7bf
testing dev image
2020-08-18 11:05:48 -06:00
Trevor Payne
95fb6cc204
Merge branch 'development' into bugfix/SystemMonitor-IndexOutOfRange
2020-08-18 11:38:27 -05:00
Andrew Welker
5668653785
Merge pull request #370 from PepperDash/feature/cisco-external-sources
...
Feature/cisco external sources
2020-08-18 12:34:38 -04:00
Trevor Payne
3325d81cab
Merge branch 'development' into bugfix/SystemMonitor-IndexOutOfRange
2020-08-18 10:55:07 -05:00
Trevor Payne
78f9142b35
Resolves #368
...
Changed parsing routine to no longer use absolute indicies for 'ParseUptime'
2020-08-18 10:40:20 -05:00
Trevor Payne
f18ed56909
Merge branch 'bugfix/SystemMonitor-IndexOutOfRange' of https://github.com/PepperDash/Essentials into bugfix/SystemMonitor-IndexOutOfRange
2020-08-18 10:19:29 -05:00
Trevor Payne
951da716a6
Added try/catch to ParseUptime with a way to view what was being parsed
...
Testing for #368
2020-08-18 10:18:49 -05:00
Trevor Payne
7ac11952eb
Added try/catch to ParseUptime with a way to view what was being parsed
2020-08-18 10:17:13 -05:00
Jason Alborough
67f0ae92ef
Adds null check before running RunRouteAction event in Cisco Spark class.
...
Fixes spelling error and other minor cleanup.
2020-08-18 10:00:53 -04:00
Jason Alborough
4e2683f8fc
Removes ToDo's
2020-08-17 14:57:33 -04:00
Jason Alborough
f0d10fb1f9
Finalized IHasExternalSourceSwitching adding method for setting the ExternalSource State
...
Adds arguments for External Source type it the AddExternalSource()
Adds subscription and parsing for External Source events
2020-08-17 14:52:49 -04:00
Jason Alborough
aea6942a1f
Update to support Cisco Codec External Sources using Essentials Room logic.
...
Adds new interface for Codecs IHasExternalSourceSwitching
Adds ability to set and clear External Sources in Cisco Spark device class
Adds ability to send sources from the source list to the Cisco Spark in the "EssentialsHuddleVtc1Room" room
[ ] still needs parsing when source is selected on the Cisco touch 10
2020-08-14 15:51:37 -04:00
Neil Dorin
22ff61d7f3
Merge pull request #361 from PepperDash/feature/add-qr-code-on-tsw-panels
...
Add Mobile Control QR code to TSW Panels for Essentials Standalone
2020-08-07 09:56:55 -06:00
Neil Dorin
f066321f3a
Merge branch 'main' into feature/add-qr-code-on-tsw-panels
2020-08-07 09:41:47 -06:00
Neil Dorin
302603aa54
Updates to phone and video address logic
2020-08-07 09:29:55 -06:00
Neil Dorin
dea858e187
Updates to phone and video address logic
2020-08-07 09:11:31 -06:00
Neil Dorin
ddbee2ed04
Fixed incorrect join for dark background logo. Updates CodecInfo class to correclty poppulate values
2020-08-07 08:56:29 -06:00
Neil Dorin
b7c9677c7a
Updates to finesse screen saver and get phone/video number display working correclty
2020-08-06 22:04:07 -06:00
Neil Dorin
d6581cab2e
Updates to work out kinks
2020-08-06 21:16:03 -06:00
Neil Dorin
66c481e3dc
Seems to work except dynamic graphics for logos and QR code
2020-08-06 19:46:12 -06:00
Neil Dorin
edd01785d5
Adds ability to get URL for both light and dark logo options
2020-08-06 18:07:23 -06:00
Neil Dorin
192aa4255c
Adds ability for dark logo option
2020-08-06 15:20:24 -06:00
Neil Dorin
637ca2f312
removes parent from interfaces
2020-08-06 15:04:02 -06:00
Neil Dorin
bf7a0600f3
specified previous docker build version
2020-08-06 14:42:45 -06:00
Neil Dorin
f59654d75e
working on #109 to add QR support for TSW panels
2020-08-06 13:56:42 -06:00
Andrew Welker
211665c0c4
Merge pull request #358 from PepperDash/release/1.6.0
...
Release/1.6.0
2020-08-06 09:21:00 -04:00
Neil Dorin
829e3eb634
Merge pull request #345 from PepperDash/release/1.6.0
...
Release 1.6.0
2020-08-05 13:45:04 -06:00
Andrew Welker
683f007e0b
Merge pull request #357 from PepperDash/hotfix/cisco-large-directory-issues
...
Hotfix/cisco large directory issues
2020-08-05 12:34:36 -07:00
Neil Dorin
23bfecd870
Adds E164 and H323 fixes from release branch
2020-08-05 12:04:43 -06:00
Neil Dorin
0b485d8d96
Revert "Merge branch 'release/1.6.0' into hotfix/cisco-large-directory-issues"
...
This reverts commit 1d42d88c3fec0b2fa181
2020-08-05 11:58:41 -06:00
Neil Dorin
1d42d88c3f
Merge branch 'release/1.6.0' into hotfix/cisco-large-directory-issues
2020-08-05 11:42:47 -06:00
Neil Dorin
ec0b2fa181
Adds receive queue and thread to CiscoSparkCodec class and sets receive thread priority for ZoomRoom
2020-08-05 10:50:48 -06:00
Andrew Welker
1b621e1655
Merge branch 'main' into release/1.6.0
2020-08-04 14:32:25 -07:00
