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

306 commits

Author SHA1 Message Date
Geoffrey ROGUELON
5234538032 Fix the path of Ionicons in SCSS file. 2016-08-19 11:13:31 -05: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
nixa
e7fca6d4ed chore(dependencies): update dependencies, move to @types, some refactoring as per AngularClass/angular2-webpack-starter project 2016-07-28 13:38:22 +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
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