Nicola Brunner
|
1239559f45
|
changed Home in navbar into House view as required by user story 1
|
2020-04-16 18:38:34 +02:00 |
|
Nicola Brunner
|
1330f3cfea
|
For edit device modal: added possibility to exit window without modifications (cross) | For Sensors: Now displays general device name and not specific device name in the icon
|
2020-04-16 18:20:22 +02:00 |
|
britea
|
f99a5d49ff
|
fixed major bug
|
2020-04-16 17:07:56 +02:00 |
|
|
|
af209221f0
|
Merge branch 'redux-fix' into 'dev'
Fix to socket state reducer and state updated in devices that use circularinput
See merge request sa4-2020/the-sanmarinoes/frontend!84
|
2020-04-16 16:01:34 +02:00 |
|
Claudio Maggioni (maggicl)
|
b070273c73
|
Fix to socket state reducer and state updated in devices that use circularinput
|
2020-04-16 15:58:56 +02:00 |
|
Matteo Omenetti
|
0664d502fe
|
Merge branch '76-fixed-registration-bug' into 'dev'
Fixed registration bug
Closes #76
See merge request sa4-2020/the-sanmarinoes/frontend!83
|
2020-04-16 15:19:13 +02:00 |
|
britea
|
56da195894
|
Fixed registration bug
|
2020-04-16 15:15:33 +02:00 |
|
Matteo Omenetti
|
cbbb703803
|
Merge branch '74-dashboard-tab-system' into 'dev'
Resolve "dashboard-tab-system"
Closes #74
See merge request sa4-2020/the-sanmarinoes/frontend!82
|
2020-04-15 15:58:39 +02:00 |
|
britea
|
b03e6b1850
|
Added and Fixed Scenes and Automations Modal and Navbars
|
2020-04-15 15:54:30 +02:00 |
|
britea
|
3bc219c926
|
New style for tabs
|
2020-04-14 22:56:00 +02:00 |
|
britea
|
82c4f3ea57
|
Basic Tabs system
|
2020-04-14 14:58:03 +02:00 |
|
|
|
2976ed7dc3
|
Merge branch '73-redux-refactor-for-device-state' into 'dev'
Resolve "Redux refactor for device state"
Closes #73
See merge request sa4-2020/the-sanmarinoes/frontend!81
|
2020-04-12 17:55:55 +02:00 |
|
Claudio Maggioni (maggicl)
|
76d10ba431
|
Fixed tests for redux
|
2020-04-12 17:52:35 +02:00 |
|
Claudio Maggioni (maggicl)
|
0805d9d4d0
|
Redux websockets implemented
|
2020-04-12 17:46:16 +02:00 |
|
Claudio Maggioni (maggicl)
|
a4b59dc922
|
Fixed updates on circular inputs
|
2020-04-11 22:47:47 +02:00 |
|
britea
|
b60a050a70
|
Refactor redux almost complete
|
2020-04-11 18:29:32 +02:00 |
|
Claudio Maggioni (maggicl)
|
ed68bebe8e
|
WIP on final conversion to redux
|
2020-04-11 13:57:03 +02:00 |
|
Claudio Maggioni (maggicl)
|
ad54cae0e2
|
Removed client_server.js and refactored devices
|
2020-04-11 00:42:23 +02:00 |
|
Claudio Maggioni (maggicl)
|
b5cbad53d1
|
Fixed bugs on previous refactors
|
2020-04-10 23:13:23 +02:00 |
|
|
|
7b430045e7
|
WIP on room change
|
2020-04-10 17:52:02 +02:00 |
|
|
|
69a6cbae6d
|
WIP on redux conversion for devices
|
2020-04-10 17:25:52 +02:00 |
|
britea
|
eead3694e6
|
Converting project to Redux store
|
2020-04-09 17:24:30 +02:00 |
|
|
|
bad5d04238
|
Fixed nasty error in Login
|
2020-04-09 14:48:24 +02:00 |
|
|
|
462cad0e53
|
Login and logout work on the new system. Nasty error on logout
|
2020-04-09 13:59:34 +02:00 |
|
|
|
c36d298f10
|
WIP on redux refactor: last commit before client_server.js removal
|
2020-04-07 14:49:49 +02:00 |
|
|
|
636ade0273
|
WIP on redux refactor
|
2020-04-07 12:46:55 +02:00 |
|
|
|
1ec0083abb
|
Merge branch 'fix-device-default-name' into 'dev'
fix devide default name
See merge request sa4-2020/the-sanmarinoes/frontend!79
|
2020-03-26 11:18:33 +01:00 |
|
britea
|
573ffe1661
|
fix devide default name
|
2020-03-26 11:11:44 +01:00 |
|
|
|
49ba4283bf
|
Merge branch 'fix-mobile' into 'dev'
fixed mobile
See merge request sa4-2020/the-sanmarinoes/frontend!77
|
2020-03-26 10:31:02 +01:00 |
|
|
|
c9b4f22896
|
Merge branch 'dev' into 'fix-mobile'
# Conflicts:
# smart-hut/src/views/Navbar.js
|
2020-03-26 10:27:37 +01:00 |
|
|
|
fab38d9ad0
|
fixed mobile
|
2020-03-26 10:26:43 +01:00 |
|
Matteo Omenetti
|
944884c85f
|
Merge branch 'fixed-min-bug-smartplug' into 'dev'
fixed minor bug on smartplugs
See merge request sa4-2020/the-sanmarinoes/frontend!76
|
2020-03-26 09:54:02 +01:00 |
|
britea
|
054f4ad341
|
fixed minor bug on smartplugs
|
2020-03-26 09:51:25 +01:00 |
|
Matteo Omenetti
|
e231425a94
|
Merge branch 'add-reset-smartplug' into 'dev'
added reset smartplug
See merge request sa4-2020/the-sanmarinoes/frontend!75
|
2020-03-26 09:39:33 +01:00 |
|
britea
|
7ce3cf1cb2
|
added reset smartplug
|
2020-03-26 09:36:00 +01:00 |
|
Matteo Omenetti
|
d32232680d
|
Merge branch 'fix-redirect-reset-password' into 'dev'
fixed redirect reset password
See merge request sa4-2020/the-sanmarinoes/frontend!74
|
2020-03-26 09:33:02 +01:00 |
|
britea
|
5712483efb
|
fixed redirect reset password
|
2020-03-26 08:34:21 +01:00 |
|
|
|
f0c429b9a3
|
Merge branch 'fix-navbar' into 'dev'
fix-navbar
See merge request sa4-2020/the-sanmarinoes/frontend!73
|
2020-03-26 00:17:47 +01:00 |
|
britea
|
e5b5a2f903
|
fix-navbar
|
2020-03-26 00:15:02 +01:00 |
|
Matteo Omenetti
|
ecbe64d21e
|
Merge branch 'fix-default-device-name' into 'dev'
fix device default name
See merge request sa4-2020/the-sanmarinoes/frontend!72
|
2020-03-25 22:18:42 +01:00 |
|
britea
|
a8c8de8bdc
|
fix device default name
|
2020-03-25 22:15:52 +01:00 |
|
|
|
6b09bdf016
|
Merge branch '65-btn-dimmer-and-knob-dimmer-update' into 'dev'
btn-dimmer and knob-dimmer update
Closes #65
See merge request sa4-2020/the-sanmarinoes/frontend!71
|
2020-03-25 20:31:52 +01:00 |
|
britea
|
67496b11a0
|
btn-dimmer and knob-dimmer update
|
2020-03-25 19:58:19 +01:00 |
|
|
|
9fa9a2f90f
|
Merge branch 'fixed-switch-and-warnings' into 'dev'
fixed switch and warnings
See merge request sa4-2020/the-sanmarinoes/frontend!70
|
2020-03-25 17:27:18 +01:00 |
|
britea
|
ff090ad317
|
fixed switch and warnings
|
2020-03-25 17:20:53 +01:00 |
|
|
|
01dafc861c
|
Merge branch '60-create-dimmers' into 'dev'
Resolve "create dimmers"
Closes #60
See merge request sa4-2020/the-sanmarinoes/frontend!69
|
2020-03-25 16:47:16 +01:00 |
|
christiancp
|
7ef46e9a1d
|
fixed opacity in intensity light
|
2020-03-25 16:44:47 +01:00 |
|
christiancp
|
ab1e911ccd
|
Working on conflicts
|
2020-03-25 16:41:12 +01:00 |
|
christiancp
|
024e40deca
|
Restyle some devices and creation of both dimmers (button and knob).
|
2020-03-25 16:30:53 +01:00 |
|
Matteo Omenetti
|
db2916ac2a
|
Merge branch 'background-img' into 'dev'
new logo, image upload, image for background
See merge request sa4-2020/the-sanmarinoes/frontend!68
|
2020-03-25 15:46:15 +01:00 |
|
