Jacob Salvi
|
50639e9655
|
Modified the pipeline so that only the master and dev branch have to do the deploy
|
2020-03-21 15:45:38 +01:00 |
|
Jacob Salvi
|
09d52fbd1c
|
Modified the pipeline so that only the master and dev branch have to do the deploy
|
2020-03-21 15:34:28 +01:00 |
|
|
|
84c963b559
|
Merge branch '37-nav-resp' into 'dev'
Resolve "nav-resp"
Closes #37
See merge request sa4-2020/the-sanmarinoes/frontend!39
|
2020-03-21 14:55:56 +01:00 |
|
|
|
4f4e54e065
|
Merge branch 'dev' into '37-nav-resp'
# Conflicts:
# smart-hut/src/views/Navbar.js
|
2020-03-21 14:55:44 +01:00 |
|
|
|
37506df76b
|
Merge branch '404' into 'dev'
Resolve "404"
Closes #42
See merge request sa4-2020/the-sanmarinoes/frontend!45
|
2020-03-21 14:19:19 +01:00 |
|
Nicola Brunner
|
0de3b0257f
|
Done 4oh4 page
|
2020-03-21 14:05:11 +01:00 |
|
|
|
dd94a6aa30
|
Merge branch 'dev' into '37-nav-resp'
# Conflicts:
# smart-hut/src/views/Navbar.js
|
2020-03-21 13:56:54 +01:00 |
|
|
|
f69ad0c5f5
|
Merge branch 'minor-issues+instruction-page' into 'dev'
Minor issues+instruction page
See merge request sa4-2020/the-sanmarinoes/frontend!43
|
2020-03-21 13:52:20 +01:00 |
|
Fil Cesana
|
7d78287379
|
resolved conflicts
|
2020-03-21 13:38:34 +01:00 |
|
|
|
8ac12ac8bf
|
Merge branch '43-frontend-device-with-backend' into 'dev'
initial setup for device with backend
Closes #43
See merge request sa4-2020/the-sanmarinoes/frontend!42
|
2020-03-21 00:00:19 +01:00 |
|
britea
|
8b3200f639
|
initial setup for device with backend
|
2020-03-20 18:42:38 +01:00 |
|
|
|
4c15df7058
|
Merge branch '41-fix-all-warnings-and-clean-code' into 'dev'
fix all warnings and cleaned code
Closes #41
See merge request sa4-2020/the-sanmarinoes/frontend!40
|
2020-03-19 12:14:38 +01:00 |
|
britea
|
e786288fa8
|
fix all warnings and cleaned code
|
2020-03-19 11:52:13 +01:00 |
|
Nicola Brunner
|
c6e483ea6c
|
done minor fixes responive navbar
|
2020-03-19 11:49:00 +01:00 |
|
Nicola Brunner
|
3360220669
|
more responsive than before ;)
|
2020-03-18 17:12:29 +01:00 |
|
Fil Cesana
|
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 +01:00 |
|
|
|
c5a59dbe7d
|
Merge branch '32-finish-dashboard' into 'dev'
Resolve "Finish Dashboard"
Closes #32
See merge request sa4-2020/the-sanmarinoes/frontend!38
|
2020-03-18 16:03:10 +01:00 |
|
|
|
d7399abdea
|
Removed TODO
|
2020-03-18 15:49:33 +01:00 |
|
christiancp
|
993f1432a0
|
some changes to make it work
|
2020-03-18 15:30:02 +01:00 |
|
christiancp
|
cd12d5f69f
|
minor error fixed
|
2020-03-18 15:12:12 +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
|
70e5dc8017
|
change button color
|
2020-03-18 14:19:47 +01:00 |
|
christiancp
|
edf1706986
|
Add device feature finished
|
2020-03-18 14:18:37 +01:00 |
|
|
|
7faa63e484
|
Merge branch '40-re-fix-navbar-and-devicepanel' into 'dev'
re-fix navbar and device panel
Closes #40
See merge request sa4-2020/the-sanmarinoes/frontend!37
|
2020-03-18 13:35:05 +01:00 |
|
britea
|
07edc884b9
|
re-fix navbar and device panel
|
2020-03-18 13:20:01 +01:00 |
|
|
|
50bc259990
|
Merge branch '39-fix-navbar-and-devicepanel' into 'dev'
fix navbar and devicePanel
Closes #39
See merge request sa4-2020/the-sanmarinoes/frontend!36
|
2020-03-18 13:03:10 +01:00 |
|
britea
|
7a80e0562b
|
fix navbar and devicePanel
|
2020-03-18 12:46:28 +01:00 |
|
christiancp
|
99f1e16927
|
Everything related to the settings is done
|
2020-03-17 23:24:40 +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 |
|
|
|
e12d162458
|
Merge branch 'dev' of lab.si.usi.ch:sa4-2020/the-sanmarinoes/frontend into dev
|
2020-03-17 17:35:20 +01:00 |
|
|
|
22a7ba07cc
|
Merge remote-tracking branch 'origin/header-controller' into dev
|
2020-03-17 17:34:17 +01:00 |
|
|
|
cb0e498ace
|
Merge branch '36-ci-cd-fails-on-deploy-because-of-bad-tag-configuration' into 'dev'
Resolve "CI CD fails on deploy because of bad tag configuration"
Closes #36
See merge request sa4-2020/the-sanmarinoes/frontend!30
|
2020-03-17 17:25:17 +01:00 |
|
Nicola Brunner
|
6bf3bd07fa
|
Merge branch 'mod-room' of lab.si.usi.ch:sa4-2020/the-sanmarinoes/frontend into mod-room
|
2020-03-17 17:09:46 +01:00 |
|
Nicola Brunner
|
50b05fa22a
|
Added 404 images, finished modify in feature in navbar
|
2020-03-17 17:08:06 +01:00 |
|
|
|
fec2bab82f
|
Fixed CI
|
2020-03-17 17:05:27 +01:00 |
|
Nicola Brunner
|
373c7e2a1a
|
Added 404 images, finished modify in feature in navbar
|
2020-03-17 16:39:21 +01:00 |
|
|
|
359fa65a84
|
Merge branch '35-fixed-login-display-and-devices' into 'dev'
fixed login display and devices
Closes #35
See merge request sa4-2020/the-sanmarinoes/frontend!29
|
2020-03-17 16:35:29 +01:00 |
|
britea
|
1fe78b824b
|
fixed login display and devices
|
2020-03-17 16:20:43 +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 |
|
|
|
69822d3c53
|
Merge branch '34-cicd' into 'dev'
Resolve "CICD"
Closes #34
See merge request sa4-2020/the-sanmarinoes/frontend!28
|
2020-03-17 15:01:51 +01:00 |
|
Jacob Salvi
|
b2d94f337f
|
Hopefully maybe it will conisder to work @tommi27,Claudio told me to do so
|
2020-03-17 14:44:05 +01:00 |
|
|
|
b2503156a9
|
Merge branch 'dashboard-feature' into 'dev'
Almost all the devices in the dashboard are implemented, along with the...
See merge request sa4-2020/the-sanmarinoes/frontend!26
|
2020-03-15 16:44:21 +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 |
|
|
|
f7dac7fcdb
|
Merge branch '31-fix-and-update-dashboard' into 'dev'
fix and update Dashboard
Closes #31
See merge request sa4-2020/the-sanmarinoes/frontend!25
|
2020-03-14 15:56:16 +01:00 |
|
britea
|
29dccdd21c
|
fix and update Dashboard
|
2020-03-14 15:48:33 +01:00 |
|
|
|
fda609f6bf
|
Merge branch 'frontend_new' into 'dev'
Frontend new
See merge request sa4-2020/the-sanmarinoes/frontend!24
|
2020-03-14 15:36:02 +01:00 |
|
Nicola Brunner
|
1a55fc7804
|
Add room feature completed
|
2020-03-14 15:25:55 +01:00 |
|
Nicola Brunner
|
5fd213f34c
|
fix merge from dev
|
2020-03-13 15:25:44 +01:00 |
|
|
|
d666b50d57
|
Merge branch '30-fix-updated-dashboard-and-routes' into 'dev'
fix and updated Dashboard and Routes
Closes #30
See merge request sa4-2020/the-sanmarinoes/frontend!22
|
2020-03-13 15:22:29 +01:00 |
|
