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.

Sign up for GitHub

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

Jump to bottom

Update master with latest changes #100

Merged
merged 73 commits into from
Apr 25, 2015
Merged

Update master with latest changes #100

merged 73 commits into from
Apr 25, 2015

Conversation

balloob
Copy link
Member

@balloob balloob commented Apr 24, 2015

Adds:

  • Line graphs to history in frontend
  • Transmission client sensor
  • ISY994 hub support
  • Support for hiding entities from frontend
  • Modbus support
  • Raspberry Pi init script

jamespcole and others added 30 commits March 22, 2015 06:10
@jamespcole
added in line graph support for state history
60fbc51
@jamespcole
merged with upstream
24dbc1f
@jamespcole
Merge branch 'dev' into line-chart-dev
9499a82 
merging in the latest changes
@jamespcole
refactored line graph code
b50023e
@jamespcole
refactored line graph code
bc54d97
@jamespcole
refactored line graph code
2576659
@jamespcole
refactored line chart to be more efficient
a86c532
@rmkraus
Added ISY994 weather data as sensors.
80f1581
@rmkraus
Addded light controls to isy994 component.
57f27cc
@jamespcole
Improved the efficiency and accuracy of the line graphs
c14fa29
@jamespcole
Added loading spinner to the history screen
12d88c2
@jamespcole
Fixed the line charts
b6e880e
@jamespcole
Fixed the line charts
264bc15
@jamespcole
Added in some comments
b1f0150
@jamespcole
removed unneeded loading messages
cae2a11
@jamespcole
updated the ha js
7d997f7
@jamespcole
Added zoom options to line graphs
8151de1
@jamespcole
rebuilt frontend with line graph support
89527d3
@jamespcole
Added initial Transmission torrent client sensor
ba13f78
@jamespcole
Fixed bug in history component where the entity id filtering was not …
100a759 
…being applied correctly
@jamespcole
Fixed linting warnings
56184da
@jamespcole
Fixed some alignment issues and added loading spinner
e65ad67
@jamespcole
Tidied up the documentations and linting warnings
e63d0d7
@jamespcole
Merge pull request #86 from jamespcole/line-chart-dev
20e07a8 
Merged new line chart history view for devices with a unit_of_measurement specified
@jamespcole
Merge branch 'dev' into transmission-dev
df9e8f5 
Merging in the latest from the dev branch
@jamespcole
Added init script for HA on the raspberry pi
4f222e6
@jamespcole
Merge pull request #87 from jamespcole/dev
5eabc15 
Added init script for HA on the raspberry pi
@jamespcole
Added the new transmission sensor to the coveragerc file
439b7be
@jamespcole
Merge pull request #88 from jamespcole/transmission-dev
992a926 
Adds basic support for Transmission torrent client as a sensor.
@jamespcole
Removed interactivity from small view of line charts which was causin…
a478ec6 
…g scrollbar issues on more-info card
Aurélien Correia and others added 25 commits April 21, 2015 15:26
Merge remote-tracking branch 'upstream/master'
5ce95f6
Passed Travis CI
4d65554
@balloob
Merge pull request #95 from kixam/master
0e2cf65 
simplistic Modbus implementation
@rmkraus
Merge remote-tracking branch 'upstream/master'
3b0c685
@rmkraus
Updated contributing documentation to include details about hidding s…
4d91c4a 
…tates.
@rmkraus
Updated requirements to include PyISY.
99ea0dc
@rmkraus
pylint fix to isy switches.
d566a32
@rmkraus
1) Merged with mainline dev branch. 2) Removed assumption in homeassi…
2b4c755 
…stant/__init__.py that states are visible if not specified. This assumption is intrinsic in the JavaScript. 3) Recompiled frontend to assist merge.
@rmkraus
Changed visbility property in configuration.yaml to a hash instead of…
8fcf814 
… a list of a single hash.
@rmkraus
Moved card visibility logic out of the Entity class and into a Visibi…
ff3dace 
…lityABC. Then made the Group class inherit the VisibilityABC. No duplication of code now. This is definitely better.
@rmkraus
Fixed copy pasta error.
2b6edd1
@rmkraus
Updated get_entities.py script to use argparse module.
d779662
@rmkraus
1) Added visibility documentation to the CONTRIBUTING.md documentatio…
bd3b93f 
…n. 2) Pylint fixes to homeassistant/helpers/entity.py
@rmkraus
1) Upped the requirement for PyISY to version 1.0.2. 2) Omitted isy99…
dc4ff25 
…4 components from coveralls tests because it requires an external controller.
@balloob
Merge pull request #96 from automicus/master
1dd26fc 
Added support for ISY994 Insteon and X10 Controller (and other updates)
@balloob
Have group inherit from entity
bbdb032
@balloob
Tweak visibility config
b855f42
@balloob
Clean up Entity helper test code
8f36cf3
@balloob
Update CONTRIBUTING.md
968de05
@balloob
Merge pull request #97 from balloob/chore-group-entity
25a900c 
Have group inherit from entity
@balloob
Merge pull request #98 from balloob/chore-tweak-visibility-config
44cd5ca 
Tweak visibility config
@fabaff
Fix two typos
46819ac
@balloob
Merge pull request #99 from fabaff/typos
41b0292 
Minor fix
@balloob
Add logbook to default configuration
424f05a
@balloob
Compiled new version of frontend
24bb89d
@coveralls
Copy link

Coverage Status

Coverage decreased (-2.22%) to 62.69% when pulling 24bb89d on dev into 23902a6 on master.

balloob added a commit that referenced this pull request Apr 25, 2015
@balloob
Merge pull request #100 from balloob/dev
31a22d4 
Update master with latest changes
@balloob balloob merged commit 31a22d4 into master Apr 25, 2015
@home-assistant home-assistant locked and limited conversation to collaborators Mar 17, 2017
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Reviewers
No reviews
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
5 participants
@balloob @coveralls @jamespcole @rmkraus @fabaff