LordGrey 9ea40a873e Merge branch 'master' into mediafoundation ...

# Conflicts:
#	assets/webconfig/content/dashboard.html
#	assets/webconfig/i18n/en.json
#	assets/webconfig/js/content_dashboard.js
#	assets/webconfig/js/content_logging.js
#	assets/webconfig/js/hyperion.js
#	assets/webconfig/js/ui_utils.js

2021-05-02 21:12:00 +02:00

..

lib

New languages - Portuguese (Std/Brazil) & Norwegian (Bokmål) (#1236)

2021-05-01 18:05:45 +02:00

content_colors.js

Refactor PR #957 (#1234)

2021-05-01 17:00:44 +02:00

content_dashboard.js

Refactor PR #957 (#1234)

2021-05-01 17:00:44 +02:00

content_effects.js

Refactor PR #957 (#1234)

2021-05-01 17:00:44 +02:00

content_effectsconfigurator.js

Refactor PR #957 (#1234)

2021-05-01 17:00:44 +02:00

content_general.js

Refactor PR #957 (#1234)

2021-05-01 17:00:44 +02:00

content_grabber.js

Merge remote-tracking branch 'origin/grabberDiscovery' into mediafoundation

2021-05-02 20:12:52 +02:00

content_huebridge.js

Small Hue improvements (#235)

2016-09-11 22:20:57 +02:00

content_index.js

Refactor PR #957 (#1234)

2021-05-01 17:00:44 +02:00

content_leds.js

Refactor PR #957 (#1234)

2021-05-01 17:00:44 +02:00

content_logging.js

Refactor PR #957 (#1234)

2021-05-01 17:00:44 +02:00

content_network.js

Refactor PR #957 (#1234)

2021-05-01 17:00:44 +02:00

content_remote.js

Refactor PR #957 (#1234)

2021-05-01 17:00:44 +02:00

content_webconfig.js

Refactor PR #957 (#1234)

2021-05-01 17:00:44 +02:00

hyperion.js

Refactor PR #957 (#1234)

2021-05-01 17:00:44 +02:00

ledsim.js

Refactor PR #957 (#1234)

2021-05-01 17:00:44 +02:00

settings.js

New languages - Portuguese (Std/Brazil) & Norwegian (Bokmål) (#1236)

2021-05-01 18:05:45 +02:00

streamer.js

add Hue EntertainmentAPI + Forwarder & other Fixes (#592)

2020-05-22 19:40:50 +02:00

ui_utils.js

Merge remote-tracking branch 'origin/grabberDiscovery' into mediafoundation

2021-05-02 20:12:52 +02:00

wizard.js

Refactor PR #957 (#1234)

2021-05-01 17:00:44 +02:00