b179115c15
Merge branch 'dev' of lab.si.usi.ch:sa4-2020/the-sanmarinoes/frontend into frontend-userstory1-fil
2020-05-22 00:04:35 +02:00
Andrea Brites Marto
c583c0e73e
Merge branch '116-fix-bug-eslint' into 'dev'
...
fix bugs eslint
Closes #116
See merge request sa4-2020/the-sanmarinoes/frontend!153
2020-05-21 16:49:44 +02:00
britea
e54b53147a
fix bugs eslint
2020-05-21 16:45:39 +02:00
Andrea Brites Marto
9df8a7f19a
Merge branch '71-6-users-can-add-conditions-to-automations' into 'dev'
...
Resolve "6. Users can add conditions to automations"
Closes #71
See merge request sa4-2020/the-sanmarinoes/frontend!152
2020-05-21 16:17:17 +02:00
britea
727a5c9081
fixed condition autmations
2020-05-21 16:13:47 +02:00
britea
3830c0004f
other eslint avoid
2020-05-19 16:25:05 +02:00
britea
00778d989f
avoided some eslint problems
2020-05-19 16:24:29 +02:00
britea
0d2a2e92ba
connected automation conditions to the backend
2020-05-19 16:23:30 +02:00
Fil Cesana
31c98fac49
simulation panel is finished.
2020-05-18 10:54:31 +02:00
Christian Capeáns Pérez
fa4bae7c10
Conditions to automations done (not connected to backend). I followed the same structure as in triggers
2020-05-15 20:57:42 +02:00
Andrea Brites Marto
364f58fa24
Merge branch 'fix-bug-sonaqube' into 'dev'
...
Fix bug sonarqube
See merge request sa4-2020/the-sanmarinoes/frontend!149
2020-05-12 16:37:22 +02:00
dbf6a5ef5a
Reverted package.json and package-lock.json
2020-05-12 16:33:34 +02:00
britea
406d563f4f
fix sonar
2020-05-12 16:23:27 +02:00
britea
1a755be7fb
fix bug sonrqube
2020-05-12 16:09:59 +02:00
britea
c2e5d55ed2
Merge branch 'dev' of https://lab.si.usi.ch/sa4-2020/the-sanmarinoes/frontend into dev
2020-05-12 15:48:34 +02:00
4eba936a1e
Merge branch 'sonar-fix' into 'dev'
...
Changed beautifier to eslint
See merge request sa4-2020/the-sanmarinoes/frontend!148
2020-05-12 15:22:45 +02:00
c67f2e4707
Beautifier fix
2020-05-12 15:18:33 +02:00
Matteo Omenetti
87d82296ac
Merge branch '115-configure-eslint-analysis-for-sonarqube' into 'dev'
...
Resolve "Configure eslint analysis for sonarqube"
Closes #115
See merge request sa4-2020/the-sanmarinoes/frontend!147
2020-05-11 14:58:41 +02:00
Andrea Mocci
19efeb22de
Issue #115 : Run code quality pipeline only on dev
2020-05-11 14:54:34 +02:00
Andrea Mocci
22d0ba078a
Issue #115 : Remove cypress config for eslint
2020-05-11 14:40:15 +02:00
Andrea Mocci
50ac55db8b
Issue #115 : Add eslint configuration, commands, and pipeline config
2020-05-11 14:29:14 +02:00
Andrea Brites Marto
a576632ef7
Merge branch '114-remove-duplications' into 'dev'
...
Resolve "remove-duplications"
Closes #114
See merge request sa4-2020/the-sanmarinoes/frontend!146
2020-05-10 23:55:50 +02:00
britea
bb11babc5b
fixed other duplications
2020-05-10 23:50:59 +02:00
britea
9c89a2ea99
fixed another duplication
2020-05-10 23:28:20 +02:00
Andrea Brites Marto
bd0b4d79ea
Merge branch '114-remove-duplications' into 'dev'
...
wrong class name
Closes #114
See merge request sa4-2020/the-sanmarinoes/frontend!145
2020-05-10 21:57:17 +02:00
britea
746e00baa7
wrong class name
2020-05-10 21:51:09 +02:00
Andrea Brites Marto
e3068cee6b
Merge branch '114-remove-duplications' into 'dev'
...
Resolve "remove-duplications"
Closes #114
See merge request sa4-2020/the-sanmarinoes/frontend!144
2020-05-10 21:48:57 +02:00
britea
f6d5ea7853
file confirm
2020-05-10 21:43:30 +02:00
britea
c5fefe7ad6
removed sonarqube confirm duplication
2020-05-10 21:43:09 +02:00
britea
18e46b8e61
Merge branch 'dev' of https://lab.si.usi.ch/sa4-2020/the-sanmarinoes/frontend into dev
2020-05-10 21:29:29 +02:00
Andrea Brites Marto
1a3b631062
Merge branch '112-remove-possibility-to-reselect-a-device-already-added-to-a-scene' into 'dev'
...
fixed add states daoes not show states already in scene
Closes #112
See merge request sa4-2020/the-sanmarinoes/frontend!143
2020-05-10 11:05:24 +02:00
britea
7df52334ff
fixed add states daoes not show states already in scene
2020-05-10 11:00:56 +02:00
Fil Cesana
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
2020-05-09 17:46:57 +02:00
Fil Cesana
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
2020-05-09 09:57:04 +02:00
Fil Cesana
bf9919560a
simulation panel now opens, it still misses the content
2020-05-09 09:13:26 +02:00
Fil Cesana
367159e3cf
button added in the header
2020-05-09 08:45:27 +02:00
3ade526ed3
Merge branch 'sonar-fix' into 'dev'
...
Sonarqube fixes
See merge request sa4-2020/the-sanmarinoes/frontend!142
2020-05-08 23:20:21 +02:00
957434ece5
Sonarqube fixes
2020-05-08 23:19:58 +02:00
9dc193ef28
Merge branch 'sonar-fix' into 'dev'
...
fixed Curtains.css
See merge request sa4-2020/the-sanmarinoes/frontend!141
2020-05-08 23:00:57 +02:00
393e753b44
Merge branch 'dev' into 'sonar-fix'
...
# Conflicts:
# smart-hut/src/components/dashboard/devices/Curtains.css
2020-05-08 23:00:44 +02:00
0205ad3fd2
fixed Curtains.css
2020-05-08 23:00:11 +02:00
64d0cc19f8
Merge branch 'sonar-fix' into 'dev'
...
fixed Curtains.css
See merge request sa4-2020/the-sanmarinoes/frontend!140
2020-05-08 22:51:05 +02:00
4bf865c5ae
fixed Curtains.css
2020-05-08 22:50:42 +02:00
britea
7354eefb49
Merge branch 'dev' of https://lab.si.usi.ch/sa4-2020/the-sanmarinoes/frontend into dev
2020-05-08 18:42:11 +02:00
0ec8dccb25
Merge branch '106-rangetrigger-values-must-be-validated-to-a-sensible-range-for-the-respective-device' into 'dev'
...
Check values for different types of sensors when creating a trigger for an automation
Closes #106
See merge request sa4-2020/the-sanmarinoes/frontend!139
2020-05-08 16:07:59 +02:00
b27c6a3f51
Fixed bugs in automation fast update
2020-05-08 16:03:42 +02:00
dbc6223954
Fixed git merge sentience
2020-05-08 15:47:18 +02:00
e5bf0dbd83
Prettier reformat
2020-05-08 15:45:08 +02:00
3e53f11da0
Merge branch 'dev' into '106-rangetrigger-values-must-be-validated-to-a-sensible-range-for-the-respective-device'
...
# Conflicts:
# smart-hut/src/store.js
2020-05-08 15:42:09 +02:00
3132204872
Merge branch '103-temperature-sensor-color-circle-change-with-temperature-value' into 'dev'
...
Resolve "temperature sensor - color circle change with temperature value"
Closes #103
See merge request sa4-2020/the-sanmarinoes/frontend!131
2020-05-08 15:41:46 +02:00
