alex
|
352d7a4965
|
chartist charts
|
2015-12-17 19:05:29 +03:00 |
|
Vladimir Lugovsky
|
d21668ce98
|
Merge branch 'v2' into build-refactor
# Conflicts:
# bower.json
# src/app/app.js
|
2015-12-16 18:38:47 +03:00 |
|
Vladimir Lugovsky
|
cbaf5f3f3c
|
refactor(routing): migrate to ui.router
|
2015-12-16 18:23:42 +03:00 |
|
alex
|
90f245de06
|
chart.js: init
|
2015-12-16 18:23:29 +03:00 |
|
Vladimir Lugovsky
|
80284edc67
|
Merge branch 'v2' into build-refactor
Conflicts:
src/app/components/contentTop/contentTop.js
src/app/components/sidebar/sidebar.js
src/assets/css/main.scss
|
2015-12-16 02:12:38 +03:00 |
|
Vladimir Lugovsky
|
8497c8e07e
|
feat(build): style refactoring snapshot
|
2015-12-15 18:51:53 +03:00 |