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

Emoncms 9.7.8 | 2016.11.10 #613

Merged
merged 57 commits into from
Nov 24, 2016
Merged

Emoncms 9.7.8 | 2016.11.10 #613

merged 57 commits into from
Nov 24, 2016

Conversation

glynhudson
Copy link
Member

  • 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

RDCH106 and others added 30 commits November 4, 2016 12:25
Initial zoom level option in Visualizations
-> 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)
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
…into mattjgalloway-app_store

Conflicts:
	Modules/user/profile/profile.php
RDCH106 and others added 27 commits November 14, 2016 11:53
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
Set EMONCMS_SETTINGS_FILE  to 'scripts/settings.env.php' to activate.
activation of redis support during settings.php
This reverts commit 0e4bd37, reversing
changes made to 49df8e6.
Prefix environment variables with EMONCMS_
Rename emoncms apache configuration file to emoncms.conf
Added execution of apache site enable directive.
@glynhudson glynhudson merged commit db0e857 into stable Nov 24, 2016
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.

9 participants