Merge master to stable #1510
Merged
Merge master to stable #1510
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
Member
TrystanLea
commented
Jan 22, 2020
TrystanLea
commented
- fix 'unsupported' process labels in feed view
- stopped input name from overflowing to next line (long input names)
- fix link to graph view from input process labels
- fix configurable feedviewpath
- fix virtual feed lastvalue false issue
- clear feed controls selection after feed deletion
- fix editrealtime vis support
- remove hardcoded /home/pi paths for describe:emonpi/emonbase
- additional checks for redis
- change settings.php errors to settings.ini
- removed admin_db_view.php
- fix feed clear - now resets to zero
- fix order of input processes
- updated default hidden engines
- fix feed engine_hidden issue
- removed depreciated get_magic_quotes
- improved error handling on admin page
- env variable support @borpin @takkaria
- vis module improvements @alexandrecuer
# Conflicts: # Modules/feed/engine/MysqlTimeSeries.php # Modules/process/Views/process_ui.php
Fix some minor grammar issues and typos
should be in separate pull request
…d in future with a settings.ini editor
passed feedviewpath config var to view used feedviewpath var as js variable in view checked for feedviewpath var when creating process badges
…graph-on-input-view-badges
Virtual null values
concatinated strings and numbers as array join()
…graph-on-input-view-badges
corrected click event to use correctly targeted element passed correctly named variable to view as global js _SETTINGS prop added "" empty string to enable join() to seemlesly concatinate string
…badges Fix link to graph on input view badges
stopped input name from overflowing to next line using CSS
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.