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

636 commits

This branch
This branch
All branches
Author SHA1 Message Date
nixa
949403cbef Merge branch 'develop/ng2-smart-table-int' into development 2016-08-23 14:11:37 +03:00
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
463100ad7b Merge branch 'develop/ng2-smart-table-int' into development 2016-08-23 11:38:57 +03:00
nixa
056104a2a7 styles(smarttable): fix styles for the admin panel tables 2016-08-23 11:38:45 +03:00
nixa
da7581b9e8 Merge branch 'master' into development 2016-08-22 23:29:42 +03:00
nixa
fd0f0c57a3 fix(docs): fix a typo 
(cherry picked from commit f507e4e)
 2016-08-22 23:29:31 +03:00
nixa
9178b6014b feat(menu): 'hidden' menu attribute to hide the link from the menu but keep other related features in place (page title, breadcrumbs). Fix #151 
(cherry picked from commit a3b7fa1)
 2016-08-22 23:29:17 +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
7a82fce24f Merge branch 'Kaizeras-patch-1' 2016-08-22 19:44:21 +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
d81042f866 Merge branch 'GRoguelon-remove-typings-traces' 2016-08-22 19:42:22 +03:00
nixa
df575a2929 Merge branch 'remove-typings-traces' of https://github.com/GRoguelon/ng2-admin into GRoguelon-remove-typings-traces 
Conflicts:
	Dockerfile
	docs/contents/articles/002-installation-guidelines/index.md
	docs/contents/articles/012-project-structure/index.md
 2016-08-22 19:40:35 +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
nixa
75dcc6c552 Merge branch 'GRoguelon-remove-bower' 2016-08-22 19:18:11 +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
Geoffrey Roguelon
46691c94ca Remove old traces of typings. 
In the commit akveo/ng2-admin@e7fca6d4, we moved to @types for TypeScript typings.

It remains some traces in the documentation. This commit remove them.
 2016-08-18 13:04:43 -05:00
Geoffrey Roguelon
a30c41a11d Replace bower packages by NPM packages. 
In the issue akveo/ng2-admin#162, search should be made to be sure of non regression.
 2016-08-18 12:45:44 -05:00
nixa
174fef85cc Merge remote-tracking branch 'origin/master' 2016-08-17 23:18:12 +03:00
nixa
0a6eb8de5e fix(license): fix license copyright 2016-08-17 23:17:17 +03:00
nixa
78602432e4 feat(smart-table): update ng2-smart-table 2016-08-11 10:47:08 +03:00
nixa
120ffe7d13 feat(smart-table): install ng2-smart-table 2016-08-10 17:23:18 +03:00
nixa
c79ac94a66 fix(source map): fix #136 source map no being generated correctly 2016-08-02 11:43:01 +03:00
nixa
e59326add2 docs(install): remove typings from docs 2016-07-28 17:23:43 +03:00
nixa
2e693a1e9b Merge branch 'Tibing-refactor-docs-css' into development 2016-07-28 17:21:24 +03:00
nixa
fc13fde211 Merge branch 'refactor-docs-css' of https://github.com/Tibing/ng2-admin into Tibing-refactor-docs-css 2016-07-28 17:17:48 +03:00
nixa
e7b2c903b7 Merge branch 'remarkety-master' into development 2016-07-28 16:50:15 +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
ab3785c8f4 chore(version): bump version to 0.4.2 2016-07-28 16:09:26 +03:00
nixa
105163a0f2 fix(menu): remove unnecessary / 
(cherry picked from commit 3476253)
 2016-07-28 15:49:24 +03:00
nixa
d9084037e7 chore(version): bump version to 0.4.1 2016-07-28 14:52:42 +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
nixa
7d0ff2ef96 fix(ng2-uploader): fix version issue #113 2016-07-28 11:34:01 +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
Dmitry
7dd32c9fd6 Merge pull request #91 from myadhdoutlet/patch-1 
Copy-editing and fixed some typos
 2016-07-18 12:17:53 +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
Sad Robot
44c51cf387 Copy-editing and fixed some typos 2016-07-16 12:35:09 -04:00
tibing
7ea85c1189 refactor(docs\*.css): refactor css code style 2016-07-15 18:09:01 +03:00
nixa
8340acec7a fix(menu): fix #84 page title and breadcrumb not showing up 2016-07-14 12:05:05 +03:00
nixa
77a13b5308 Merge branch 'master' of github.com:lugovsky/n2-admin 2016-07-13 16:03:27 +03:00
tibing
743dc38f72 fix(dashboard\todo\checkbox): checkboxes was rendering uncorrectly 2016-07-13 15:55:18 +03:00