Commit Graph

22 Commits

Author SHA1 Message Date
0793367bf5 Merge branch 'login-dom' of s412146/angular-develop-client into master 2019-01-20 12:20:58 +00:00
Dawid Kubicki
1e2c012a7e login added 2019-01-20 13:20:02 +01:00
edab64e28c Merge branch 'developer' of s412146/angular-develop-client into master 2019-01-20 11:30:06 +00:00
Dawid Kubicki
80d720cef4 added changes 2019-01-19 17:48:05 +01:00
f6210c65ce Merge branch 'developer' of s412146/angular-develop-client into master 2019-01-19 12:27:10 +00:00
Dawid Kubicki
a42730128b waiting for status change 2019-01-19 13:26:35 +01:00
9a5eb41b39 Merge branch 'developer' of s412146/angular-develop-client into master 2019-01-19 10:28:28 +00:00
Dawid Kubicki
e162f1758c edit works 2019-01-19 00:44:53 +01:00
Unknown
b772e06cce bootstrap+battery(add bootstr in angular.js) 2019-01-14 21:58:19 +01:00
ac833d8ab8 Merge branch 'developer' of s412146/angular-develop-client into master 2019-01-14 09:37:05 +00:00
Dawid Kubicki
71cb0049a3 added time calculation and new error handler and minor front changes 2019-01-14 10:34:10 +01:00
Dawid Kubicki
698891123d admin panel working 2019-01-13 17:41:16 +01:00
Dawid Kubicki
20e01b61e0 routing added 2019-01-13 16:56:55 +01:00
Dawid Kubicki
17c0a90807 full layout added 2019-01-13 12:17:16 +01:00
Dawid Kubicki
ac24169069 adding devices layout added 2019-01-13 11:50:57 +01:00
2263d9bd73 Merge branch 'developer' of s412146/angular-develop-client into master 2019-01-12 20:10:16 +00:00
Dawid Kubicki
3aa2d784b5 added communication and time calculation logic 2019-01-12 21:06:54 +01:00
db52a924d3 Merge branch 'dominika' of s412146/angular-develop-client into master 2019-01-12 12:03:48 +00:00
Unknown
8f58f1bc82 wykresy 2019-01-12 12:51:09 +01:00
Dawid Kubicki
ae91beb640 bootstrap and material design added + grid change 2019-01-07 16:34:57 +01:00
Dawid Kubicki
37f1ed12a7 observable + reading data 2019-01-01 22:56:35 +01:00
Dawid Kubicki
0eaadf4fe0 Initial commit 2019-01-01 22:45:09 +01:00