|
|
01dafc861c
|
Merge branch '60-create-dimmers' into 'dev'
Resolve "create dimmers"
Closes #60
See merge request sa4-2020/the-sanmarinoes/frontend!69
|
2020-03-25 16:47:16 +01:00 |
|
christiancp
|
7ef46e9a1d
|
fixed opacity in intensity light
|
2020-03-25 16:44:47 +01:00 |
|
christiancp
|
ab1e911ccd
|
Working on conflicts
|
2020-03-25 16:41:12 +01:00 |
|
christiancp
|
024e40deca
|
Restyle some devices and creation of both dimmers (button and knob).
|
2020-03-25 16:30:53 +01:00 |
|
Matteo Omenetti
|
db2916ac2a
|
Merge branch 'background-img' into 'dev'
new logo, image upload, image for background
See merge request sa4-2020/the-sanmarinoes/frontend!68
|
2020-03-25 15:46:15 +01:00 |
|
Nicola Brunner
|
fba2321b55
|
new logo, image upload, image for background
|
2020-03-25 15:43:03 +01:00 |
|
Matteo Omenetti
|
8952aea4bb
|
Merge branch '64-fix-dimmable-light-input' into 'dev'
fixed dimmable light input
Closes #64
See merge request sa4-2020/the-sanmarinoes/frontend!67
|
2020-03-25 14:37:51 +01:00 |
|
britea
|
5d9d077b48
|
fixed dimmable light input
|
2020-03-25 14:34:55 +01:00 |
|
|
|
228ada3305
|
Merge branch '62-revise-docker-configuration-for-m1-deployment' into 'dev'
Fix backend url for dev server
Closes #62
See merge request sa4-2020/the-sanmarinoes/frontend!66
|
2020-03-25 14:14:38 +01:00 |
|
|
|
303ac1cfc3
|
fix
|
2020-03-25 14:13:59 +01:00 |
|
Matteo Omenetti
|
436f7c1bd5
|
Merge branch '63-fixed-minor-bugs' into 'dev'
fixed minor bugs
Closes #63
See merge request sa4-2020/the-sanmarinoes/frontend!65
|
2020-03-25 14:00:03 +01:00 |
|
|
|
d1b03e9b7b
|
Merge branch '62-revise-docker-configuration-for-m1-deployment' into 'dev'
Resolve "Revise docker configuration for M1 deployment"
Closes #62
See merge request sa4-2020/the-sanmarinoes/frontend!64
|
2020-03-25 13:57:15 +01:00 |
|
britea
|
7f70aeb828
|
fixed minor bugs
|
2020-03-25 13:55:52 +01:00 |
|
|
|
ed14570546
|
Fixed Dockerfile and parametrized backend URL
|
2020-03-25 13:54:13 +01:00 |
|
Matteo Omenetti
|
cee6e3ce59
|
Merge branch '59-added-motion-sensor-update' into 'dev'
added motion sensor update
Closes #59
See merge request sa4-2020/the-sanmarinoes/frontend!62
|
2020-03-25 11:21:10 +01:00 |
|
britea
|
ec0de847db
|
added motion sensor update
|
2020-03-24 20:35:23 +01:00 |
|
|
|
53bf91e0bd
|
Merge branch '58-switch-and-smart-plug-update' into 'dev'
switch and smart-plug update and fixed warnings
Closes #58
See merge request sa4-2020/the-sanmarinoes/frontend!61
|
2020-03-24 18:19:31 +01:00 |
|
britea
|
8dad01d633
|
switch and smart-plug update and fixed warnings
|
2020-03-24 18:17:04 +01:00 |
|
|
|
e81b5a9553
|
Merge branch 'password-successfully-reset-page' into 'dev'
confirm reset password page done
See merge request sa4-2020/the-sanmarinoes/frontend!57
|
2020-03-24 17:42:15 +01:00 |
|
Fil Cesana
|
733d2ee44f
|
fix
|
2020-03-24 17:37:05 +01:00 |
|
|
|
8f9b26cb22
|
Merge branch '57-get-real-time-updates-on-outputs-statuses-from-input-device-action' into 'dev'
Resolve "Get real time updates on outputs statuses from input device action"
Closes #57
See merge request sa4-2020/the-sanmarinoes/frontend!60
|
2020-03-24 17:10:46 +01:00 |
|
|
|
7928407259
|
Done real time output device updates
|
2020-03-24 17:08:19 +01:00 |
|
|
|
105bb4e088
|
Merge branch 'base64' into 'dev'
Resolve "convert img to base64"
Closes #49
See merge request sa4-2020/the-sanmarinoes/frontend!59
|
2020-03-24 16:06:17 +01:00 |
|
Nicola Brunner
|
580511ce6e
|
is prettier
|
2020-03-24 16:03:08 +01:00 |
|
Fil Cesana
|
b00f803670
|
confirm reset password page done
|
2020-03-24 15:57:22 +01:00 |
|
Nicola Brunner
|
10aeb75730
|
Merge branch 'dev' of lab.si.usi.ch:sa4-2020/the-sanmarinoes/frontend into base64
|
2020-03-24 15:55:51 +01:00 |
|
Nicola Brunner
|
d147701129
|
fixed selected icons, base 64, icons di fil
|
2020-03-24 15:33:32 +01:00 |
|
|
|
745314466d
|
Merge branch '54-implement-updates-with-websocket-from-backend' into 'dev'
Resolve "Implement updates with websocket from backend"
Closes #54
See merge request sa4-2020/the-sanmarinoes/frontend!54
|
2020-03-24 14:38:49 +01:00 |
|
Matteo Omenetti
|
e1b90dab16
|
Merge branch 'header-controller-mobile' into 'dev'
mobile version of the header controller now working, I installed 'yarn add...
See merge request sa4-2020/the-sanmarinoes/frontend!56
|
2020-03-24 14:21:45 +01:00 |
|
Fil Cesana
|
f00939a128
|
mobile version of the header controller now working, I installed 'yarn add react-device-detect', since it automatically modified the file package. json, neither of you need to install it, correct?
|
2020-03-24 10:10:49 +01:00 |
|
|
|
a4188a15a4
|
Merge branch '34-cicd' into 'dev'
Modified the pipeline so that only the master and dev branch have to do the deploy
Closes #34
See merge request sa4-2020/the-sanmarinoes/frontend!55
|
2020-03-23 22:56:54 +01:00 |
|
|
|
77a2502be9
|
Implemented websocket connection with backend on sensors
|
2020-03-23 22:45:13 +01:00 |
|
|
|
1b86f6caa4
|
Merge branch 'beautification' into 'dev'
Added auto-beautifier
See merge request sa4-2020/the-sanmarinoes/frontend!53
|
2020-03-23 21:32:40 +01:00 |
|
|
|
bca57e2a9b
|
Fixed and beautified merge
|
2020-03-23 21:30:20 +01:00 |
|
|
|
897d6705b0
|
Merge branch 'dev' into 'beautification'
# Conflicts:
# smart-hut/src/components/modalform.js
|
2020-03-23 21:26:07 +01:00 |
|
|
|
82924d6062
|
Beautified source code
|
2020-03-23 21:24:17 +01:00 |
|
|
|
50e53e6fe9
|
Added auto-beautifier
|
2020-03-23 21:21:15 +01:00 |
|
|
|
1f3cfb6662
|
Merge branch '53-room-creation-inputs-not-working' into 'dev'
Resolve "Room creation inputs not working"
Closes #53
See merge request sa4-2020/the-sanmarinoes/frontend!52
|
2020-03-23 21:05:52 +01:00 |
|
|
|
5d3a6fe99e
|
Fixed device name input
|
2020-03-23 21:03:16 +01:00 |
|
Matteo Omenetti
|
557d18dfc1
|
Merge branch '52-added-switches-creation-and-updates' into 'dev'
addes switches creation and update
Closes #52
See merge request sa4-2020/the-sanmarinoes/frontend!51
|
2020-03-23 19:11:46 +01:00 |
|
britea
|
f579ea80fe
|
addes switches creation and update
|
2020-03-23 19:08:31 +01:00 |
|
Matteo Omenetti
|
8b49bdfbb7
|
Merge branch '51-added-update-dimmablelight' into 'dev'
added update for dimmableLights
Closes #51
See merge request sa4-2020/the-sanmarinoes/frontend!50
|
2020-03-23 16:04:14 +01:00 |
|
britea
|
045742d68e
|
added update for dimmableLights
|
2020-03-23 13:22:30 +01:00 |
|
|
|
950908ef07
|
Merge branch '46-enable-deploy-stage-only-on-protected-branches' into 'dev'
Resolve "Enable deploy stage only on protected branches"
Closes #46
See merge request sa4-2020/the-sanmarinoes/frontend!46
|
2020-03-23 11:59:44 +01:00 |
|
Matteo Omenetti
|
52b1e12d73
|
Merge branch '48-add-update-lights' into 'dev'
added update on lights
Closes #48
See merge request sa4-2020/the-sanmarinoes/frontend!49
|
2020-03-23 10:21:35 +01:00 |
|
britea
|
d7c2e020bc
|
added update on lights
|
2020-03-23 02:17:13 +01:00 |
|
Matteo Omenetti
|
c6c62c51f2
|
Merge branch 'header-controller-fix' into 'dev'
header in dashboard: size, logo, fixed
See merge request sa4-2020/the-sanmarinoes/frontend!47
|
2020-03-22 23:40:48 +01:00 |
|
Matteo Omenetti
|
d4cec8a1fc
|
Merge branch '47-fixed-bugs' into 'dev'
fixed bugs and cleaned code
Closes #47
See merge request sa4-2020/the-sanmarinoes/frontend!48
|
2020-03-22 18:12:19 +01:00 |
|
britea
|
c215daf44d
|
fixed bugs and cleaned code
|
2020-03-22 17:58:27 +01:00 |
|
Fil Cesana
|
c5100700a4
|
header in dashboard: size, logo, fixed
|
2020-03-21 16:06:18 +01:00 |
|
