Branch merge phase2 #14
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
…each time it happens (by default mh only shows you the error in details the first time, for _any_ module and then that's it). - show how many times an error was triggered - add a module_allowed_errors variable to allow each module to set how many times they can error out before they get kicked out of the main loop (default was and still is 10, but not it's actually clear what's going on). For instance, I have: omnistat_allowed_errors = 999999999999 hvac_allowed_errors = 999999999999
…ith_timer to BaseController.
…within has_link method. Thanks to Eloy P. for bug fix.
a good part of Insteon.pm is going to be re-written, so it may not be a good use of anyone's time to look to deeply into the current Insteon.pm code.
* Improve stripping of end of line comments in .mht files. * Missing rename of triggers_save to _triggers_save in web page code. * Remove stray vim swap file. * lib/Omnistat.pm updates by Marc.
…d and, if applicable, group.
…if a cached object already exists. Necessary when mh reloads.
…ove duplicate scan_link_table method.
… CMU Language Toolkit for buiding the language files. This new version is much better with the binary language file support.
…andler of on_standard_insteon_received.
…s an InsteonMessage.
famille <famille@famille-simon.com>
…e android devices. Previously, only the last android device register would get these events. Update the android_server module to support the new android_xml subroutine which provides more advanced xml feature for android application support.
…which provide additional xml capabilities for android application support.
… indicators for TELCO.
…n too long. This prevents a rouge problems with occupancy which I havn't been able to resolve in any better wway.
Provide human readable NACK messages. Implement Insteon get_engine_vers...
Need to carry over cmd2 data for nacks.
This change adds the android_callerid method. Call this message with a callerid Name and Number. This will result in a callerid popup message and notification to be sent to the android. The android application can be configured to act on the message or ignore.
Add support for callerid pop up message and notification.
Conflicts: lib/xPL_Items.pm web/bin/items.pl
The merging operation until now did not bring the xPL_Items.pl file up to the most recent version. Fixed it.
ghost
assigned 
hplato
pushed a commit
that referenced
this pull request
Dec 7, 2019
Http updates merge to my master
Closed
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Small fixes for my HAI RCxx code that didn't get committed to svn.