Commit graph

495 commits

Author SHA1 Message Date
nixa
ffae8cd248 feat(forms): update forms to latest version 2016-07-08 13:10:36 +03:00
nixa
5981758416 refactor(treeview): get rid of strange ts compilation error 2016-07-08 11:18:46 +03:00
Dmitry
e1f5de1e21 Merge pull request #66 from iamdavidfrancis/master
Add forms module to package.json
2016-07-08 10:46:40 +03:00
nixa
b280a8b012 refactor(treeview): get rid of strange ts compilation error 2016-07-08 10:39:25 +03:00
David Francis
1b2073ffd1 Add forms module to package.json 2016-07-07 22:01:59 -04:00
nixa
07a3081be8 Merge branch 'dev-tree-view' of https://github.com/Tibing/ng2-admin into Tibing-dev-tree-view 2016-07-07 18:19:00 +03:00
nixa
6dfa95eefa Merge branch 'Tibing-dev-rating' 2016-07-07 18:09:20 +03:00
nixa
27e0eedb1c Merge branch 'dev-rating' of https://github.com/Tibing/ng2-admin into Tibing-dev-rating 2016-07-07 18:06:07 +03:00
tibing
2a607f988e feat(inputs\rating): add rating component 2016-07-07 17:37:30 +03:00
nixa
54f5f9a041 fix(router): redirect not found routes to dashboard 2016-07-07 16:56:07 +03:00
nixa
24de0070fa refactor(router): code style changes 2016-07-07 16:30:00 +03:00
Ronny Roos
f24546639c Fixed problems with the sidebar service. Switched to use "path" concept instead of component 2016-07-07 13:54:15 +03: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
a676557c21 Merge remote-tracking branch 'origin/master' 2016-07-05 10:05:56 +03:00
Dmitry
f3f3f43805 Merge pull request #57 from Tibing/dev-editors
fix(bower.js): delete excess comma
2016-07-04 18:44:39 +03:00
Dmitry
3770257c1b fix(bower.json): remove tailing comma 2016-07-04 18:44:26 +03:00
tibing
466ccc1330 fix(bower.js): delete excess comma 2016-07-04 18:34:16 +03:00
nixa
9d539d93f8 Merge remote-tracking branch 'origin/master' 2016-07-04 18:06:34 +03:00
Dmitry
8a07c9b4f9 Merge pull request #56 from Tibing/dev-editors
fix(ckeditor): fix Cannot read property exception
2016-07-04 18:04:45 +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
Xing
f211bb625e Make source map files generated correctly.
https://github.com/webpack/extract-text-webpack-plugin/issues/119
2016-07-01 09:33:27 -07:00
nixa
e72467a00d Merge branch 'develop/uploader'
Conflicts:
	package.json
2016-07-01 15:30:32 +03:00
nixa
eec3cc96f6 fix(uploader): fix card width 2016-07-01 15:30:04 +03:00
nixa
e7d21b2239 Merge branch 'beta' of bitbucket.org:smartapant/angular2-admin into beta
Conflicts:
	src/app/theme/components/index.ts
2016-07-01 15:10:08 +03:00
tibing
5b02d1073b fix(app\pages\editors\ckeditor): property 'CKEDITOR_BASEPATH' does not
exist
2016-07-01 14:14:15 +03:00
Dmitry
d27221c32a Merge pull request #47 from Tibing/dev-editors
feat(app\pages): add editor page and ckeditor
2016-07-01 12:54:42 +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
Dmitry
23bdbaf5e2 Merge pull request #35 from shootermv/master
fix(menu): fix sidebar angle icon issue
2016-06-29 12:12:41 +03:00
nixa
affc122a77 fix(baSidebar): fix current selected menu 2016-06-29 12:11:33 +03:00
nixa
9312084fa4 chore(angular): update angular to rc3 2016-06-29 12:11:33 +03:00
Dmitry
0236ea72e9 fix(docs): fix changelog typos 2016-06-21 13:06:08 +03:00
nixa
b3e55bcc33 chore(version): update version to 0.2.1 2016-06-21 13:03:45 +03:00
nixa
80c6230c57 docs(changelog): missed changes 2016-06-21 13:02:58 +03:00
nixa
8935cfeca7 chore(version): update version to 0.2.0 2016-06-21 12:31:26 +03:00
nixa
1c433586b0 docs(changelog): version changelog 2016-06-21 12:31:07 +03:00
nixa
2b7d7ef3e6 chore(dept): update dependencies, angular to rc2 2016-06-21 12:24:19 +03:00
nixa
70f3dc8dbf fix(register): typo fix 2016-06-16 16:33:57 +03:00
nixa
f9d511bde7 fix(menu): change to relative links to pages 2016-06-16 16:24:46 +03:00
nixa
b4b22de324 fix(login): fix navigation error 2016-06-16 16:15:19 +03:00
nixa
3ec1fc3304 fix(login): fix styles issues 2016-06-16 15:49:06 +03:00
nixa
f6f843f1e9 Merge branch 'develop/login' 2016-06-16 15:11:48 +03:00
nixa
751c8d9981 feat(register): add pages to menu 2016-06-16 15:10:49 +03:00
nixa
1a2512daaf feat(register): add angular 2 form logic 2016-06-16 12:50:49 +03:00
nixa
2ba18109cd feat(login): add angular 2 form logic 2016-06-16 12:11:28 +03:00
nixa
919cbf5d2d feat(pages): register page 2016-06-16 11:47:25 +03:00
nixa
c10f864c59 feat(pages): login page 2016-06-16 11:33:20 +03:00
shootermv
359499729d trying to fix issue sidebar angle icon no pointing up when expanded 2016-06-16 10:07:10 +03:00