smarthut/frontend
2
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Commit graph

  • bda73469b2 Merge branch 'dev' into 'master' master M3 Claudio Maggioni 2020-05-27 23:17:43 +0200
  • 4853529d6b Merge branch 'simulation-fix' into 'dev' Claudio Maggioni 2020-05-27 23:02:32 +0200
  • ce544b3aae fixed header small beauty fixes Nicola Brunner 2020-05-27 22:45:52 +0200
  • 4585f4e7de Merge branch '119-remove-duplications' into 'dev' dev Andrea Brites Marto 2020-05-27 18:51:43 +0200
  • 00a3a8786a remove duplications britea 2020-05-27 18:46:40 +0200
  • c652f588cf Merge branch 'frontend-userstory1-fil' into 'dev' Andrea Brites Marto 2020-05-27 12:08:01 +0200
  • 77070242c6 almost complete simulation panel britea 2020-05-27 12:04:16 +0200
  • 22366cb7a2 fixed simulation panel britea 2020-05-26 17:20:56 +0200
  • 3ca4abaf62 resolve conflicts britea 2020-05-26 13:46:06 +0200
  • 066eb1535b initial simulation panel britea 2020-05-26 13:45:06 +0200
  • 1872fff6f4 Merge branch 'Brunner-beauty-fix' into 'dev' Andrea Brites Marto 2020-05-26 13:44:20 +0200
  • 5e996670f3 forse ora va Nicola Brunner 2020-05-26 13:40:03 +0200
  • 8cdd66f6d4 Merge branch 'dev' of https://lab.si.usi.ch/sa4-2020/the-sanmarinoes/frontend into frontend-userstory1-fil britea 2020-05-25 15:57:45 +0200
  • 56bb2b892b modal is now closing Nicola Brunner 2020-05-24 12:49:54 +0200
  • 0d03c420ee Merge branch '118-fix-thermostat-trigger' into 'dev' Andrea Brites Marto 2020-05-23 16:23:33 +0200
  • b25b319228 fixed thermostat trigger britea 2020-05-23 16:19:13 +0200
  • 5dd2bdae14 fixed update branch britea 2020-05-23 16:13:20 +0200
  • a184333579 update branch britea 2020-05-23 16:11:25 +0200
  • 747bd370cc update branch britea 2020-05-23 16:10:31 +0200
  • 6c5f524aeb test Nicola Brunner 2020-05-23 14:22:09 +0200
  • b179115c15 Merge branch 'dev' of lab.si.usi.ch:sa4-2020/the-sanmarinoes/frontend into frontend-userstory1-fil Claudio Maggioni 2020-05-22 00:03:40 +0200
  • ac1a15cd5b beauty fixes Nicola Brunner 2020-05-21 22:02:49 +0200
  • c583c0e73e Merge branch '116-fix-bug-eslint' into 'dev' Andrea Brites Marto 2020-05-21 16:49:44 +0200
  • e54b53147a fix bugs eslint britea 2020-05-21 16:45:39 +0200
  • 9df8a7f19a Merge branch '71-6-users-can-add-conditions-to-automations' into 'dev' Andrea Brites Marto 2020-05-21 16:17:17 +0200
  • 727a5c9081 fixed condition autmations britea 2020-05-21 16:13:47 +0200
  • 3830c0004f other eslint avoid britea 2020-05-19 16:25:05 +0200
  • 00778d989f avoided some eslint problems britea 2020-05-19 16:24:29 +0200
  • 0d2a2e92ba connected automation conditions to the backend britea 2020-05-19 16:23:30 +0200
  • 31c98fac49 simulation panel is finished. Fil Cesana 2020-05-18 10:54:31 +0200
  • fa4bae7c10 Conditions to automations done (not connected to backend). I followed the same structure as in triggers Christian Capeáns Pérez 2020-05-15 20:57:42 +0200
  • 364f58fa24 Merge branch 'fix-bug-sonaqube' into 'dev' Andrea Brites Marto 2020-05-12 16:37:22 +0200
  • dbf6a5ef5a Reverted package.json and package-lock.json Claudio Maggioni 2020-05-12 16:33:34 +0200
  • 406d563f4f fix sonar britea 2020-05-12 16:23:27 +0200
  • 1a755be7fb fix bug sonrqube britea 2020-05-12 16:09:59 +0200
  • c2e5d55ed2 Merge branch 'dev' of https://lab.si.usi.ch/sa4-2020/the-sanmarinoes/frontend into dev britea 2020-05-12 15:48:34 +0200
  • 4eba936a1e Merge branch 'sonar-fix' into 'dev' Claudio Maggioni 2020-05-12 15:22:45 +0200
  • c67f2e4707 Beautifier fix Claudio Maggioni 2020-05-12 15:18:33 +0200
  • 87d82296ac Merge branch '115-configure-eslint-analysis-for-sonarqube' into 'dev' Matteo Omenetti 2020-05-11 14:58:41 +0200
  • 19efeb22de Issue #115: Run code quality pipeline only on dev Andrea Mocci 2020-05-11 14:54:34 +0200
  • 22d0ba078a Issue #115: Remove cypress config for eslint Andrea Mocci 2020-05-11 14:40:15 +0200
  • 50ac55db8b Issue #115: Add eslint configuration, commands, and pipeline config Andrea Mocci 2020-05-11 14:29:14 +0200
  • a576632ef7 Merge branch '114-remove-duplications' into 'dev' Andrea Brites Marto 2020-05-10 23:55:50 +0200
  • bb11babc5b fixed other duplications britea 2020-05-10 23:50:59 +0200
  • 9c89a2ea99 fixed another duplication britea 2020-05-10 23:28:20 +0200
  • bd0b4d79ea Merge branch '114-remove-duplications' into 'dev' Andrea Brites Marto 2020-05-10 21:57:17 +0200
  • 746e00baa7 wrong class name britea 2020-05-10 21:51:09 +0200
  • e3068cee6b Merge branch '114-remove-duplications' into 'dev' Andrea Brites Marto 2020-05-10 21:48:57 +0200
  • f6d5ea7853 file confirm britea 2020-05-10 21:43:30 +0200
  • c5fefe7ad6 removed sonarqube confirm duplication britea 2020-05-10 21:43:09 +0200
  • 18e46b8e61 Merge branch 'dev' of https://lab.si.usi.ch/sa4-2020/the-sanmarinoes/frontend into dev britea 2020-05-10 21:29:29 +0200
  • 1a3b631062 Merge branch '112-remove-possibility-to-reselect-a-device-already-added-to-a-scene' into 'dev' Andrea Brites Marto 2020-05-10 11:05:24 +0200
  • 7df52334ff fixed add states daoes not show states already in scene britea 2020-05-10 11:00:56 +0200
  • 06c7c07cf3 a first version of the simulation panel, I still need to fix some binors bugs, and to add the other devices. Also, in the ehader controller, I converted the toggle into a chebox, because otherwise it was bugging with tthe modal in a very weird way Fil Cesana 2020-05-09 17:46:57 +0200
  • c837a8156c finally fixed the css problem with the videocamera modal, now styling the simulation panel. There is a very weird bug with the slider on the left side of the header controller which is somehow visible when the modal is open, I will keep it for the end Fil Cesana 2020-05-09 09:57:04 +0200
  • bf9919560a simulation panel now opens, it still misses the content Fil Cesana 2020-05-09 09:13:26 +0200
  • 367159e3cf button added in the header Fil Cesana 2020-05-09 08:45:27 +0200
  • 3ade526ed3 Merge branch 'sonar-fix' into 'dev' Claudio Maggioni 2020-05-08 23:20:21 +0200
  • 957434ece5 Sonarqube fixes Claudio Maggioni 2020-05-08 23:19:58 +0200
  • 9dc193ef28 Merge branch 'sonar-fix' into 'dev' Claudio Maggioni 2020-05-08 23:00:57 +0200
  • 393e753b44 Merge branch 'dev' into 'sonar-fix' Claudio Maggioni 2020-05-08 23:00:44 +0200
  • 0205ad3fd2 fixed Curtains.css Claudio Maggioni 2020-05-08 22:50:42 +0200
  • 64d0cc19f8 Merge branch 'sonar-fix' into 'dev' Claudio Maggioni 2020-05-08 22:51:05 +0200
  • 4bf865c5ae fixed Curtains.css Claudio Maggioni 2020-05-08 22:50:42 +0200
  • 7354eefb49 Merge branch 'dev' of https://lab.si.usi.ch/sa4-2020/the-sanmarinoes/frontend into dev britea 2020-05-08 18:42:11 +0200
  • 0ec8dccb25 Merge branch '106-rangetrigger-values-must-be-validated-to-a-sensible-range-for-the-respective-device' into 'dev' Claudio Maggioni 2020-05-08 16:07:59 +0200
  • b27c6a3f51 Fixed bugs in automation fast update Claudio Maggioni 2020-05-08 16:03:42 +0200
  • dbc6223954 Fixed git merge sentience Claudio Maggioni 2020-05-08 15:47:18 +0200
  • e5bf0dbd83 Prettier reformat Claudio Maggioni 2020-05-08 15:45:08 +0200
  • 3e53f11da0 Merge branch 'dev' into '106-rangetrigger-values-must-be-validated-to-a-sensible-range-for-the-respective-device' Claudio Maggioni 2020-05-08 15:42:09 +0200
  • 3132204872 Merge branch '103-temperature-sensor-color-circle-change-with-temperature-value' into 'dev' Claudio Maggioni 2020-05-08 15:41:46 +0200
  • e5426fa790 Added smooth temperature gradient Claudio Maggioni 2020-05-08 15:37:01 +0200
  • 38425b8d68 Merge branch 'dev' of lab.si.usi.ch:sa4-2020/the-sanmarinoes/frontend into 103-temperature-sensor-color-circle-change-with-temperature-value Claudio Maggioni 2020-05-08 15:21:49 +0200
  • 122689c864 Merge branch '102-scene-apply-button-in-hosts-view-does-not-work' into 'dev' Andrea Brites Marto 2020-05-08 14:59:10 +0200
  • 4688995d12 fix apply scene britea 2020-05-08 14:55:26 +0200
  • d1cd93afe5 apply scene in host britea 2020-05-08 13:45:13 +0200
  • de1ce9bbf2 Merge branch 'dev' of https://lab.si.usi.ch/sa4-2020/the-sanmarinoes/frontend into dev britea 2020-05-08 10:00:37 +0200
  • c1898ffa6c Merge branch '100-background-image-for-rooms' into 'dev' Claudio Maggioni 2020-05-07 22:41:51 +0200
  • 953b385f8b Merge branch '111-setup-sonarqube-pipeline-for-development-branch' into 'dev' Luca Ponzanelli 2020-05-07 16:17:03 +0200
  • 873a136c68 Issue #111: add sonarqube analysis - add sonar-scanner dev dependency - add sonar-scanner job in ci configuration Luca Ponzanelli 2020-05-07 16:17:03 +0200
  • a82c4b2c77 Merge branch 'dev' into '100-background-image-for-rooms' Jacob Salvi 2020-05-07 15:35:44 +0200
  • 697ed70ea9 trying to solve a merge conflict Jacob Salvi 2020-05-07 15:34:56 +0200
  • cc60ff06ee trying to solve a merge conflict Jacob Salvi 2020-05-07 15:33:50 +0200
  • 26d1f22c04 Merge branch 'fil-small-fixes-02' into 'dev' Andrea Brites Marto 2020-05-07 13:22:22 +0200
  • f58872e09e Merge branch 'dev' of https://lab.si.usi.ch/sa4-2020/the-sanmarinoes/frontend into dev britea 2020-05-07 13:21:11 +0200
  • 74bccad636 added: icons for curtains and thermostat, all links in the footer now work, centered the toggle for the videocam component - also, I do not know if it was already merged, but the modal now looks better (I hope) Fil Cesana 2020-05-07 13:13:02 +0200
  • 1dd25968be Merge branch '105-room' into 'dev' Andrea Brites Marto 2020-05-07 10:32:00 +0200
  • 5e76bbfa2f Added the background image for romms Jacob Salvi 2020-05-07 09:58:49 +0200
  • bb91bb1ee2 fixed warning message in device panel thanks to andrea Nicola Brunner 2020-05-07 09:51:38 +0200
  • d77ff7dc08 Merge branch '108-when-i-delete-a-room-add-maybe-an-are-you-sure-confirmation-message' into 'dev' Matteo Omenetti 2020-05-07 09:33:11 +0200
  • 74d5be7967 fix omenem 2020-05-07 09:29:22 +0200
  • 78f6e508ec Check values for different types of sensors when creating a trigger for an automation Christian Capeáns Pérez 2020-05-06 21:36:32 +0200
  • bdfc7fc424 Merge branch '103-temperature-sensor-color-circle-change-with-temperature-value' of https://lab.si.usi.ch/sa4-2020/the-sanmarinoes/frontend into 103-temperature-sensor-color-circle-change-with-temperature-value Christian Capeáns Pérez 2020-05-06 18:43:11 +0200
  • 6c1e309ce4 Color of the temperature sensor changes with the temperature value (up to 20 degrees is green, from 20 to 30 is yellow and from 30 on is red) Christian Capeáns Pérez 2020-05-06 18:42:58 +0200
  • b61148b24a Merge branch '104-creation-of-a-switch-error-message-if-no-light-selected' into 'dev' Claudio Maggioni 2020-05-06 15:55:04 +0200
  • 8414813070 found NewDevice class tommi27 2020-05-06 15:51:26 +0200
  • 5828cb3ffd Merge branch 'dev' of https://lab.si.usi.ch/sa4-2020/the-sanmarinoes/frontend into dev britea 2020-05-06 14:19:50 +0200
  • 717734fecb Merge branch 'fix-brunny' into 'dev' Claudio Maggioni 2020-05-06 13:47:46 +0200
  • bf8e822fc7 modified signup, uniformed message if no scene, device or hosts Nicola Brunner 2020-05-06 13:43:07 +0200
  • 4e96670dfa Merge branch 'mailmap-fix' into 'dev' Claudio Maggioni 2020-05-06 12:02:41 +0200