-
Notifications
You must be signed in to change notification settings - Fork 517
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
Emoncms 9.7.8 | 2016.11.10 #613
Merged
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
Member
glynhudson
commented
Nov 24, 2016
- Default level of zoom RealTime, BarBraph, TimeStore, Threshold vis. @chaveiro @RDCH106
- Additional checking for memory information (Some Linux hosts do not allow access to '/proc/meminfo') @AndyTaylorTweet
- Refactor admin page code @chaveiro
- Add support for environmental variables @spikeheap
- Add iOS itunes store link / badge for iOS Emoncms app @mattjgalloway
- Remove external request for GooglePlay / itunes badges locally, saved locally @glynhudson
- Tweak button colours on admin page @glynhudson
- Ubuntu 16.07 / PHP7 install guide tweaks
Initial zoom level option in Visualizations
Sync with main
-> Code refactoring on admin module -> VIS widgets default zoom configuratios: Added: Realtime Refactored: timestoredaily, threshold, Rawdata Reverted: bargraph (already had Interval to specify default zoom)
-> Code refactoring on admin module -> VIS widgets default zoom configuratios: Added: Realtime Refactored: timestoredaily, threshold, Rawdata Reverted: bargraph (already had Interval to specify default zoom)
update from master
Some Linux hosts do not allow access to '/proc/meminfo' in the case of some VPS services. Actually check to make sure /proc/meminfo is available (remove error messages from those cases where its not available.)
Additional checking for memory information
Merge master
…into mattjgalloway-app_store Conflicts: Modules/user/profile/profile.php
… slatehorse-env_vars
Restored BarGraph Initial Zoom option
Revert "Restored BarGraph Initial Zoom option" as requested in #597
Validate variables after environment loaded
Set EMONCMS_SETTINGS_FILE to 'scripts/configuration/settings_env_override.php' to activate.
set EMONCMS_SETTINGS_FILE to scripts/settings.env.php to activate env settings support
This reverts commit 6c22a75.
Set EMONCMS_SETTINGS_FILE to 'scripts/settings.env.php' to activate.
activation of redis support during settings.php
Update readme.md
Prefix environment variables with EMONCMS_
Rename emoncms apache configuration file to emoncms.conf Added execution of apache site enable directive.
Update LinuxInstall.md
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.