Commit Graph

11 Commits (30bc596a3b1631be484b6e05da679ea95960f66b)

Author SHA1 Message Date
KostyaDanovsky 30bc596a3b Merge remote-tracking branch 'origin/v2' into v2
# Conflicts:
#	src/app/pages/pages.module.js
#	src/app/theme/components/contentTop/contentTop.directive.js
#	src/app/theme/components/sidebar/SidebarCtrl.js
2016-01-12 18:33:37 +03:00
KostyaDanovsky bf74c51a6f refactor(basic structure): configure page states, generate sidebar from these states 2016-01-12 18:30:32 +03:00
alex a05d0bdb0a refactor(timeline): enable & relocate to pages, change icons 2016-01-12 16:49:09 +03:00
Vladimir Lugovsky 1c2ba8fc06 feat(panels): add panels page 2015-12-23 19:07:55 +03:00
Vladimir Lugovsky 2631c853e9 Merge branch 'lugovsky-feature' into v2
# Conflicts:
#	bower.json
#	src/app/pages/pages.module.js
#	src/app/theme/components/sidebar/SidebarCtrl.js
2015-12-23 13:22:49 +03:00
alex bffd3e7fa1 sliders page 2015-12-22 16:11:17 +03:00
Vladimir Lugovsky f19b43ceed feat(tabs): Tabs page 2015-12-21 22:13:38 +03:00
alex 130f49d646 add tree view page 2015-12-21 19:21:32 +03:00
Vladimir Lugovsky 119f4ab51a refactor(app): blurAdmin app completely removed 2015-12-17 00:42:45 +03:00
Vladimir Lugovsky 8b6c187f32 refactor(routing): migrate chart routes to new structure 2015-12-16 19:19:31 +03:00
Vladimir Lugovsky cbaf5f3f3c refactor(routing): migrate to ui.router 2015-12-16 18:23:42 +03:00