Commit graph

341 commits

Author SHA1 Message Date
nixa
563c6d0333 fix(merge): fix merge issues 2016-07-12 11:02:30 +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
cac851847d fix(router): remove router-depricated references 2016-07-11 15:58:14 +03:00
nixa
ded87ce527 feat(sidebar): custom links and 3rd level 2016-07-11 12:23:07 +03:00
nixa
a74c056065 fix(sidebar): fix selection issue 2016-07-11 11:09:35 +03:00
nixa
0ee317bc4d feat(sidebar): menu separated from sidebar, menu merged with routes 2016-07-08 18:03:48 +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
nixa
5981758416 refactor(treeview): get rid of strange ts compilation error 2016-07-08 11:18:46 +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
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
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
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
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
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
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
Dmitry
8cf3f9ef0b Merge pull request #4 from pritambaral/spinner-2d
Improve preloader performance on non-accelerated platforms
2016-06-06 11:13:08 +03:00
nixa
86a8cb1cda fix(route): fix #2, add a default handler for non registered routes 2016-06-03 00:00:13 +03:00
nixa
cba6578722 Merge remote-tracking branch 'origin/master' 2016-06-02 23:44:42 +03:00
nixa
c276c5535a fix(todo): fix #7 adding empty todo item issue 2016-06-02 23:44:28 +03:00
David Francis
1c4660da2f Inject BaThemeConfig into the App. 2016-06-02 09:31:40 -04:00
nixa
a1046ce2b4 fix(breadcrumbs): fix #2 breadcrubms visibility 2016-05-30 18:32:42 +03:00
Chhatoi Pritam Baral
7078fa4452 Improve preloader performance on non-accelerated platforms
Using the backface-visibility property causes 2D elements and transforms
to be elevated to a 3D context. Since the only transform being used is
rotate(Xdeg), which is a 2D transform, there is no need to incur the
extra performance penalty.
2016-05-29 17:13:29 +05:30
nixa
774bebfcd2 fix(bg): correct image to pre-load and optimized bg image 2016-05-25 17:16:46 +03:00
nixa
e44109e380 feat(styles): add fadeIn animation 2016-05-25 16:41:08 +03:00
nixa
f2c729e101 refactor(spinner): spinner moved into services 2016-05-25 10:59:12 +03:00
nixa
a820faae1a refactor(color scheme): colors docs 2016-05-24 17:43:28 +03:00
nixa
6464be1340 fix(menu): static links don't lead anywhere 2016-05-24 17:18:09 +03:00
nixa
ffe020fd2a fix(preloader): missed file, add again, hopefully final version 2016-05-24 17:07:42 +03:00