Commit graph

Select branches

Hide pull requests

dev

master

M1

M2

M3

Mono Color

• 261e2ece8e Merge branch 'mailmap-fix' into 'dev' Claudio Maggioni 2020-05-06 12:02:41 +0200
• e09c56a4bd Merge branch 'dev' into 'mailmap-fix' Claudio Maggioni 2020-05-06 12:02:33 +0200
• ff26f88cfd Added updated mailmap for everyone in the repo Claudio Maggioni (maggicl) 2020-05-06 11:59:09 +0200
• 1811c74a6a Merge branch 'mailmap-fix' into 'dev' Claudio Maggioni 2020-05-06 11:59:30 +0200
• a223cdbb40 Added updated mailmap for everyone in the repo Claudio Maggioni (maggicl) 2020-05-06 11:59:09 +0200
• 40af5c8f2b Merge branch 'dev' of https://lab.si.usi.ch/sa4-2020/the-sanmarinoes/frontend into dev britea 2020-05-06 11:35:59 +0200
• 3dcd24f36d Merge branch 'scene-fix' into 'dev' Claudio Maggioni 2020-05-06 11:32:07 +0200
• 3b55a8ea78 Fixed style issues on scene share guest button Claudio Maggioni (maggicl) 2020-05-06 11:28:27 +0200
• 7a1ca33dfc Merge branch '101-share-cameras-button-is-unlableled' into 'dev' Claudio Maggioni 2020-05-06 11:16:35 +0200
• 194e502578 Added label to share cameras button and other minor fixes Claudio Maggioni (maggicl) 2020-05-06 11:13:17 +0200
• 76d5125d79 Merge branch 'dev' of https://lab.si.usi.ch/sa4-2020/the-sanmarinoes/frontend into dev britea 2020-05-05 18:02:16 +0200
• ede920b628 Merge branch '93-guests-implement-scenes-2' into 'dev' Andrea Brites Marto 2020-05-05 17:59:58 +0200
• 5433b5fd8d Merge branch 'dev' of https://lab.si.usi.ch/sa4-2020/the-sanmarinoes/frontend into dev britea 2020-05-05 17:57:10 +0200
• bb16d5c475 Done 1 read scene part Claudio Maggioni 2020-05-05 17:04:53 +0200
• 5c5988526b Merge branch 'dev' of lab.si.usi.ch:sa4-2020/the-sanmarinoes/frontend into 93-guests-implement-scenes-2 Claudio Maggioni 2020-05-05 16:35:27 +0200
• bcb2105847 Merge branch '93-guests-implement-scenes' into 'dev' Claudio Maggioni 2020-05-05 16:33:21 +0200
• 246fdb1de8 points 2,3,4 britea 2020-05-05 15:53:07 +0200
• 3670d16e4d Merge branch 'dev' of https://lab.si.usi.ch/sa4-2020/the-sanmarinoes/frontend into dev britea 2020-05-05 15:06:28 +0200
• af7d93b44a Merge branch '98-thermostats-must-have-an-option-to-choose-between-internal-and-external-sensors-must-be-disabled' into 'dev' Claudio Maggioni 2020-05-04 19:45:33 +0200
• bbd8074732 added option to use external temperature sensor britea 2020-05-04 19:42:13 +0200
• fcd940e364 Merge branch 'dev' of https://lab.si.usi.ch/sa4-2020/the-sanmarinoes/frontend into dev britea 2020-05-04 18:24:15 +0200
• bf77b676eb Removed current user from list of possible guests in guest modal Claudio Maggioni (maggicl) 2020-05-04 18:22:21 +0200
• b26162415c Merge branch '97-if-i-create-a-new-room-with-an-image-remove-image-does-not-work' into 'dev' Claudio Maggioni 2020-05-04 18:01:50 +0200
• 6454a369df Room remove image button fixed Claudio Maggioni (maggicl) 2020-05-04 17:58:08 +0200
• 0c98ed0e49 Merge branch 'mailmap-fix' into 'dev' Claudio Maggioni 2020-05-04 17:35:59 +0200
• 781394c788 Fixed my duplicate entry in repo stats Claudio Maggioni (maggicl) 2020-05-04 17:35:33 +0200
• 88dca6b144 Merge branch '96-when-creating-a-scene-users-can-t-copy-the-configuration-from-another-scene' into 'dev' Claudio Maggioni 2020-05-04 16:12:31 +0200
• be8c049e47 Merge branch 'dev' of https://lab.si.usi.ch/sa4-2020/the-sanmarinoes/frontend into dev britea 2020-05-04 16:11:26 +0200
• 94ef7ef558 Scene copy implemented Claudio Maggioni (maggicl) 2020-05-04 16:09:56 +0200
• da120b377e Merge branch '95-scene-has-no-customizable-icon' into 'dev' Claudio Maggioni 2020-05-04 15:11:46 +0200
• 5fac9890a6 Added icons to scenes Claudio Maggioni (maggicl) 2020-05-04 15:08:17 +0200
• 76073ca15b Merge branch '94-curtains-creation-does-not-supply-a-default-name' into 'dev' Claudio Maggioni 2020-05-04 14:40:49 +0200
• 9f4bc21fa8 Fixed curtains creation default name Claudio Maggioni (maggicl) 2020-05-04 14:38:18 +0200
• 46c1c3caf3 Merge branch 'dev' of https://lab.si.usi.ch/sa4-2020/the-sanmarinoes/frontend into dev britea 2020-05-04 13:59:15 +0200
• c7334b735f Merge branch '72-7-users-can-invite-guests' into 'dev' Claudio Maggioni 2020-05-04 12:06:50 +0200
• 61430bb42e Merge branch 'dev' into '72-7-users-can-invite-guests' Claudio Maggioni 2020-05-04 12:03:28 +0200
• cfe1f35226 Deletion propagation implemented Claudio Maggioni (maggicl) 2020-05-04 11:57:42 +0200
• c145be02b4 Lights can be modified by a guest Claudio Maggioni (maggicl) 2020-05-04 11:13:19 +0200
• 770469ade3 Socket update handling done except deletion messages, currently not implemented in the server side Claudio Maggioni (maggicl) 2020-05-03 19:51:00 +0200
• 6c58ca4d64 Merge branch 'dev' of https://lab.si.usi.ch/sa4-2020/the-sanmarinoes/frontend into dev britea 2020-05-03 18:18:26 +0200
• c7dc34eedc other minor fixes Claudio Maggioni (maggicl) 2020-05-03 18:13:50 +0200
• 0252870c70 fixed bug in deviceProps.js Claudio Maggioni (maggicl) 2020-05-03 18:11:04 +0200
• 3014b73323 Device guest view implemented Claudio Maggioni (maggicl) 2020-05-03 18:09:53 +0200
• c95f7a95f7 Fixes to Device in preparation to use in Hosts tab Claudio Maggioni (maggicl) 2020-05-03 17:18:34 +0200
• f6f46918c6 Fixed warning and merge in thermostats Claudio Maggioni (maggicl) 2020-05-03 16:37:04 +0200
• fabcce15a1 Merge branch '92-fix-videocamera' into 'dev' Andrea Brites Marto 2020-05-03 14:43:01 +0200
• 65756d0dc9 firx videocamera turn on/off britea 2020-05-03 14:39:44 +0200
• 74a5e49776 Merge branch 'dev' of lab.si.usi.ch:sa4-2020/the-sanmarinoes/frontend into 72-7-users-can-invite-guests Claudio Maggioni (maggicl) 2020-05-02 22:46:40 +0200
• 9b2253b161 Guest selection panel working Claudio Maggioni (maggicl) 2020-05-02 22:37:20 +0200
• a6fbd1a5d2 WIP Claudio Maggioni 2020-05-02 20:50:34 +0200
• 8e3a9a57e0 Merge branch 'dev' of https://lab.si.usi.ch/sa4-2020/the-sanmarinoes/frontend into dev britea 2020-05-02 17:10:45 +0200
• b99641125c Merge branch '90-fix-devices' into 'dev' Andrea Brites Marto 2020-05-02 17:05:11 +0200
• 9537c12978 fix devices britea 2020-05-02 17:02:50 +0200
• 87922f689d Merge branch 'dev' of https://lab.si.usi.ch/sa4-2020/the-sanmarinoes/frontend into dev britea 2020-05-02 17:01:39 +0200
• 091ab50c0e WIP Claudio Maggioni (maggicl) 2020-05-02 16:40:29 +0200
• c5e1e1bd8d added actions without working code tommi27 2020-04-25 17:46:52 +0200
• 43615ba3b1 Host should work, cannot solve an error tommi27 2020-04-24 16:54:50 +0200
• 2c298ec4bb Merge branch 'log-fix' into 'dev' Claudio Maggioni 2020-05-02 14:54:01 +0200
• 8b1a7d4b20 Cleaned logs across repository Claudio Maggioni (maggicl) 2020-05-02 14:51:31 +0200
• f058ca8502 Merge branch 'thermostat-fix' into 'dev' Claudio Maggioni 2020-05-02 14:00:26 +0200
• 518760e925 Thermostats fixed (for scenes) Claudio Maggioni (maggicl) 2020-05-02 13:58:02 +0200
• 8b1b22cd88 Merge branch 'dev' of https://lab.si.usi.ch/sa4-2020/the-sanmarinoes/frontend into dev britea 2020-05-02 13:40:54 +0200
• 126efe3b53 Merge branch 'thermostat-fix' into 'dev' Claudio Maggioni 2020-05-02 11:14:35 +0200
• d49d6361ef Thermostats fixed Claudio Maggioni (maggicl) 2020-05-02 11:11:21 +0200
• 3769ea32b0 Merge branch 'dev' of https://lab.si.usi.ch/sa4-2020/the-sanmarinoes/frontend into dev britea 2020-05-01 20:28:39 +0200
• 3af3b85aa9 Merge branch 'automations-fix' into 'dev' Claudio Maggioni 2020-05-01 20:10:54 +0200
• ac1bcdbc29 More fixes on automations Claudio Maggioni (maggicl) 2020-05-01 20:05:39 +0200
• 3871657b3b Merge branch 'dev' of https://lab.si.usi.ch/sa4-2020/the-sanmarinoes/frontend into dev britea 2020-05-01 20:07:10 +0200
• 89a4f2f068 Merge branch '89-fix-scenes' into 'dev' Andrea Brites Marto 2020-05-01 19:58:36 +0200
• 6db8e928f1 fixed scenes, add multiple states britea 2020-05-01 19:55:08 +0200
• 8aed75faf2 Merge branch 'dev' of https://lab.si.usi.ch/sa4-2020/the-sanmarinoes/frontend into dev britea 2020-05-01 19:29:42 +0200
• 96184c76c9 Fixing automations and ui in general Claudio Maggioni (maggicl) 2020-05-01 16:42:42 +0200
• 9d8524c7c9 Merge branch 'dev-copy' into 'dev' Claudio Maggioni 2020-05-01 11:47:45 +0200
• 52befca126 Fixed videocamera Claudio Maggioni (maggicl) 2020-05-01 11:45:19 +0200
• c2f646d29a Merge branch 'dev-copy' into 'dev' Claudio Maggioni 2020-05-01 11:21:38 +0200
• 292a33e5bc Fixed updates from @christiancp Claudio Maggioni (maggicl) 2020-05-01 11:18:25 +0200
• 146aae1684 prettier run Claudio Maggioni (maggicl) 2020-04-30 11:56:06 +0200
• 697a348058 Merge branch '78-fix-light-problems-in-the-first-bach' of lab.si.usi.ch:sa4-2020/the-sanmarinoes/frontend into dev-copy Claudio Maggioni (maggicl) 2020-04-30 11:54:42 +0200
• 9f628f3b73 Merge branch 'dev' of https://lab.si.usi.ch/sa4-2020/the-sanmarinoes/frontend into dev britea 2020-04-28 13:04:16 +0200
• d3b1c82a29 Merge branch 'dev' into 'master' M2 Claudio Maggioni 2020-04-28 12:09:18 +0200
• 1de7b9992e Merge branch '70-5-users-can-create-basic-automations' into 'dev' Claudio Maggioni 2020-04-28 12:07:58 +0200
• 5b2bd7cc48 runned beautifier Claudio Maggioni (maggicl) 2020-04-28 12:04:01 +0200
• b9be38d467 removed warnings Claudio Maggioni (maggicl) 2020-04-28 12:02:46 +0200
• b0b281263e fix Claudio Maggioni (maggicl) 2020-04-28 11:56:34 +0200
• 835ac99a8e Automation deletion added Christian Capeáns Pérez 2020-04-28 11:39:38 +0200
• d9de72cf2a Merge branch 'dev' of https://lab.si.usi.ch/sa4-2020/the-sanmarinoes/frontend into dev britea 2020-04-28 11:07:47 +0200
• 361c82c264 Merge branch '88-fix-dimmable-state' into 'dev' Claudio Maggioni 2020-04-28 11:02:46 +0200
• 7de6331f0f fix dimmable state britea 2020-04-28 10:59:47 +0200
• 5e055bc477 fix dimmable states britea 2020-04-28 10:57:35 +0200
• 7135ddc588 Merge branch '87-fix-thermostat' into 'dev' Andrea Brites Marto 2020-04-28 10:51:07 +0200
• 0b840e7f8e fix thermostat britea 2020-04-28 10:48:07 +0200
• 13f75e986e Merge branch '86-hope-fix' into 'dev' Andrea Brites Marto 2020-04-28 10:29:02 +0200
• c7c121182b fix dimmer scene state britea 2020-04-28 10:24:58 +0200
• 1d1fbe335e Merge branch '85-thermostat-fix-2' into 'dev' Andrea Brites Marto 2020-04-27 19:27:49 +0200
• 2eaa0e8345 thermostat fix britea 2020-04-27 19:24:21 +0200
• f6c8379fa0 Merge branch '84-small-fix' into 'dev' Andrea Brites Marto 2020-04-27 17:02:31 +0200
• cc23824a37 Automations basic stuff is working: create, get Christian Capeáns Pérez 2020-04-27 17:00:46 +0200
• 71d9731fc7 fixed device settings on scenes britea 2020-04-27 16:58:55 +0200
• 23ad5e2ff3 Merge branch 'apply' into 'dev' Andrea Brites Marto 2020-04-27 15:55:06 +0200
• b7e17fc770 Merge branch 'dev' into 'apply' Andrea Brites Marto 2020-04-27 15:50:37 +0200