Commit graph

9 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
ffae8cd248 feat(forms): update forms to latest version 2016-07-08 13:10:36 +03:00
nixa
24de0070fa refactor(router): code style changes 2016-07-07 16:30:00 +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
0dfcf86787 angular updated to rc1 2016-05-11 17:38:01 +03:00
nixa
a1e49ecc9b material removed, angular updated to b16 2016-05-11 12:55:46 +03:00
nixa
dd6c7644f6 switched to HTML5 URL style as angular 2 documentation states it is a preferable way 2016-04-28 14:07:59 +03:00
smartapant
6558ee2fc4 Initial commit. 2016-04-20 16:32:12 +03:00