This website requires JavaScript.
ecbe64d21e
Merge branch 'fix-default-device-name' into 'dev'
2020-03-25 22:18:42 +0100
a8c8de8bdc
fix device default name
2020-03-25 22:15:52 +0100
6b09bdf016
Merge branch '65-btn-dimmer-and-knob-dimmer-update' into 'dev'
Claudio Maggioni
2020-03-25 20:31:52 +0100
67496b11a0
btn-dimmer and knob-dimmer update
2020-03-25 19:58:19 +0100
9fa9a2f90f
Merge branch 'fixed-switch-and-warnings' into 'dev'
Claudio Maggioni
2020-03-25 17:27:18 +0100
ff090ad317
fixed switch and warnings
2020-03-25 17:20:53 +0100
01dafc861c
Merge branch '60-create-dimmers' into 'dev'
Claudio Maggioni
2020-03-25 16:47:16 +0100
7ef46e9a1d
fixed opacity in intensity light
2020-03-25 16:44:47 +0100
ab1e911ccd
Working on conflicts
2020-03-25 16:04:02 +0100
024e40deca
Restyle some devices and creation of both dimmers (button and knob).
2020-03-25 12:13:15 +0100
db2916ac2a
Merge branch 'background-img' into 'dev'
2020-03-25 15:46:15 +0100
fba2321b55
new logo, image upload, image for background
2020-03-25 15:43:03 +0100
8952aea4bb
Merge branch '64-fix-dimmable-light-input' into 'dev'
2020-03-25 14:37:51 +0100
5d9d077b48
fixed dimmable light input
2020-03-25 14:34:55 +0100
228ada3305
Merge branch '62-revise-docker-configuration-for-m1-deployment' into 'dev'
Claudio Maggioni
2020-03-25 14:14:38 +0100
303ac1cfc3
fix
Claudio Maggioni
2020-03-25 14:13:59 +0100
436f7c1bd5
Merge branch '63-fixed-minor-bugs' into 'dev'
2020-03-25 14:00:03 +0100
d1b03e9b7b
Merge branch '62-revise-docker-configuration-for-m1-deployment' into 'dev'
Claudio Maggioni
2020-03-25 13:57:15 +0100
7f70aeb828
fixed minor bugs
2020-03-25 13:55:52 +0100
ed14570546
Fixed Dockerfile and parametrized backend URL
Claudio Maggioni
2020-03-25 13:54:13 +0100
cee6e3ce59
Merge branch '59-added-motion-sensor-update' into 'dev'
2020-03-25 11:21:10 +0100
ec0de847db
added motion sensor update
2020-03-24 20:35:23 +0100
53bf91e0bd
Merge branch '58-switch-and-smart-plug-update' into 'dev'
Claudio Maggioni
2020-03-24 18:19:31 +0100
8dad01d633
switch and smart-plug update and fixed warnings
2020-03-24 18:17:04 +0100
e81b5a9553
Merge branch 'password-successfully-reset-page' into 'dev'
Claudio Maggioni
2020-03-24 17:42:15 +0100
733d2ee44f
fix
2020-03-24 17:37:05 +0100
8f9b26cb22
Merge branch '57-get-real-time-updates-on-outputs-statuses-from-input-device-action' into 'dev'
Claudio Maggioni
2020-03-24 17:10:46 +0100
7928407259
Done real time output device updates
Claudio Maggioni
2020-03-24 17:08:19 +0100
105bb4e088
Merge branch 'base64' into 'dev'
Claudio Maggioni
2020-03-24 16:06:17 +0100
580511ce6e
is prettier
2020-03-24 16:03:08 +0100
b00f803670
confirm reset password page done
2020-03-24 15:57:22 +0100
10aeb75730
Merge branch 'dev' of lab.si.usi.ch:sa4-2020/the-sanmarinoes/frontend into base64
2020-03-24 15:55:51 +0100
d147701129
fixed selected icons, base 64, icons di fil
2020-03-24 15:33:32 +0100
745314466d
Merge branch '54-implement-updates-with-websocket-from-backend' into 'dev'
Claudio Maggioni
2020-03-24 14:38:49 +0100
e1b90dab16
Merge branch 'header-controller-mobile' into 'dev'
2020-03-24 14:21:45 +0100
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 +0100
a4188a15a4
Merge branch '34-cicd' into 'dev'
Claudio Maggioni
2020-03-23 22:56:54 +0100
77a2502be9
Implemented websocket connection with backend on sensors
Claudio Maggioni
2020-03-23 22:45:13 +0100
1b86f6caa4
Merge branch 'beautification' into 'dev'
Claudio Maggioni
2020-03-23 21:32:40 +0100
bca57e2a9b
Fixed and beautified merge
Claudio Maggioni
2020-03-23 21:29:42 +0100
897d6705b0
Merge branch 'dev' into 'beautification'
Claudio Maggioni
2020-03-23 21:26:07 +0100
82924d6062
Beautified source code
Claudio Maggioni
2020-03-23 21:24:17 +0100
50e53e6fe9
Added auto-beautifier
Claudio Maggioni
2020-03-23 21:21:15 +0100
1f3cfb6662
Merge branch '53-room-creation-inputs-not-working' into 'dev'
Claudio Maggioni
2020-03-23 21:05:52 +0100
5d3a6fe99e
Fixed device name input
Claudio Maggioni
2020-03-23 21:03:16 +0100
557d18dfc1
Merge branch '52-added-switches-creation-and-updates' into 'dev'
2020-03-23 19:11:46 +0100
f579ea80fe
addes switches creation and update
2020-03-23 19:08:31 +0100
8b49bdfbb7
Merge branch '51-added-update-dimmablelight' into 'dev'
2020-03-23 16:04:14 +0100
045742d68e
added update for dimmableLights
2020-03-23 13:22:30 +0100
950908ef07
Merge branch '46-enable-deploy-stage-only-on-protected-branches' into 'dev'
Claudio Maggioni
2020-03-23 11:59:44 +0100
52b1e12d73
Merge branch '48-add-update-lights' into 'dev'
2020-03-23 10:21:35 +0100
d7c2e020bc
added update on lights
2020-03-23 02:17:13 +0100
c6c62c51f2
Merge branch 'header-controller-fix' into 'dev'
2020-03-22 23:40:48 +0100
d4cec8a1fc
Merge branch '47-fixed-bugs' into 'dev'
2020-03-22 18:12:19 +0100
c215daf44d
fixed bugs and cleaned code
2020-03-22 17:58:27 +0100
c5100700a4
header in dashboard: size, logo, fixed
2020-03-21 16:06:18 +0100
50639e9655
Modified the pipeline so that only the master and dev branch have to do the deploy
2020-03-21 15:34:28 +0100
09d52fbd1c
Modified the pipeline so that only the master and dev branch have to do the deploy
2020-03-21 15:34:28 +0100
84c963b559
Merge branch '37-nav-resp' into 'dev'
Claudio Maggioni
2020-03-21 14:55:56 +0100
4f4e54e065
Merge branch 'dev' into '37-nav-resp'
Claudio Maggioni
2020-03-21 14:55:44 +0100
37506df76b
Merge branch '404' into 'dev'
Claudio Maggioni
2020-03-21 14:19:19 +0100
0de3b0257f
Done 4oh4 page
2020-03-21 12:33:01 +0100
dd94a6aa30
Merge branch 'dev' into '37-nav-resp'
Claudio Maggioni
2020-03-21 13:56:54 +0100
f69ad0c5f5
Merge branch 'minor-issues+instruction-page' into 'dev'
Claudio Maggioni
2020-03-21 13:52:20 +0100
7d78287379
resolved conflicts
2020-03-21 13:38:34 +0100
8ac12ac8bf
Merge branch '43-frontend-device-with-backend' into 'dev'
Claudio Maggioni
2020-03-21 00:00:19 +0100
8b3200f639
initial setup for device with backend
2020-03-20 18:42:38 +0100
4c15df7058
Merge branch '41-fix-all-warnings-and-clean-code' into 'dev'
Claudio Maggioni
2020-03-19 12:14:38 +0100
e786288fa8
fix all warnings and cleaned code
2020-03-19 11:52:13 +0100
c6e483ea6c
done minor fixes responive navbar
2020-03-19 11:49:00 +0100
3360220669
more responsive than before ;)
2020-03-18 17:12:29 +0100
1757c8e2d7
Instructions pages done, I will wait until the app is more or less completed before writing the actual instructions, for many thing may change along the way.
2020-03-18 16:35:42 +0100
c5a59dbe7d
Merge branch '32-finish-dashboard' into 'dev'
Claudio Maggioni
2020-03-18 16:03:10 +0100
d7399abdea
Removed TODO
Claudio Maggioni
2020-03-18 15:49:33 +0100
993f1432a0
some changes to make it work
2020-03-18 15:30:02 +0100
cd12d5f69f
minor error fixed
2020-03-18 15:12:12 +0100
e60c2ed45a
Merge branch 'dev' into '32-finish-dashboard'
2020-03-18 15:06:27 +0100
70e5dc8017
change button color
2020-03-18 14:19:47 +0100
edf1706986
Add device feature finished
2020-03-18 14:18:37 +0100
7faa63e484
Merge branch '40-re-fix-navbar-and-devicepanel' into 'dev'
Claudio Maggioni
2020-03-18 13:35:05 +0100
07edc884b9
re-fix navbar and device panel
2020-03-18 13:20:01 +0100
50bc259990
Merge branch '39-fix-navbar-and-devicepanel' into 'dev'
Claudio Maggioni
2020-03-18 13:03:10 +0100
7a80e0562b
fix navbar and devicePanel
2020-03-18 12:46:28 +0100
99f1e16927
Everything related to the settings is done
2020-03-17 23:24:40 +0100
744f1b5710
All the devices are implemented
2020-03-17 17:38:03 +0100
707a5630fc
Merge branch '5-add-delete-or-modify-rooms' into 'dev'
Claudio Maggioni
2020-03-17 17:35:55 +0100
e12d162458
Merge branch 'dev' of lab.si.usi.ch:sa4-2020/the-sanmarinoes/frontend into dev
Claudio Maggioni
2020-03-17 17:35:20 +0100
22a7ba07cc
Merge remote-tracking branch 'origin/header-controller' into dev
Claudio Maggioni
2020-03-17 17:34:17 +0100
cb0e498ace
Merge branch '36-ci-cd-fails-on-deploy-because-of-bad-tag-configuration' into 'dev'
Claudio Maggioni
2020-03-17 17:25:17 +0100
6bf3bd07fa
Merge branch 'mod-room' of lab.si.usi.ch:sa4-2020/the-sanmarinoes/frontend into mod-room
2020-03-17 17:09:46 +0100
50b05fa22a
Added 404 images, finished modify in feature in navbar
2020-03-17 16:39:21 +0100
fec2bab82f
Fixed CI
Claudio Maggioni
2020-03-17 17:05:27 +0100
373c7e2a1a
Added 404 images, finished modify in feature in navbar
2020-03-17 16:39:21 +0100
359fa65a84
Merge branch '35-fixed-login-display-and-devices' into 'dev'
Claudio Maggioni
2020-03-17 16:35:29 +0100
1fe78b824b
fixed login display and devices
2020-03-17 16:20:43 +0100
c5dbf01394
changed text in homepage, add icons, instruction page still work in progress, changed logo headController
2020-03-17 15:06:40 +0100
69822d3c53
Merge branch '34-cicd' into 'dev'
Claudio Maggioni
2020-03-17 15:01:51 +0100
b2d94f337f
Hopefully maybe it will conisder to work @tommi27,Claudio told me to do so
2020-03-17 14:44:05 +0100
b2503156a9
Merge branch 'dashboard-feature' into 'dev'
Claudio Maggioni
2020-03-15 16:44:21 +0100
182e1d6a48
Almost all the devices in the dashboard are implemented, along with the settings and add new device feature
2020-03-15 15:50:25 +0100
Matteo Omenetti
Claudio Maggioni