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 |
|
Nicola Brunner
|
fba2321b55
|
new logo, image upload, image for background
|
2020-03-25 15:43:03 +01:00 |
|
|
ed14570546
|
Fixed Dockerfile and parametrized backend URL
|
2020-03-25 13:54:13 +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
|
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 |
|
|
82924d6062
|
Beautified source code
|
2020-03-23 21:24:17 +01:00 |
|
Fil Cesana
|
c5100700a4
|
header in dashboard: size, logo, fixed
|
2020-03-21 16:06:18 +01:00 |
|
Fil Cesana
|
7d78287379
|
resolved conflicts
|
2020-03-21 13:38:34 +01:00 |
|
Matteo Omenetti
|
e60c2ed45a
|
Merge branch 'dev' into '32-finish-dashboard'
# Conflicts:
# smart-hut/src/components/dashboard/DevicePanel.js
# smart-hut/src/components/dashboard/devices/Light.js
# smart-hut/src/components/dashboard/devices/styleComponents.js
# smart-hut/src/views/Dashboard.js
|
2020-03-18 15:06:27 +01:00 |
|
christiancp
|
edf1706986
|
Add device feature finished
|
2020-03-18 14:18:37 +01:00 |
|
christiancp
|
744f1b5710
|
All the devices are implemented
|
2020-03-17 17:38:03 +01:00 |
|
|
707a5630fc
|
Merge branch '5-add-delete-or-modify-rooms' into 'dev'
Resolve "Add, Delete, or Modify rooms"
Closes #5
See merge request sa4-2020/the-sanmarinoes/frontend!31
|
2020-03-17 17:35:55 +01:00 |
|
|
22a7ba07cc
|
Merge remote-tracking branch 'origin/header-controller' into dev
|
2020-03-17 17:34:17 +01:00 |
|
Nicola Brunner
|
50b05fa22a
|
Added 404 images, finished modify in feature in navbar
|
2020-03-17 17:08:06 +01:00 |
|
Fil Cesana
|
c5dbf01394
|
changed text in homepage, add icons, instruction page still work in progress, changed logo headController
|
2020-03-17 15:06:40 +01:00 |
|
christiancp
|
182e1d6a48
|
Almost all the devices in the dashboard are implemented, along with the settings and add new device feature
|
2020-03-15 16:40:54 +01:00 |
|
Fil Cesana
|
b6a8d9bf96
|
header controller, forgot password, confirm refgistration, new navabr
|
2020-03-13 14:43:31 +01:00 |
|
Fil Cesana
|
da710119f6
|
header controller, new navbar for the home when not in mobile, forgot password and confirm registration pages
|
2020-03-13 10:06:20 +01:00 |
|
christiancp
|
465b96f30c
|
dashboard almost done with device buttons
|
2020-03-09 13:52:27 +01:00 |
|
christiancp
|
bdf6b96098
|
Login and Home pages are done. Login is ready to handle the authentication
|
2020-02-27 10:42:13 +01:00 |
|
christiancp
|
df09dc770a
|
basic setup is done with everything we need for the moment installed
|
2020-02-25 14:18:25 +01:00 |
|
britea
|
dae6b64d62
|
initial setup
|
2020-02-24 15:22:19 +01:00 |
|