Commit graph

309 commits

Author SHA1 Message Date
nixa
bfab17bd43 fix(table): remove search field 2016-08-23 14:11:25 +03:00
nixa
0f9169fdd0 styles(smarttable): fix styles for actions, hover 2016-08-23 12:45:11 +03:00
nixa
9f706d581a styles(smarttable): fix styles for actions 2016-08-23 12:11:28 +03:00
nixa
056104a2a7 styles(smarttable): fix styles for the admin panel tables 2016-08-23 11:38:45 +03:00
nixa
8b93999ba9 feat(smart table): preparing a demo 2016-08-22 20:15:26 +03:00
nixa
5bc3448a3c Merge branch 'development' into develop/ng2-smart-table-int 2016-08-22 19:48:46 +03:00
nixa
9e281d1e27 Merge branch 'patch-1' of https://github.com/Kaizeras/ng2-admin into Kaizeras-patch-1 2016-08-22 19:42:51 +03:00
nixa
59c1c547c3 Merge branch 'master' into development
Conflicts:
	docs/contents/articles/002-installation-guidelines/index.md
2016-08-22 19:26:09 +03:00
nixa
4ee8cb1466 fix(preloader): fix menu being shown before preloader goes away 2016-08-22 19:22:51 +03:00
Hristo Georgiev
f92922d5ba Update baContentTop.html to comply with ng2 links
Use the routerLink directive instead of a href attribute
2016-08-21 18:50:13 +03:00
Geoffrey ROGUELON
5234538032 Fix the path of Ionicons in SCSS file. 2016-08-19 11:13:31 -05:00
nixa
5aea53a1aa feat(smarttable): table setup 2016-08-19 10:23:34 +03:00
nixa
120ffe7d13 feat(smart-table): install ng2-smart-table 2016-08-10 17:23:18 +03:00
nixa
8ff20b0e14 Merge branch 'master' of https://github.com/remarkety/ng2-admin into remarkety-master 2016-07-28 16:40:17 +03:00
Dmitry
137bf3423f Merge pull request #100 from Tibing/fix-leaflet
fix(maps\leaflet): Leaflet maps controls overlapping on mobile version
2016-07-28 16:37:00 +03:00
nixa
105163a0f2 fix(menu): remove unnecessary /
(cherry picked from commit 3476253)
2016-07-28 15:49:24 +03:00
bnayal
896f65e922 Chartist - update chart on date change 2016-07-24 09:15:42 +03:00
tibing
bae2bbc8da fix(maps\leaflet): Leaflet maps controls overlapping on mobile version
Close#29
2016-07-21 15:29:01 +03:00
nixa
ed1d426b9b Merge branch 'galtet-master' 2016-07-18 11:55:17 +03:00
nixa
2949fed402 fix(menu): add login/register pages to menu 2016-07-18 11:54:05 +03:00
Gal Tetinger
58219dca8e fixing navigation issue - creating deep copy of routes before working on
it. https://github.com/akveo/ng2-admin/issues/93
2016-07-17 19:41:00 +03:00
nixa
8340acec7a fix(menu): fix #84 page title and breadcrumb not showing up 2016-07-14 12:05:05 +03:00
tibing
743dc38f72 fix(dashboard\todo\checkbox): checkboxes was rendering uncorrectly 2016-07-13 15:55:18 +03:00
tibing
db6592423d fix(inputs styles): return forgotten styles 2016-07-12 16:26:43 +03:00
tibing
70cdff101f feat(inputs\multi-checkbox): add multi-checkbox directive 2016-07-12 16:04:48 +03:00
tibing
e63812f011 feat(ba-checkbox): create checkbox component 2016-07-12 13:01:48 +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
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