Commit graph

169 commits

Author SHA1 Message Date
aad1b59a96
Fix merge conflicts 2018-06-24 16:46:29 +02:00
a34ca7c25c
RZL: Use mdi_battery for tradfri remote battery icons 2018-06-24 16:42:36 +02:00
4388de10c8
Merge branch 'master' into patch-10 2018-06-24 16:39:47 +02:00
0e1b41f87c
Update rzl.js 2018-06-24 16:38:04 +02:00
8bcc3a6908 Merge branch 'master' of github.com:uwap/mqtt-control-map 2018-06-24 16:35:42 +02:00
ed0f22645e Completely rework how icons work in mqtt control map 2018-06-24 16:34:59 +02:00
Ranlvor
d93362edcb
Changes from pull request discussion
- simplyfy empty tradfri battery detection
- change command string format
2018-06-24 16:27:59 +02:00
ac3a2f292d
Merge pull request #37 from uwap/greenkeeper/flow-bin-0.75.0
Update flow-bin to the latest version 🚀
2018-06-24 14:37:25 +02:00
d79f73cfd2
Merge pull request #40 from Ranlvor/patch-15
Rechner und Drucker aufgeteilt auf 2 Funkdosen. Fixes #14
2018-06-24 14:37:01 +02:00
Ranlvor
2df52f75be
Rechner und Drucker aufgeteilt auf 2 Funkdosen. Fixes #14 2018-06-24 14:24:42 +02:00
greenkeeper[bot]
d749e8107a chore(package): update flow-bin to version 0.75.0 2018-06-21 17:02:28 +00:00
8a37cf2c95 refactor webpack config 2018-06-19 12:35:10 +02:00
2d97ae4239 Merge branch 'master' of github.com:uwap/mqtt-control-map 2018-06-19 10:47:29 +02:00
b6c0181b3e fix broken imports 2018-06-19 10:47:14 +02:00
Ranlvor
86f03ad3ef
Merge remote-tracking branch master into patch-10 to resolve merge conflicts 2018-06-18 17:59:43 +02:00
60488772d6
Merge pull request #30 from uwap/greenkeeper/flow-bin-0.70.0
Update flow-bin to the latest version 🚀
2018-06-18 10:40:39 +02:00
b966fb4610 Add slider from material-ui/lab 2018-06-18 10:31:37 +02:00
c082f89935
Merge pull request #33 from Ranlvor/patch-12
+Licht Spüle
2018-06-18 09:35:36 +02:00
dcd3bfb980
Merge pull request #35 from uwap/greenkeeper/webpack-cli-3.0.0
Update webpack-cli to the latest version 🚀
2018-06-18 09:31:54 +02:00
8abd39b3d4
Merge pull request #32 from Ranlvor/patch-11
+Ponyville FM
2018-06-18 09:31:27 +02:00
greenkeeper[bot]
e633b62deb chore(package): update webpack-cli to version 3.0.0 2018-06-02 14:26:57 +00:00
Ranlvor
a7785bf1de
Spühlenlicht: fix command topic 2018-04-29 21:01:20 +02:00
Ranlvor
1f248a5e9a
+2 neue Fernbedinungen 2018-04-29 18:24:23 +02:00
Ranlvor
e747acc67e
+Licht Spüle 2018-04-22 13:53:41 +02:00
Ranlvor
b642a30384
+Ponyville FM 2018-04-21 14:16:35 +02:00
Ranlvor
3a34f34558
use string instead of boolean
Because array-keys are strings and it seems that they can not be booleans
2018-04-21 12:40:08 +02:00
5a99952edb
Merge pull request #31 from uwap/greenkeeper/style-loader-0.21.0
Update style-loader to the latest version 🚀
2018-04-21 12:34:58 +02:00
greenkeeper[bot]
ae53aacbb5 chore(package): update style-loader to version 0.21.0 2018-04-18 22:38:22 +00:00
greenkeeper[bot]
eb92f61a01 chore(package): update flow-bin to version 0.70.0 2018-04-16 20:05:06 +00:00
Ranlvor
5c3b457511
Improvements after talking to uwap
- rename utils/remote to tradfri_remote because the name was to general
- rename internal topics according to previous point
- change type of battery remote low from string to boolean
- do not use raw topic name in config, we have helper-functions for that
- reformat iconColor to be a bit more readable
2018-04-16 00:43:45 +02:00
Ranlvor
2c8feefb04
+Batteriestände Fernbedinungen 2018-04-15 20:32:27 +02:00
Ranlvor
4c80bc7930
+Theken-Floalts 2018-04-15 19:46:04 +02:00
333163499f Fix build 2018-04-15 17:29:13 +02:00
fe814718eb Improve performance of the map by using Pure Components 2018-04-15 17:15:11 +02:00
9bd5d5c9c8 This bug fix really shouldn't be needed 2018-04-08 13:28:04 +02:00
9a8f9c57bf Fix build 2018-04-08 13:23:33 +02:00
02be6701be RZL: Add on/off button to kitchen light 2018-04-08 13:19:24 +02:00
72021aa83c Update yarn lock 2018-04-08 12:51:58 +02:00
e3150d200c RZL: Add all kitchen light slider 2018-04-08 11:08:46 +02:00
f2cc0eaa2a Make everything compatible with the latest material-ui version 2018-04-08 10:28:46 +02:00
4b370889af Fix build 2018-04-07 20:37:47 +02:00
ff67bcf2f8 RZL: Add kitchen floalt light 2018-04-07 20:32:41 +02:00
75f2aea345 Fix build 2018-04-02 10:51:10 +02:00
b24d28182f Merge branch 'master' of github.com:uwap/mqtt-control-map 2018-04-02 10:23:06 +02:00
92dab1c8f5 Add types.string and types.json 2018-04-02 10:22:43 +02:00
8eba82533c
Merge pull request #27 from uwap/greenkeeper/flow-bin-0.69.0
Update flow-bin to the latest version 🚀
2018-03-29 04:33:19 +02:00
greenkeeper[bot]
4ae7908e38 chore(package): update flow-bin to version 0.69.0 2018-03-28 22:51:44 +00:00
52e825549d Rename parseState to type 2018-03-28 04:08:50 +02:00
9dc14a3657
Add travis build status 2018-03-28 04:00:59 +02:00
8dc0788763
Merge pull request #25 from uwap/greenkeeper/initial
Update dependencies to enable Greenkeeper 🌴
2018-03-28 03:57:16 +02:00