Commit graph

442 commits

Author SHA1 Message Date
Andrea Brites Marto
c652f588cf Merge branch 'frontend-userstory1-fil' into 'dev'
Frontend userstory1 fil

See merge request sa4-2020/the-sanmarinoes/frontend!151
2020-05-27 12:08:01 +02:00
britea
77070242c6 almost complete simulation panel 2020-05-27 12:04:16 +02:00
britea
22366cb7a2 fixed simulation panel 2020-05-26 17:20:56 +02:00
britea
3ca4abaf62 resolve conflicts 2020-05-26 13:46:06 +02:00
britea
066eb1535b initial simulation panel 2020-05-26 13:45:06 +02:00
Andrea Brites Marto
1872fff6f4 Merge branch 'Brunner-beauty-fix' into 'dev'
Brunner beauty fix

See merge request sa4-2020/the-sanmarinoes/frontend!156
2020-05-26 13:44:20 +02:00
Nicola Brunner
5e996670f3 forse ora va 2020-05-26 13:40:03 +02:00
britea
8cdd66f6d4 Merge branch 'dev' of https://lab.si.usi.ch/sa4-2020/the-sanmarinoes/frontend into frontend-userstory1-fil 2020-05-25 15:57:45 +02:00
Nicola Brunner
56bb2b892b modal is now closing 2020-05-24 12:49:54 +02:00
Andrea Brites Marto
0d03c420ee Merge branch '118-fix-thermostat-trigger' into 'dev'
fixed thermostat trigger

Closes #118

See merge request sa4-2020/the-sanmarinoes/frontend!155
2020-05-23 16:23:33 +02:00
britea
b25b319228 fixed thermostat trigger 2020-05-23 16:19:13 +02:00
britea
5dd2bdae14 fixed update branch 2020-05-23 16:13:20 +02:00
britea
a184333579 update branch 2020-05-23 16:11:25 +02:00
britea
747bd370cc update branch 2020-05-23 16:10:31 +02:00
Nicola Brunner
6c5f524aeb test 2020-05-23 14:22:09 +02:00
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
Nicola Brunner
ac1a15cd5b beauty fixes 2020-05-21 22:02:49 +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