Andreas/ngx-admin
1
0
Fork 0
mirror of https://github.com/akveo/ngx-admin.git synced 2025-12-17 16:00:14 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions
619 commits 36 branches 30 tags 137 MiB
Commit graph

619 commits

This branch
This branch
All branches
Author SHA1 Message Date
nixa
3244131e14 fix(merge): fix merge issues 2016-07-12 13:51:05 +03:00
gavinzhou
61bf47e16e change Dockerfile 
add build.sh with build docker
 2016-07-12 13:50:45 +03:00
nixa
44924aefcc feat(forms): update forms to latest version 2016-07-12 13:50:45 +03:00
tibing
4dfd7e8c28 feat(app\components): create tree view component 2016-07-12 13:50:04 +03:00
Xing
77320b1f4b Make source map files generated correctly. 
https://github.com/webpack/extract-text-webpack-plugin/issues/119
 2016-07-12 13:49:27 +03:00
nixa
6a7f51c904 docs(routes): new docs for sidebar, new page and project structure 2016-07-12 13:49:07 +03:00
tibing
e63812f011 feat(ba-checkbox): create checkbox component 2016-07-12 13:01:48 +03:00
Dmitry
f0d8c94fe4 Merge pull request #70 from gavinzhou/master 
change Dockerfile with ng2-admin 3.0
 2016-07-12 12:46:51 +03:00
nixa
bc7ea0e5b4 Merge remote-tracking branch 'origin/master' 2016-07-12 12:21:12 +03:00
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
0029160ee3 Merge branch 'dev-tree-view' of https://github.com/Tibing/ng2-admin into Tibing-dev-tree-view 2016-07-12 12:06:10 +03:00
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
86a648374d fix(forms): update ng2-bootstrap 2016-07-12 10:34:32 +03:00
gavinzhou
9fc37c561d change Dockerfile 
add build.sh with build docker
 2016-07-12 01:40:07 +00:00
nixa
7152220b90 docs(installation): note on post install script 2016-07-11 17:20:30 +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
Dmitry
1843d19acf Merge pull request #51 from AlbertXingZhang/sourceMapFilename 
Make source map files generated correctly.
 2016-07-08 13:11:19 +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
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