Code

Master Merge#12

Code

Merged

waynieack merged 67 commits intowaynieack:masterwaynieack/misterhouse:masterfrom hollie:masterhollie/misterhouse:masterCopy head branch name to clipboardSep 21, 2017

+6,950-3,753

Commits

Commits on Apr 10, 2017

• Update Venstar_Colortouch.pm

  Show description for 3363844
  pmatis

  authored
  3363844

  Copy full SHA for 3363844

Commits on Jul 21, 2017

• Added numeric states to enable the slider in the UI and added the ability to directly set the value for the Thermo_setpoint_c/h objects

  

  waynieack

  committed
  edc6126

  Copy full SHA for edc6126

• Add back ui.touch-punch for jquery to work with mobile devices

  hplato

  committed
  ea84233

  Copy full SHA for ea84233

Commits on Jul 22, 2017

• Added a new object SCHEDULE_Temp_Active for tracking the active schedule, it's state is set to the name of the current active schedule and Added numeric states to enable the slider in the UI for th…

  Show description for 5d2fd4c
  

  waynieack

  committed
  5d2fd4c

  Copy full SHA for 5d2fd4c

• IA7 v1.5.570 - long presses work on floorplan popovers

  hplato

  committed
  b70f7ea

  Copy full SHA for b70f7ea

Commits on Jul 23, 2017

• IA7 v1.5.600 - floorplan popover sliders now accept any numeric value

  hplato

  committed
  46caef5

  Copy full SHA for 46caef5

• Merge pull request #718 from hplato/ia7

  Show description for 04a8577
  hplato

  authored
  04a8577

  Copy full SHA for 04a8577

• Merge pull request #717 from waynieack/Schedule_Temp_slider

  Show description for 03fa30d
  hplato

  authored
  03fa30d

  Copy full SHA for 03fa30d

• IA7 v1.5.610 - fix floorplan popovers and modals

  hplato

  committed
  54b4825

  Copy full SHA for 54b4825

Commits on Jul 24, 2017

• IA7 v1.5.620 - floorplan sliders now default

  hplato

  committed
  497676a

  Copy full SHA for 497676a

Commits on Jul 28, 2017

• David Satterfield's ZWave_RZC0P driver

  hplato

  committed
  06597f4

  Copy full SHA for 06597f4

• Merge pull request #719 from hplato/ia7

  Show description for c6a2cf5
  hplato

  authored
  c6a2cf5

  Copy full SHA for c6a2cf5

Commits on Jul 29, 2017

• set 18091self{states} before pushing numeric values, also added numeric states to low and high humidity

  

  waynieack

  committed
  92ef02a

  Copy full SHA for 92ef02a

• Merge pull request #720 from hplato/master

  Show description for 90775da
  hplato

  authored
  90775da

  Copy full SHA for 90775da

• Merge pull request #714 from waynieack/Insteon_Thermo_Slider

  Show description for c6efcdd
  hplato

  authored
  c6efcdd

  Copy full SHA for c6efcdd

Commits on Aug 1, 2017

• IA7 v1.5.640 - updated bootstrap, weather icons, font awesome, fixed mobile modal

  hplato

  committed
  2eb3922

  Copy full SHA for 2eb3922

• remove some console.log debugging

  hplato

  committed
  a6f0050

  Copy full SHA for a6f0050

• Merge pull request #721 from hplato/ia7

  Show description for e27e2b4
  hplato

  authored
  e27e2b4

  Copy full SHA for e27e2b4

Commits on Aug 2, 2017

• IA7 - larger slider

  hplato

  committed
  25265b3

  Copy full SHA for 25265b3

• Merge pull request #722 from hplato/ia7

  Show description for 77f0f73
  hplato

  authored
  77f0f73

  Copy full SHA for 77f0f73

Commits on Aug 5, 2017

• IA7 v1.5 collections.json update

  hplato

  committed
  d06f207

  Copy full SHA for d06f207

Commits on Aug 6, 2017

• fix case where variables can break json /vars

  hplato

  committed
  f7c442f

  Copy full SHA for f7c442f

• Merge pull request #724 from hplato/ia7

  Show description for ead2843
  hplato

  authored
  ead2843

  Copy full SHA for ead2843

Commits on Aug 11, 2017

• Fixed print_speaklog_since to use Speak_Log_Time rather than Print_Log_Time

  hplato

  committed
  3398e68

  Copy full SHA for 3398e68

• added a return on a webservice to prevent &main::1 warning in print_log

  hplato

  committed
  d3ce5f9

  Copy full SHA for d3ce5f9

• Merge branch 'ia7'

  hplato

  committed
  fc048fa

  Copy full SHA for fc048fa

• Fixed Mac say speech system, added in forked param

  hplato

  committed
  a778712

  Copy full SHA for a778712

• IA7 v1.5.650 - json speech now enabled by default, forking fixes

  hplato

  committed
  b82daa4

  Copy full SHA for b82daa4

• Merge pull request #725 from hplato/master

  Show description for bf2972d
  hplato

  authored
  bf2972d

  Copy full SHA for bf2972d

Commits on Aug 12, 2017

• IA7 v1.5.670 - persistent banners

  hplato

  committed
  7c42218

  Copy full SHA for 7c42218

• IA7 v1.5.700 - cookie support for notification preferences

  hplato

  committed
  49aa421

  Copy full SHA for 49aa421

• Fixed debug case and fixed issue with Arm Away not updating the parent object

  

  waynieack

  committed
  5b278e3

  Copy full SHA for 5b278e3

• HTTP 1.1 Update #1

  

  waynieack

  committed
  d998b8a

  Copy full SHA for d998b8a

• Merge pull request #11 from pmatis/patch-1

  Show description for 822d38d
  hplato

  authored
  822d38d

  Copy full SHA for 822d38d

• Merge pull request #726 from hplato/venstar_colortouch

  Show description for eacc3b6
  hplato

  authored
  eacc3b6

  Copy full SHA for eacc3b6

• Merge pull request #10 from hplato/ia7

  Show description for c3d0791
  

  Wayne Gatlin

  authored
  c3d0791

  Copy full SHA for c3d0791

Commits on Aug 13, 2017

• Merge pull request #12 from waynieack/HTTP_Updates

  Show description for 826bad4
  hplato

  authored
  826bad4

  Copy full SHA for 826bad4

• Updated more code to use HTTP1.1 with Content-Length

  

  waynieack

  committed
  de6b5b2

  Copy full SHA for de6b5b2

• Merge branch 'master' into ia7

  hplato

  committed
  ccca893

  Copy full SHA for ccca893

Commits on Aug 14, 2017

• IA7 v1.5.720 - default notifications and slider layout

  hplato

  committed
  fd8efdf

  Copy full SHA for fd8efdf

• Merge pull request #727 from waynieack/AD2

  Show description for 92f733e
  hplato

  authored
  92f733e

  Copy full SHA for 92f733e

• Merge pull request #13 from waynieack/HTTP_Updates

  Show description for e2f76ab
  hplato

  authored
  e2f76ab

  Copy full SHA for e2f76ab

Commits on Aug 15, 2017

• Razberry 2.1.0 - initial secondary controller support

  hplato

  committed
  da76d60

  Copy full SHA for da76d60

Commits on Aug 24, 2017

• fixed font path for weather icons

  hplato

  committed
  9ec002c

  Copy full SHA for 9ec002c

• fixed font path for weather icons

  hplato

  committed
  eb728cd

  Copy full SHA for eb728cd

• IA7 v1.5.800 - voice_cmd set_link support

  hplato

  committed
  fc2e940

  Copy full SHA for fc2e940

• Cleaned up logging, added shutdown back to ajax.pm until the issues with http persistent connections have been resolved, added a delay to long poll checks to limit CPU usage

  

  waynieack

  committed
  e5e77bd

  Copy full SHA for e5e77bd

• Merge pull request #14 from waynieack/HTTP_Updates

  Show description for 7a74942
  hplato

  authored
  7a74942

  Copy full SHA for 7a74942

Commits on Aug 25, 2017

• IA7 v1.5.810 - ia5 content padding

  hplato

  committed
  8c30bbb

  Copy full SHA for 8c30bbb

• Merge branch 'ia7' of https://github.com/hplato/misterhouse into ia7

  hplato

  committed
  ea3e96e

  Copy full SHA for ea3e96e

• Fixed issue with table updates and fixed a bug with MH crashing on the Global Vars page.

  

  waynieack

  committed
  8ee4840

  Copy full SHA for 8ee4840

• prevent crashes in table_data with bad data

  hplato

  committed
  0d3637f

  Copy full SHA for 0d3637f

• removed gzip from json_server

  hplato

  committed
  f73030e

  Copy full SHA for f73030e

• fix json_server with http1.1 and data tables

  hplato

  committed
  25f17d6

  Copy full SHA for 25f17d6

• Merge branch 'master' into ia7

  hplato

  committed
  f372330

  Copy full SHA for f372330

• collections.json 1.4 new humidity icon

  hplato

  committed
  1ce3d41

  Copy full SHA for 1ce3d41

• IA7 v1.5.830 - minor improvements to email, mobile tables

  hplato

  committed
  7730a04

  Copy full SHA for 7730a04

Commits on Aug 27, 2017

• More HTTP performance updates in json_server

  

  waynieack

  committed
  91caa45

  Copy full SHA for 91caa45

• Merge pull request #15 from waynieack/HTTP_Updates

  Show description for 9534c87
  hplato

  authored
  9534c87

  Copy full SHA for 9534c87

• More HTTP performance updates

  

  waynieack

  committed
  2a115f5

  Copy full SHA for 2a115f5

• Merge pull request #16 from waynieack/HTTP_Updates

  Show description for 1a99ad7
  hplato

  authored
  1a99ad7

  Copy full SHA for 1a99ad7

Commits on Aug 29, 2017

• raZberry v2.1.1 - added back 2.0.2 generic_object changes

  hplato

  committed
  3bc5606

  Copy full SHA for 3bc5606

• added in Debug{fork} option

  hplato

  committed
  b44bec9

  Copy full SHA for b44bec9

• Added connection: close headers until connection persistence issues are resolved

  

  waynieack

  committed
  df49c6b

  Copy full SHA for df49c6b

• Merge pull request #17 from waynieack/HTTP_Updates

  Show description for 1cb682e
  hplato

  authored
  1cb682e

  Copy full SHA for 1cb682e

Commits on Aug 30, 2017

• Merge pull request #728 from hplato/ia7

  Show description for 4a815ce
  hplato

  authored
  4a815ce

  Copy full SHA for 4a815ce

• Merge pull request #731 from hplato/razberry

  Show description for a5ee7ba
  hplato

  authored
  a5ee7ba

  Copy full SHA for a5ee7ba