Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Supporting Alias-Names & Scenes #47

Merged
merged 22 commits into from May 28, 2017
Merged

Supporting Alias-Names & Scenes #47

merged 22 commits into from May 28, 2017

Conversation

hotzen
Copy link

@hotzen hotzen commented May 26, 2017

see updated readme regarding the new alexa_alias item-configuration

@hotzen
Copy link
Author

hotzen commented May 27, 2017

added scenes-support by generically supporting turn-on/off values

@hotzen hotzen changed the title Supporting Alias-Names for Alexa-Devices Supporting Alias-Names & Scenes May 28, 2017
@psilo909 psilo909 merged commit 32aa63e into smarthomeNG:master May 28, 2017
@msinn
Copy link
Member

msinn commented May 29, 2017

This was a PR to the master branch. Now the master branch is more recent than the develop branch.

@hotzen
Copy link
Author

hotzen commented May 29, 2017 via email

@psilo909
Copy link
Contributor

@hotzen i fear the team that is currently more active is too few worked into github to try the merge.. at least speaking for myself i would need some time to experiment to be sure not to make complete chaos. so if you could assist somehow it would be nice.

anyway i hope that @cstrassburg shows up in the next days, because we are getting ready for a release and the database plugin is nearly finished - but will need some final architectural adjustments where we would need his opinion..

@psilo909
Copy link
Contributor

i reverted the PR now.. not sure if that will set the master branch back.. anyway, please set again vs develop.

@hotzen
Copy link
Author

hotzen commented May 30, 2017

were you able to successfully revert? will provide a new PR into develop within the next days.
sorry again for not having payed due attention

@ohinckel
Copy link
Member

In case nobody is now working on the master branch (or based their work on the new commit) you can just reset the master to 9747e70 and do a forced push.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

4 participants