Commit graph

46 commits

Author SHA1 Message Date
nixa
a46c259318 fix(merge): merge tree view component 2016-07-12 12:15:25 +03:00
nixa
85a9f86186 Merge branch 'Tibing-dev-tree-view' into develop/tree
Conflicts:
	config/webpack.common.js
	package.json
	src/app/app.menu.ts
	src/app/pages/pages.component.ts
2016-07-12 12:09:19 +03:00
nixa
660aa8a4b6 Merge branch 'develop/router'
Conflicts:
	src/platform/browser/directives.ts
	src/platform/browser/providers.ts
2016-07-12 10:37:24 +03:00
nixa
86a648374d fix(forms): update ng2-bootstrap 2016-07-12 10:34:32 +03:00
tibing
8a75aa0d63 Merge branch 'master' of https://github.com/akveo/ng2-admin into dev-tree-view 2016-07-08 13:22:10 +03:00
nixa
5b66c255ad Merge branch 'master' into develop/router
Conflicts:
	package.json
2016-07-08 13:16:37 +03:00
nixa
ffae8cd248 feat(forms): update forms to latest version 2016-07-08 13:10:36 +03:00
David Francis
1b2073ffd1 Add forms module to package.json 2016-07-07 22:01:59 -04:00
Ronny Roos
31efdaa1f1 Added RC4 and beta router
Merge branch 'master' of https://github.com/akveo/ng2-admin
2016-07-07 13:54:13 +03:00
nixa
9d539d93f8 Merge remote-tracking branch 'origin/master' 2016-07-04 18:06:34 +03:00
tibing
d799adeee4 fix(ckeditor): fix Cannot read property exception 2016-07-04 18:01:53 +03:00
tibing
070cec726e feat(app\components): create tree view component 2016-07-04 17:07:51 +03:00
nixa
e72467a00d Merge branch 'develop/uploader'
Conflicts:
	package.json
2016-07-01 15:30:32 +03:00
nixa
d730430884 feat(uploader): new picture uploader component 2016-07-01 11:25:01 +03:00
tibing
dbbac18846 feat(app\pages): add editor page and ckeditor 2016-06-30 17:18:43 +03:00
nixa
9af0e22650 chore(version): update version to 0.3.0 2016-06-29 12:16:06 +03:00
nixa
9312084fa4 chore(angular): update angular to rc3 2016-06-29 12:11:33 +03:00
nixa
b3e55bcc33 chore(version): update version to 0.2.1 2016-06-21 13:03:45 +03:00
nixa
8935cfeca7 chore(version): update version to 0.2.0 2016-06-21 12:31:26 +03:00
nixa
2b7d7ef3e6 chore(dept): update dependencies, angular to rc2 2016-06-21 12:24:19 +03:00
nixa
5edbe1f5d3 fix(package): add leaflet into package.json as some users have issues with it, fix #22 2016-06-06 11:00:06 +03:00
nixa
e44109e380 feat(styles): add fadeIn animation 2016-05-25 16:41:08 +03:00
nixa
d20b9a94f0 chore(build): add gh-page npm command 2016-05-25 13:34:26 +03:00
nixa
d03c9d82b1 fix(packages): get rid of almost all bower components 2016-05-24 12:32:31 +03:00
nixa
4ce58eafcb fix(package): package.json cleanup 2016-05-20 17:23:47 +03:00
nixa
a1d4b34467 template renamed 2016-05-19 14:58:50 +03:00
nixa
baade22f33 baSlimScroll 2016-05-19 14:41:48 +03:00
nixa
31c7843ab5 theme spinner 2016-05-17 17:42:13 +03:00
nixa
e7595af72c blur theme is now default 2016-05-17 13:34:52 +03:00
nixa
8dbdd2fa64 dropdown buttons implementation 2016-05-12 13:53:13 +03:00
nixa
0dfcf86787 angular updated to rc1 2016-05-11 17:38:01 +03:00
nixa
61d86e7e3d update to beta.17 2016-05-11 13:15:37 +03:00
nixa
a1e49ecc9b material removed, angular updated to b16 2016-05-11 12:55:46 +03:00
nixa
1b08462bb9 pieChart component 2016-05-04 16:04:14 +03:00
nixa
8b0015679b chartist component basics 2016-05-03 19:16:13 +03:00
nixa
0c416a6d3e starting with charts 2016-05-03 14:33:28 +03:00
nixa
f63d286aa1 bubble maps 2016-05-02 19:49:37 +03:00
nixa
1b2b7e42b1 leaflet maps 2016-05-02 18:17:54 +03:00
nixa
6cf83c8903 google maps 2016-05-02 17:43:45 +03:00
nixa
b13c169995 icons added, sidebar classes, better fonts loader 2016-04-28 13:08:33 +03:00
nixa
cb13a3d5af better fonts import using fontawesome-sass-loader 2016-04-26 15:06:17 +03:00
nixa
0419b2bf59 font awesome basic configuration 2016-04-26 11:42:02 +03:00
smartapant
62836727ae Bootstrap 4 added. 2016-04-21 17:41:28 +03:00
smartapant
790f4010e1 Scss enabled. 2016-04-20 18:13:56 +03:00
smartapant
1ecaf82998 Got rid of tests. 2016-04-20 17:00:18 +03:00
smartapant
6558ee2fc4 Initial commit. 2016-04-20 16:32:12 +03:00