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

256 Commits (ef3ea263a523b126d8de86225bb50d0ff4c7233b)

Author SHA1 Message Date
alex 1676fa6fb1 fix(sidebar): fix collapsed menu 2016-02-03 18:44:52 +03:00
KostyaDanovsky b1cabf2c23 Merge remote-tracking branch 'origin/v2' into v2 2016-02-03 15:34:29 +03:00
KostyaDanovsky ba1bd6a8e6 fix(sidebar): fix isMenuCollapsed flag 2016-02-03 15:34:24 +03:00
alex 7d2a3f589b refactor(dashboard): use line grid 2016-02-03 12:58:24 +03:00
alex 0737bdb0f9 refactor(skins):make transperent panel optional 2016-01-22 20:04:33 +03:00
alex 9bb23a9a04 fix(leafletMap): use standart images instead customs 2016-01-22 15:25:59 +03:00
alex 56bdb9b847 fix(skins): fix images paths 2016-01-22 15:02:48 +03:00
alex d8a436f98a refactor(fontWeight): using light instead of thin weight, and move weight to contants 2016-01-22 14:47:05 +03:00
alex ea10d5d611 fix(pageTop): fix images paths 2016-01-22 13:31:18 +03:00
alex 01e6d389d8 refactor(treeView): remove not implemented functionality 2016-01-22 13:12:17 +03:00
alex f24922f060 fix(iconsPage): add same height for some blocks 2016-01-21 18:09:32 +03:00
alex 17ce71f065 fix(progressButtons): fix losing dependencies 2016-01-21 18:04:34 +03:00
alex b19ad119e6 fix(typography): fix fonts weight, banner padding, column headers 2016-01-21 17:51:32 +03:00
alex 872145bff4 fix(calendar): fix font size 2016-01-21 16:19:37 +03:00
alex 33d0255cee fix(blurFid): fix blurFeed messageHeader and time block 2016-01-21 16:03:52 +03:00
alex dfd2109b00 fix(blurFeed): fix message time block css 2016-01-21 15:41:34 +03:00
alex 8695b7a30b refactor(profilePage): use ui-bootrap for modal 2016-01-21 14:31:53 +03:00
alex 59adfd15a3 refactor(mail): fix inputs issues 2016-01-20 19:40:46 +03:00
alex c231ae22a4 refactor(contentTop): use ui-bootstrap for drop downs 2016-01-20 18:44:09 +03:00
alex 9120827646 fix newestOnTop options 2016-01-20 17:05:20 +03:00
alex bd5f2cc120 refactor(notifications): use local config instead global 2016-01-20 12:56:24 +03:00
alex 5a0c78e8a6 fix(select): allow use ng-nodel and ng-options(add timeout) 2016-01-19 15:38:47 +03:00
alex 9ccadd2433 fix(select): inject dropdown.js dependency 2016-01-19 14:55:01 +03:00
alex 9f2b12c5fe refactor&fix(dropdown buttons): use bootstrap ui instead simple bootstrap 2016-01-18 19:40:13 +03:00
alex fe8f8fd704 refactor&fix(modals): use bootstrap ui instead simple bootstrap 2016-01-18 18:57:56 +03:00
alex 648e4e2123 change copied code to custom 2016-01-18 15:33:31 +03:00
Vladimir Lugovsky 17df899c53 Merge branch 'blur-experiment' into v2 2016-01-15 20:28:56 +03:00
Vladimir Lugovsky 46049610ff feat(background): add blurred bg for panels 2016-01-15 20:27:49 +03:00
KostyaDanovsky b4c1ab5e91 refactor(pages): refactor project structure 2016-01-15 19:12:49 +03:00
KostyaDanovsky b656e4d81e fix(sidebar): fix static menu items after merge 2016-01-13 18:33:20 +03:00
KostyaDanovsky 8e8d542e07 Merge remote-tracking branch 'origin/v2' into v2 
# Conflicts:
#	src/app/theme/components/sidebar/SidebarCtrl.js
 2016-01-13 18:29:50 +03:00
KostyaDanovsky d3448c870a fix(sidebar): move logic of defining menu items to service 2016-01-13 18:28:23 +03:00
alex 75a10e6985 refactor(mail):apply code review notes, fix compose area height(add scroll) 2016-01-13 16:52:01 +03:00
alex 47130f9389 refactor(authPages): move auth pages to submenu 2016-01-12 19:45:49 +03:00
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
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