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

382 Commits (23bfdd6d53511ff78209564595dbfc8fb1b1dddc)

Author SHA1 Message Date
alex 8ad410e23a Merge branch 'v2' into new_widgets 2016-01-12 19:36:33 +03:00
alex 3bb5e41997 fix(authPages): add separeted gulp tasks for separated pages 2016-01-12 19:35:53 +03:00
KostyaDanovsky 1d47622451 fix(timeline): add timeline to the sidebar, fix after merge 2016-01-12 18:45:59 +03:00
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 64f90f8fba fix(switchInput): set directive insted service 2016-01-12 17:21:24 +03:00
alex 425e075d9c fix(tagInput): set directive insted service and fix styles 2016-01-12 17:20:10 +03:00
alex e77977701a refactor(timeline): remove old icons 2016-01-12 16:52:09 +03:00
alex a05d0bdb0a refactor(timeline): enable & relocate to pages, change icons 2016-01-12 16:49:09 +03:00
alex a302433b13 refactor(treeView): remove old tree lib from module 2016-01-12 14:41:06 +03:00
alex 9332102a06 refactor(treeView): redisign 2016-01-12 12:50:01 +03:00
alex 531812d83c refactor(table): add ba-panel and move app files to app folder 2016-01-11 14:36:38 +03:00
alex 180c37b809 refactor(mail): fix responsive detail 2016-01-11 13:44:23 +03:00
alex a667b1e253 merge branch 'new_widgets' into v2 2016-01-11 13:28:05 +03:00
alex f99d59c6e4 refactor(mail): change navigation 2016-01-11 13:25:10 +03:00
smartapant 81f9ccb4a7 Wizard css to theme 2016-01-11 13:12:03 +03:00
alex 2e3a1c9d35 refactor(mail): statrt using controllerAs 2016-01-11 13:02:52 +03:00
smartapant 14e0373d62 Wizard to theme 2016-01-11 12:59:32 +03:00
alex 482740044c refactor(mail): move compose and message service from theme to mail module 2016-01-11 12:47:18 +03:00
alex 43e0abf92e refactor(mail): move compose and message service from theme to mail module 2016-01-11 12:46:17 +03:00
smartapant bfd1084fa0 small CR fixes for wizard 2016-01-06 19:34:38 +03:00
Vladimir Lugovsky 03288fe6fb refactor(build): build changes so it would be possible to deploy template 2016-01-06 17:21:17 +03:00
Vladimir Lugovsky 7826b4c679 Merge branch 'lugovsky-feature' into v2 2016-01-06 16:22:35 +03:00
Vladimir Lugovsky 016075c229 refactor(panel): blurPanel removed as a legacy code 2016-01-06 16:18:44 +03:00
Vladimir Lugovsky 091ad8e226 feat(panel): ba panel finish refactoring 2016-01-06 16:17:38 +03:00
alex 4bbe220d89 Merge branch 'new_widgets' into v2 2016-01-06 11:11:43 +03:00
alex 6a199dd8ec refactor(tables): add new tables 2016-01-06 11:11:03 +03:00
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