Skip to content
This repository has been archived by the owner on Nov 12, 2020. It is now read-only.

Commit

Permalink
Merge pull request #5 from wburgers/Test
Browse files Browse the repository at this point in the history
Merge Test to master for next release
  • Loading branch information
wburgers committed Sep 13, 2015
2 parents 14cfbce + 9862763 commit ee16000
Show file tree
Hide file tree
Showing 32 changed files with 872 additions and 1,597 deletions.
4 changes: 1 addition & 3 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,8 +1,6 @@
*.o
test
openzwave-server
OZW_log.txt
make_log.txt
*/*.txt
zw*.xml
*/*.ini
settings.js
Expand Down
22 changes: 12 additions & 10 deletions Client/Polymer Client/bower.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "Polymer Client",
"version": "0.0.1",
"version": "0.0.2",
"homepage": "https://github.com/wburgers/Open-Zwave-Socket-Server",
"license": "MIT",
"private": true,
Expand All @@ -12,15 +12,17 @@
"tests"
],
"dependencies": {
"polymer": "Polymer/polymer#^0.5.5",
"core-elements": "Polymer/core-elements",
"paper-elements": "Polymer/paper-elements",
"raphael": "git://github.com/wburgers/raphael.git#master",
"justgage-bower": "git://github.com/wburgers/justgage.git#master",
"google-signin": "~0.2.1"
},
"resolutions": {
"raphael": "master"
"polymer": "Polymer/polymer#^1.1.0",
"iron-elements": "PolymerElements/iron-elements",
"paper-elements": "PolymerElements/paper-elements",
"google-signin": "GoogleWebComponents/google-signin#^1.0.0",

"OZWSS-Polymer-status-dot": "git://github.com/wburgers/OZWSS-Polymer-status-dot#master",
"OZWSS-Polymer-switch-button": "git://github.com/wburgers/OZWSS-Polymer-switch-button#master",
"OZWSS-Polymer-google-signin-status": "git://github.com/wburgers/OZWSS-Polymer-google-signin-status#master",
"OZWSS-Polymer-room-list": "git://github.com/wburgers/OZWSS-Polymer-room-list#master",
"OZWSS-Polymer-scene-list": "git://github.com/wburgers/OZWSS-Polymer-scene-list#master",
"OZWSS-Polymer-single-room": "git://github.com/wburgers/OZWSS-Polymer-single-room#master"
},
"description": "Polymer Client for the Open-Zwave-Socket-Server",
"main": "index.html",
Expand Down
100 changes: 0 additions & 100 deletions Client/Polymer Client/custom_components/device-item.html

This file was deleted.

92 changes: 0 additions & 92 deletions Client/Polymer Client/custom_components/google-signin-status.html

This file was deleted.

40 changes: 0 additions & 40 deletions Client/Polymer Client/custom_components/room-list-item.html

This file was deleted.

26 changes: 0 additions & 26 deletions Client/Polymer Client/custom_components/room-list.html

This file was deleted.

37 changes: 0 additions & 37 deletions Client/Polymer Client/custom_components/scene-list-item.html

This file was deleted.

22 changes: 0 additions & 22 deletions Client/Polymer Client/custom_components/scene-list.html

This file was deleted.

Loading

0 comments on commit ee16000

Please sign in to comment.