Vladimir Lugovsky
|
d11b25827a
|
Merge branch 'v2' into lugovsky-feature
Conflicts:
src/app/pages/mail/mail.html
|
2016-01-05 23:57:30 +03:00 |
|
Vladimir Lugovsky
|
78747fb2b4
|
feat(panel): sample panels page
|
2016-01-05 17:37:42 +03:00 |
|
Vladimir Lugovsky
|
b211a4798b
|
refactor(panel): refactor global panel styles
|
2016-01-05 13:42:08 +03:00 |
|
alex
|
f5699120e0
|
refactor(mails): routed mails
|
2016-01-04 16:36:41 +03:00 |
|
Vladimir Lugovsky
|
0616501eaf
|
feat(blurPanel): refactor panels
|
2015-12-24 18:43:46 +03:00 |
|
alex
|
40fcb40b9e
|
Merge branch 'v2' into new_widgets
|
2015-12-24 18:35:28 +03:00 |
|
alex
|
306dbec2fb
|
create compose service
|
2015-12-24 18:34:56 +03:00 |
|
alex
|
077c2765c0
|
email new responsive design
|
2015-12-24 17:01:41 +03:00 |
|
Vladimir Lugovsky
|
8493dfc994
|
feat(blurPanel): refactor blurpanel
|
2015-12-24 15:17:25 +03:00 |
|
smartapant
|
6f18039bfd
|
Form wizard start
|
2015-12-23 22:03:15 +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 |
|
alex
|
2d73efdec5
|
add menu levels
|
2015-12-22 13:23:13 +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 |
|
alex
|
6301316422
|
moris charts
|
2015-12-18 13:55:06 +03:00 |
|
alex
|
d77f94d319
|
fix mail page
|
2015-12-17 19:25:29 +03:00 |
|
alex
|
352d7a4965
|
chartist charts
|
2015-12-17 19:05:29 +03:00 |
|
Vladimir Lugovsky
|
ab26929ab8
|
refactor(images): images mostly fixed
|
2015-12-17 14:31:11 +03:00 |
|
Vladimir Lugovsky
|
8b6c187f32
|
refactor(routing): migrate chart routes to new structure
|
2015-12-16 19:19:31 +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
|
412b82fbc2
|
fix(sidebar): fix sidebar menuCollapsed bug
|
2015-12-16 01:39:46 +03:00 |
|
Vladimir Lugovsky
|
b6b52af148
|
refactor(themeComponents): move components to separate module
|
2015-12-16 01:32:16 +03:00 |