Commit graph

  • a7f05f0200 fixed scenes britea 2020-04-27 15:47:59 +0200
  • af0c157205 fixed update state britea 2020-04-27 15:20:48 +0200
  • c878702331 try to fix britea 2020-04-27 14:44:48 +0200
  • a09b1dac57 Merge branch 'curtains-fix' into 'dev' Claudio Maggioni 2020-04-27 14:14:32 +0200
  • 29d2815a77 Curtains style fix Claudio Maggioni (maggicl) 2020-04-27 14:14:11 +0200
  • 9ca3becd8d security camera icon added, I also did a restyling of the modal for the security camera: now it is centerd, and it occupies basically the entire scream, but leaving a fair margin on the for directions. Much better now, I think, but let me know in case. Fil Cesana 2020-04-27 11:10:04 +0200
  • 2a1cc0292c fixed many things britea 2020-04-26 13:38:54 +0200
  • cce1650bd9 scene apply preparations Jacob Salvi 2020-04-26 11:15:05 +0200
  • 07f4a8ee43 scene apply preparations Jacob Salvi 2020-04-26 11:09:49 +0200
  • a54df637cd Merge branch '82-scene-states-update' into 'dev' Andrea Brites Marto 2020-04-25 19:03:41 +0200
  • 34f83c9cce Merge branch '82-scene-states-update' of https://lab.si.usi.ch/sa4-2020/the-sanmarinoes/frontend into 82-scene-states-update britea 2020-04-25 19:00:56 +0200
  • b73206e07a fixed add state britea 2020-04-25 19:00:39 +0200
  • 79afe780b3 idk how but delete works Jacob Salvi 2020-04-25 18:44:54 +0200
  • b6a27195fe delete state britea 2020-04-25 18:27:09 +0200
  • 2d9bdf63fb fixed problem in scene state britea 2020-04-25 18:23:40 +0200
  • d231ce7e84 fix to stateOrDevice Jacob Salvi 2020-04-25 17:52:50 +0200
  • 2d04439948 Merge branch '82-scene-states-update' of lab.si.usi.ch:sa4-2020/the-sanmarinoes/frontend into 82-scene-states-update Jacob Salvi 2020-04-25 17:50:05 +0200
  • 1e668f499d fix to stateOrDevice Jacob Salvi 2020-04-25 17:46:43 +0200
  • bd3a39181c fix states scenes britea 2020-04-25 17:46:04 +0200
  • b301c97212 fix to stateOrDevice Jacob Salvi 2020-04-25 17:45:22 +0200
  • fd5c28b1c9 stateOrDevice() added in various places Jacob Salvi 2020-04-25 17:27:56 +0200
  • 7f9a42fb84 sceneState.kind Jacob Salvi 2020-04-25 16:47:53 +0200
  • 12f64ffbc2 changes to various devices Jacob Salvi 2020-04-25 16:18:01 +0200
  • a4c13a2691 i am dumb Jacob Salvi 2020-04-25 15:44:02 +0200
  • b56b9a8260 added updateState to store Jacob Salvi 2020-04-25 15:43:27 +0200
  • 1484026afd added updateState to store Jacob Salvi 2020-04-25 15:37:40 +0200
  • a3eff85149 Merge branch 'helpWithBackend' into 'dev' Andrea Brites Marto 2020-04-25 14:50:07 +0200
  • 1f063aebb6 small fixes and clean up Jacob Salvi 2020-04-25 14:46:49 +0200
  • 71bd9cecd5 small fixes and clean up Jacob Salvi 2020-04-25 13:53:55 +0200
  • 272b0dc330 small fixes Jacob Salvi 2020-04-25 09:21:48 +0200
  • 6ecfe9653d fix turn on/off thermostat britea 2020-04-24 23:34:01 +0200
  • 48c0988063 Version 1 for the automations view done Christian Capeáns Pérez 2020-04-24 12:26:55 +0200
  • 2c3272a6a8 Merge branch 'camera-fix' into 'dev' Claudio Maggioni 2020-04-23 17:22:41 +0200
  • a15ec55bb4 Added backend source URL for camera Claudio Maggioni 2020-04-23 17:18:43 +0200
  • 3ca1f519b6 Connection frontend-backend for Curtains and Thermostat. Added button to handle off/on of thermostats Christian Capeáns Pérez 2020-04-23 16:55:44 +0200
  • e0dd8f1273 small fixes Jacob Salvi 2020-04-23 16:02:02 +0200
  • 1d4945a6a2 small changes Jacob Salvi 2020-04-23 15:34:23 +0200
  • a097ee447c Merge branch '81-fix-on-security-camera' into 'dev' Andrea Brites Marto 2020-04-23 11:43:03 +0200
  • 8d7f93dcbe fix new device Christian Capeáns Pérez 2020-04-21 12:15:39 +0200
  • 268698a081 fix the wrong stuff in the bach I Christian Capeáns Pérez 2020-04-21 12:13:01 +0200
  • 3fdd89e238 fix security camera britea 2020-04-22 20:14:18 +0200
  • cdf0f88cd9 Merge branch 'dashboard-videocamera' into 'dev' Matteo Omenetti 2020-04-22 16:37:29 +0200
  • 2f3ede238f Merge branch 'dev' into 'dashboard-videocamera' Matteo Omenetti 2020-04-22 16:35:09 +0200
  • f9d1d9d678 videocam connected to back end Fil Cesana 2020-04-22 14:25:24 +0200
  • 840d5ab6a2 moved everyting in the right files, ready to work on the backend part. Fil Cesana 2020-04-22 13:34:10 +0200
  • 509335a061 video component is finished and ready for those who want to be tested in the file light.js; tomorrow I will move everything back in Videocam.js (in devices) and with Andrea we will perform the connection with the backend. If you test it, enjoy the video I put in loop ;) Fil Cesana 2020-04-21 16:44:41 +0200
  • df1f753785 Merge branch '80-fix-editname-device' into 'dev' Claudio Maggioni 2020-04-21 16:35:20 +0200
  • 3b67e57f1a fixed edit name on devices britea 2020-04-21 16:18:05 +0200
  • 77f7abed92 Merge branch '79-addscene-getscenestates' into 'dev' Matteo Omenetti 2020-04-21 15:02:25 +0200
  • 0b4fefbd35 Able to add scenes and get scenes in a right way britea 2020-04-21 14:58:36 +0200
  • 3443bc8530 video now plays in loop. muted, in a responsive way: still to do: modal, enlarge full screen, communication with the backend - lost quite a lot of time testing both Embed from semantic and the simple video tag, Embed would have been good since it acts as a youtube player, but certain important tags like autoplay, loop etc did not seem to work. Also added the button 'enlarge', toggle now automatically set to on Fil Cesana 2020-04-20 16:19:21 +0200
  • 82d6576324 for the rebase, now you can find the code of the videocam under devices/Videocam.js Fil Cesana 2020-04-18 17:45:35 +0200
  • 63d9063983 first version of the videocamera, temporarily under the device light.js, for testing Fil Cesana 2020-04-18 17:40:05 +0200
  • e9745bb5f0 Merge branch '77-fixe-major-bug' into 'dev' Matteo Omenetti 2020-04-18 16:29:37 +0200
  • 9c2a16732f Fixed bugs and Initial Scene Navbar britea 2020-04-18 16:26:12 +0200
  • d219716526 Fix data on adding room britea 2020-04-17 14:30:34 +0200
  • dc22c008d3 changed design things Nicola Brunner 2020-04-17 14:25:22 +0200
  • 9430de90d0 back to previous settings device britea 2020-04-17 14:15:22 +0200
  • b3abffa5b7 made some design changes Nicola Brunner 2020-04-17 11:29:40 +0200
  • 1239559f45 changed Home in navbar into House view as required by user story 1 Nicola Brunner 2020-04-16 18:38:34 +0200
  • 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 Nicola Brunner 2020-04-16 18:20:22 +0200
  • f99a5d49ff fixed major bug britea 2020-04-16 17:07:56 +0200
  • af209221f0 Merge branch 'redux-fix' into 'dev' Claudio Maggioni 2020-04-16 16:01:34 +0200
  • b070273c73 Fix to socket state reducer and state updated in devices that use circularinput Claudio Maggioni (maggicl) 2020-04-16 15:58:56 +0200
  • 0664d502fe Merge branch '76-fixed-registration-bug' into 'dev' Matteo Omenetti 2020-04-16 15:19:13 +0200
  • 56da195894 Fixed registration bug britea 2020-04-16 15:15:33 +0200
  • cbbb703803 Merge branch '74-dashboard-tab-system' into 'dev' Matteo Omenetti 2020-04-15 15:58:39 +0200
  • b03e6b1850 Added and Fixed Scenes and Automations Modal and Navbars britea 2020-04-15 15:54:30 +0200
  • 3bc219c926 New style for tabs britea 2020-04-14 22:56:00 +0200
  • 82c4f3ea57 Basic Tabs system britea 2020-04-14 14:58:03 +0200
  • 2976ed7dc3 Merge branch '73-redux-refactor-for-device-state' into 'dev' Claudio Maggioni 2020-04-12 17:55:55 +0200
  • 76d10ba431 Fixed tests for redux Claudio Maggioni (maggicl) 2020-04-12 17:49:29 +0200
  • 0805d9d4d0 Redux websockets implemented Claudio Maggioni (maggicl) 2020-04-12 17:46:16 +0200
  • a4b59dc922 Fixed updates on circular inputs Claudio Maggioni (maggicl) 2020-04-11 22:47:47 +0200
  • b60a050a70 Refactor redux almost complete britea 2020-04-11 18:29:32 +0200
  • ed68bebe8e WIP on final conversion to redux Claudio Maggioni (maggicl) 2020-04-11 13:57:03 +0200
  • ad54cae0e2 Removed client_server.js and refactored devices Claudio Maggioni (maggicl) 2020-04-11 00:42:23 +0200
  • b5cbad53d1 Fixed bugs on previous refactors Claudio Maggioni (maggicl) 2020-04-10 23:13:23 +0200
  • 7b430045e7 WIP on room change Claudio Maggioni 2020-04-10 17:52:02 +0200
  • 69a6cbae6d WIP on redux conversion for devices Claudio Maggioni 2020-04-10 17:25:52 +0200
  • eead3694e6 Converting project to Redux store britea 2020-04-09 17:24:30 +0200
  • bad5d04238 Fixed nasty error in Login Claudio Maggioni 2020-04-09 14:48:24 +0200
  • 462cad0e53 Login and logout work on the new system. Nasty error on logout Claudio Maggioni 2020-04-09 13:59:34 +0200
  • c36d298f10 WIP on redux refactor: last commit before client_server.js removal Claudio Maggioni 2020-04-07 14:49:49 +0200
  • 636ade0273 WIP on redux refactor Claudio Maggioni 2020-04-07 12:46:55 +0200
  • 0e75123429 Merge branch 'dev' into 'master' M1 Claudio Maggioni 2020-03-26 11:29:14 +0100
  • 1ec0083abb Merge branch 'fix-device-default-name' into 'dev' Claudio Maggioni 2020-03-26 11:18:33 +0100
  • 573ffe1661 fix devide default name britea 2020-03-26 11:11:44 +0100
  • 9ea0aac0c2 Merge branch 'dev' into 'master' Claudio Maggioni 2020-03-26 10:40:59 +0100
  • 49ba4283bf Merge branch 'fix-mobile' into 'dev' Claudio Maggioni 2020-03-26 10:31:02 +0100
  • c9b4f22896 Merge branch 'dev' into 'fix-mobile' Claudio Maggioni 2020-03-26 10:27:37 +0100
  • fab38d9ad0 fixed mobile Claudio Maggioni 2020-03-26 10:26:43 +0100
  • 944884c85f Merge branch 'fixed-min-bug-smartplug' into 'dev' Matteo Omenetti 2020-03-26 09:54:02 +0100
  • 054f4ad341 fixed minor bug on smartplugs britea 2020-03-26 09:51:25 +0100
  • e231425a94 Merge branch 'add-reset-smartplug' into 'dev' Matteo Omenetti 2020-03-26 09:39:33 +0100
  • 7ce3cf1cb2 added reset smartplug britea 2020-03-26 09:36:00 +0100
  • d32232680d Merge branch 'fix-redirect-reset-password' into 'dev' Matteo Omenetti 2020-03-26 09:33:02 +0100
  • 5712483efb fixed redirect reset password britea 2020-03-26 08:34:21 +0100
  • f0c429b9a3 Merge branch 'fix-navbar' into 'dev' Claudio Maggioni 2020-03-26 00:17:47 +0100
  • e5b5a2f903 fix-navbar britea 2020-03-26 00:15:02 +0100