jinql
/
blur-admin
mirror of https://github.com/akveo/blur-admin
1
0
Fork 0
Code Issues Releases Wiki Activity
405 Commits
7 Branches
6 Tags
87 MiB
Commit Graph

405 Commits (db01a0be11467b74a2b522bffb4f4a875b52b855)

Author SHA1 Message Date
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 bb8cf1758b feat(panel): panel intermediate 2016-01-05 21:35:51 +03:00
smartapant 2d0470b223 Form wizard 2016-01-05 20:48:08 +03:00
smartapant 4c08699728 Personal info form. 2016-01-05 19:44:49 +03:00
Vladimir Lugovsky 78747fb2b4 feat(panel): sample panels page 2016-01-05 17:37:42 +03:00
smartapant be1d2e00f8 Form wizard inputs 2016-01-05 16:31:25 +03:00
smartapant 57cf5d0f89 Initial steps validatation. 2016-01-05 14:29:27 +03:00
Vladimir Lugovsky b211a4798b refactor(panel): refactor global panel styles 2016-01-05 13:42:08 +03:00
alex 784a533647 Merge branch 'v2' of https://github.com/1itvinka/blur-admin into v2 2016-01-04 19:17:26 +03:00
alex f5699120e0 refactor(mails): routed mails 2016-01-04 16:36:41 +03:00
smartapant dee9e105b6 Wizard to controllerAs 2015-12-30 19:27:39 +03:00
Vladimir Lugovsky 1d42fc99e1 feat(blurPanel): refactor panels 2015-12-24 21:12:53 +03:00
smartapant 9440d873a9 Tabs directives begin. 2015-12-24 19:20:58 +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
Vladimir Lugovsky 5eafe949ab feat(accordions): Add accordions page 2015-12-23 13:16:19 +03:00
alex 418d4ec106 more responsive charts layout 2015-12-23 13:05:08 +03:00
alex 1d59d3be9e redisign charts 2015-12-22 20:50:12 +03:00
Vladimir Lugovsky 752bb8e48a feat(tabs): Tabs and accordion 2015-12-22 19:20:05 +03:00
alex e6e4a32f95 Merge branch 'new_widgets' into v2 2015-12-22 16:11:42 +03:00
alex bffd3e7fa1 sliders page 2015-12-22 16:11:17 +03:00
alex ed46c288a8 fix typography page 2015-12-22 13:39:37 +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 1606d870a2 stopable interval for animations 2015-12-21 13:29:30 +03:00
alex 1e027c0f1c stopable interval for animations 2015-12-21 12:38:33 +03:00
alex bc884fb213 delete flot chart files 2015-12-18 14:00:49 +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
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 1cff1f2a1c refactor(variables): global variables removed 2015-12-17 00:49:15 +03:00
Vladimir Lugovsky 119f4ab51a refactor(app): blurAdmin app completely removed 2015-12-17 00:42:45 +03:00
Vladimir Lugovsky cf4d8c9eb8 refactor(dashboard): change dashboard items definitions 2015-12-17 00:28:32 +03:00
Vladimir Lugovsky da24a782e4 refactor(routing): fixed most of the pages 2015-12-16 20:36:14 +03:00
Vladimir Lugovsky 8b6c187f32 refactor(routing): migrate chart routes to new structure 2015-12-16 19:19:31 +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