Commit Graph

162 Commits (43e50fc6faef54aae54fce6b0d0a289f23e60bbd)

Author SHA1 Message Date
alex 1606d870a2 stopable interval for animations 2015-12-21 13:29:30 +03:00
alex 352d7a4965 chartist charts 2015-12-17 19:05:29 +03:00
alex 01be92edcd Merge branch 'v2' into new_widgets 2015-12-17 14:56:20 +03:00
alex bca3ab5dbe chartJs: add colors and aminmation 2015-12-17 14:55:41 +03:00
Vladimir Lugovsky 12b5a7e5a7 fix(feed): fix feed icons 2015-12-17 14:47:46 +03:00
Vladimir Lugovsky ab26929ab8 refactor(images): images mostly fixed 2015-12-17 14:31:11 +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 a96f81557e refactor(sass): change styles paths 2015-12-15 21:06:42 +03:00
Vladimir Lugovsky 8497c8e07e feat(build): style refactoring snapshot 2015-12-15 18:51:53 +03:00