Commit Graph

418 Commits (ba3838775482ea48a0438af8867cce3ef0f11bb0)

Author SHA1 Message Date
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
Vladimir Lugovsky 86ac60347f Merge branch 'new_widgets' into v2
Conflicts:
	src/app/pages/typography/_typography.scss
2015-12-16 02:03:15 +03:00
Vladimir Lugovsky b176bd33e1 refactor(common): common folder completely remove 2015-12-16 02:00:43 +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
Vladimir Lugovsky 81adb6fd2f refactor(js): mainCtrl removed 2015-12-16 01:00:55 +03:00
Vladimir Lugovsky a96f81557e refactor(sass): change styles paths 2015-12-15 21:06:42 +03:00
Vladimir Lugovsky 8497c8e07e feat(build): style refactoring snapshot 2015-12-15 18:51:53 +03:00
alex aadf696db5 notification-widgets: add result header and fix responsive 2015-12-15 17:43:04 +03:00
alex c2c6ff3920 alerts widget: fix headers 2015-12-15 16:46:12 +03:00
alex 7fb008ae84 notification widget 2015-12-15 16:45:46 +03:00
Vladimir Lugovsky 7a7c2c2e25 feat(build): build except images 2015-12-15 11:41:20 +03:00
Vladimir Lugovsky 5c7fab8e98 build semi-working 2015-12-15 00:50:54 +03:00
Vladimir Lugovsky de84aaa77f feat(build): adjust build to latest Swiip version 2015-12-14 21:22:38 +03:00
alex 56d94116cd progress bars 2015-12-14 18:36:44 +03:00
alex 1c40d18694 alerts page 2015-12-14 17:27:02 +03:00
alex 24f3b9d49a email and grid widgets and fix typography 2015-12-14 13:31:52 +03:00
Vladimir Lugovsky 1935514ca8 feat(build): added build tasks 2015-12-10 19:22:20 +03:00
Vladimir Lugovsky 16b2388d24 feat(build): added marketplace release task 2015-12-03 19:18:19 +03:00
Vladimir Lugovsky c6761c721c feat(preview): fix preview typo 2015-12-01 13:14:14 +03:00
Vladimir Lugovsky f69c06a4b0 feat(dahsboard): hide weather widget 2015-12-01 13:07:30 +03:00
Vladimir Lugovsky 157a9d23c2 Merge branch 'new_typography' into v2
# Conflicts:
#	src/app/pages/typography/typography.html
2015-12-01 12:49:47 +03:00
Vladimir Lugovsky 7da0d5b5e2 feat(typography): typography font changed 2015-12-01 12:49:13 +03:00
Vladimir Lugovsky 5fd5e9dc34 feat(promo): blur admin promo text 2015-12-01 12:30:29 +03:00
alex 9e51c66b36 new typography page init 2015-12-01 11:41:52 +03:00
Vladimir Lugovsky 36d0537d43 fix(maps): fix maps panels heights 2015-12-01 11:41:14 +03:00
Vladimir Lugovsky add8b960b1 fix(dashboard): fix dashboard responsivness 2015-11-27 16:03:28 +03:00
Vladimir Lugovsky b1eff4c80d fix(skin): changed path to skin images in gulp file 2015-11-27 15:24:38 +03:00
Vladimir Lugovsky 08ad825d78 feat(skin): change skin order and remove grey 2015-11-27 14:33:48 +03:00
Vladimir Lugovsky 6352b85c19 fix(skin): add ability to change background styles 2015-11-27 14:29:33 +03:00
Vladimir Lugovsky 6d5cbfab5b fix(skin): add ability to change background styles 2015-11-27 14:27:43 +03:00
Vladimir Lugovsky 20a036ef73 fix(donut): change donut font styles 2015-11-27 11:18:59 +03:00
Vladimir Lugovsky c7048ea360 feat(chart): change chart colors when skin is changed 2015-11-26 20:56:30 +03:00
alex 385ad9bc67 fix junior mistakes 2015-11-26 13:03:58 +03:00
Vladimir Lugovsky 1691c0a5f9 fix(todo): fix todo clicks 2015-11-25 18:53:11 +03:00
Vladimir Lugovsky 4aaffadaa2 fix(feed): fix responsivness for feed 2015-11-25 18:30:42 +03:00
Vladimir Lugovsky b7d7b6daf7 fix(dashboard): changed religious joke on feed 2015-11-25 17:55:11 +03:00
Vladimir Lugovsky 125494100b fix(dashboard): add another chart for revenue 2015-11-25 17:06:02 +03:00