Master > Stable merge (9.8.29 | 2018.05.01) #833
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
- added cassandra engine to default settings - bumped config version to 10
…cess is added properly
Task module support
Changed the logic in PHPFina.php for get_data_DMY() to: 1. When storing the value in the array, remove the "$time<$end" as this was preventing the return of the last value and is also not required as the 'break' will prevent going past the end. This was clso ausing disparity with get_data() for the same date ranges 2. 'streamlined' the loop by making $increment a value which is defined once outside of the loop
Modified phpmqtt_input to accept a validated JSON name:value object. TODO - look for a 'time' name, put it into $time and remove from JSON object. TODO - update comments .gitnore updated to ignore VSCode setting folder.
A problem was found in that emoncms does not handle non numeric dates in the past elsewhere. This converts the date to a number of seconds.
…list if error occurs
Task module support
Stretch requires PHP7, so added location of `php.ini` and line to replace
Changed the user and group from pi:pi to root:adm
Updated the installation directory for emoncms to match the installation instructions.
Update readme.md
Update rc.local
Updated the paths to include the /var/www/html/ as per the linux instructions. Also now replaced all the rm with mv so that a back up is kept of everything. Also fixed the pi:pi to root:adm
Update install.sh
see https://community.openenergymonitor.org/t/another-emonpi-stopped-logging-thread/7267/8?u=pb66 This only avoids a crash, it's not ideal to return "power = 0" to the next process.
avoid divide by zero errors
See 5ca1093 and OEM forum thread https://community.openenergymonitor.org/t/input-list-doesnt-load/3797/65?u=pb66. It seems the fix has inadvertently been removed with this commit a425e25
Re-implement fix for input page not loading
Added user id to logged error messages
fixed get_name() in user model
Updates PHP sessions instructions for php7
Include example of using Authorization: Bearer
Schedule localization update
Eventp localization
Update userlist_view.php
Process localization - javascript part
email verification
glynhudson
changed the title
|
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.
No description provided.