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 |
|
|
|
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 |
|
|
|
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 |
|
Nicola Brunner
|
953b1a609a
|
navbar is starting to work
|
2020-03-13 15:21:33 +01:00 |
|
britea
|
8bebf974e1
|
fix and updated Dashboard and Routes
|
2020-03-13 15:12:28 +01:00 |
|
Matteo Omenetti
|
b60a7bdcd0
|
Merge branch '29-header-controller' into 'dev'
header controller, forgot password, confirm refgistration, new navabr
Closes #29
See merge request sa4-2020/the-sanmarinoes/frontend!21
|
2020-03-13 14:46:47 +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 |
|
Matteo Omenetti
|
566f00984e
|
Merge branch '28-implementation-frontend-rooms' into 'dev'
added pre implementation navbar
Closes #28
See merge request sa4-2020/the-sanmarinoes/frontend!18
|
2020-03-11 17:43:57 +01:00 |
|
britea
|
1e787f8216
|
added pre implementation navbar
|
2020-03-11 17:38:04 +01:00 |
|
|
|
662284959e
|
Merge branch 'dashboard-feature' of lab.si.usi.ch:sa4-2020/the-sanmarinoes/frontend into dev
|
2020-03-09 15:07:06 +01:00 |
|
christiancp
|
465b96f30c
|
dashboard almost done with device buttons
|
2020-03-09 13:52:27 +01:00 |
|
Matteo Omenetti
|
3e8090142f
|
Merge branch '24-finish-forgot-password-and-start-test-on-frontend' into 'dev'
Resolve "Finish forgot password and start test on frontend"
Closes #24
See merge request sa4-2020/the-sanmarinoes/frontend!16
|
2020-03-07 18:14:08 +01:00 |
|
britea
|
f1775a837a
|
update6 gitlab-ci.yml
|
2020-03-07 15:12:52 +01:00 |
|
britea
|
ac15bbc4f2
|
update 5 gitlab-ci.yml
|
2020-03-07 15:10:02 +01:00 |
|
britea
|
c5582882eb
|
update 4 gitlab-ci.yml
|
2020-03-07 13:07:32 +01:00 |
|
britea
|
14a7b8c264
|
update 3 gitlab-ci.yml
|
2020-03-07 12:47:43 +01:00 |
|
britea
|
ddf01bf159
|
update 2 gitlab-ci.yml
|
2020-03-07 12:42:57 +01:00 |
|
britea
|
97fdee796e
|
update .gitlab-ci.yml
|
2020-03-07 12:38:53 +01:00 |
|
britea
|
649cec210d
|
initial test and 404 page
|
2020-03-07 11:59:04 +01:00 |
|
britea
|
0c443a7314
|
Finish forgot password and start test
|
2020-03-07 10:54:42 +01:00 |
|
Matteo Omenetti
|
f868041c2a
|
Merge branch '23-implement-url-query-retrieve' into 'dev'
Resolve "Implement URL query retrieve"
Closes #23
See merge request sa4-2020/the-sanmarinoes/frontend!14
|
2020-03-05 18:18:28 +01:00 |
|
britea
|
c8f1dd8d70
|
updated package-lock file
|
2020-03-05 18:08:48 +01:00 |
|
britea
|
a3e8555e49
|
added implementatio to retrieve URL query
|
2020-03-05 18:08:17 +01:00 |
|
Matteo Omenetti
|
dab9719311
|
Merge branch '22-add-forgot-password-page' into 'dev'
Resolve "Add forgot-password Page"
Closes #22
See merge request sa4-2020/the-sanmarinoes/frontend!13
|
2020-03-05 11:12:03 +01:00 |
|
britea
|
9390cdc0c0
|
added components
|
2020-03-05 11:03:44 +01:00 |
|
britea
|
625578f56d
|
added pages to reset password
|
2020-03-05 11:02:33 +01:00 |
|
Matteo Omenetti
|
8074774d8b
|
Merge branch '21-adding-error-handling-signup' into 'dev'
Resolve "Adding Error Handling Signup"
Closes #21
See merge request sa4-2020/the-sanmarinoes/frontend!9
|
2020-03-05 08:35:42 +01:00 |
|
britea
|
e9bbd2ba74
|
Forgot to update header error message
|
2020-03-04 21:38:49 +01:00 |
|
britea
|
165cc8f02a
|
Error handling Signup page
|
2020-03-04 21:24:18 +01:00 |
|
