Commit graph

  • 2aadf1bd50 Updates nixa 2016-07-12 16:34:59 +03:00
  • 08fac421dd chore(version): bump version to 0.4.0 v0.4.0 nixa 2016-07-12 16:31:38 +03:00
  • 8dbcd55493 Merge branch 'develop/changelog' nixa 2016-07-12 16:28:57 +03:00
  • a12b906629 Merge remote-tracking branch 'origin/master' nixa 2016-07-12 16:28:28 +03:00
  • cae9e7f4e1 Merge pull request #73 from Tibing/master Dmitry 2016-07-12 16:28:21 +03:00
  • db6592423d fix(inputs styles): return forgotten styles tibing 2016-07-12 16:26:43 +03:00
  • f847795afb Merge remote-tracking branch 'origin/master' nixa 2016-07-12 16:15:45 +03:00
  • cbe8741cef Merge pull request #72 from Tibing/dev-multi-checkbox Dmitry 2016-07-12 16:08:15 +03:00
  • 70cdff101f feat(inputs\multi-checkbox): add multi-checkbox directive tibing 2016-07-08 17:00:07 +03:00
  • ec716c805c docs(changelog): 0.4.0 release notes nixa 2016-07-12 15:23:50 +03:00
  • 3e3bf8cb2b Merge pull request #1 from akveo/master Trung Vu 2016-07-12 18:36:29 +07:00
  • f21ff10f41 docs(routes): updat earticles title nixa 2016-07-12 13:56:13 +03:00
  • 661583bee1 Merge remote-tracking branch 'origin/master' nixa 2016-07-12 13:53:21 +03:00
  • 4e5d682ae8 fix(merge): merge tree view component nixa 2016-07-12 12:15:25 +03:00
  • 3244131e14 fix(merge): fix merge issues nixa 2016-07-12 11:02:30 +03:00
  • 61bf47e16e change Dockerfile add build.sh with build docker gavinzhou 2016-07-12 01:40:07 +00:00
  • 44924aefcc feat(forms): update forms to latest version nixa 2016-07-08 13:10:36 +03:00
  • 4dfd7e8c28 feat(app\components): create tree view component tibing 2016-07-04 17:07:51 +03:00
  • 77320b1f4b Make source map files generated correctly. Xing 2016-07-01 09:33:27 -07:00
  • 6a7f51c904 docs(routes): new docs for sidebar, new page and project structure nixa 2016-07-12 13:49:07 +03:00
  • e63812f011 feat(ba-checkbox): create checkbox component tibing 2016-07-07 15:25:08 +03:00
  • f0d8c94fe4 Merge pull request #70 from gavinzhou/master Dmitry 2016-07-12 12:46:51 +03:00
  • bc7ea0e5b4 Merge remote-tracking branch 'origin/master' nixa 2016-07-12 12:21:12 +03:00
  • a46c259318 fix(merge): merge tree view component nixa 2016-07-12 12:15:25 +03:00
  • 85a9f86186 Merge branch 'Tibing-dev-tree-view' into develop/tree nixa 2016-07-12 12:09:19 +03:00
  • 0029160ee3 Merge branch 'dev-tree-view' of https://github.com/Tibing/ng2-admin into Tibing-dev-tree-view nixa 2016-07-12 12:06:10 +03:00
  • 563c6d0333 fix(merge): fix merge issues nixa 2016-07-12 11:02:30 +03:00
  • 660aa8a4b6 Merge branch 'develop/router' nixa 2016-07-12 10:37:24 +03:00
  • 86a648374d fix(forms): update ng2-bootstrap nixa 2016-07-12 10:34:32 +03:00
  • 9fc37c561d change Dockerfile add build.sh with build docker gavinzhou 2016-07-12 01:40:07 +00:00
  • 7152220b90 docs(installation): note on post install script nixa 2016-07-11 17:20:30 +03:00
  • fa854ad6cc feat(inputs\multi-checkbox): add multi-checkbox directive tibing 2016-07-08 17:00:07 +03:00
  • 7218804440 feat(ba-checkbox): create checkbox component tibing 2016-07-07 15:25:08 +03:00
  • cac851847d fix(router): remove router-depricated references nixa 2016-07-11 15:58:14 +03:00
  • ded87ce527 feat(sidebar): custom links and 3rd level nixa 2016-07-11 12:23:07 +03:00
  • a74c056065 fix(sidebar): fix selection issue nixa 2016-07-11 11:09:35 +03:00
  • 000b961614 Merge 869863919d into 1843d19acf Tibing 2016-07-08 15:22:24 +00:00
  • 0ee317bc4d feat(sidebar): menu separated from sidebar, menu merged with routes nixa 2016-07-08 18:03:48 +03:00
  • 73cec2fceb feat(ba-checkbox): create checkbox component tibing 2016-07-07 15:25:08 +03:00
  • 8a75aa0d63 Merge branch 'master' of https://github.com/akveo/ng2-admin into dev-tree-view tibing 2016-07-08 11:21:02 +03:00
  • 5b66c255ad Merge branch 'master' into develop/router nixa 2016-07-08 13:16:37 +03:00
  • 1843d19acf Merge pull request #51 from AlbertXingZhang/sourceMapFilename Dmitry 2016-07-08 13:11:19 +03:00
  • ffae8cd248 feat(forms): update forms to latest version nixa 2016-07-08 13:10:36 +03:00
  • 5981758416 refactor(treeview): get rid of strange ts compilation error nixa 2016-07-08 10:39:25 +03:00
  • e1f5de1e21 Merge pull request #66 from iamdavidfrancis/master Dmitry 2016-07-08 10:46:40 +03:00
  • b280a8b012 refactor(treeview): get rid of strange ts compilation error nixa 2016-07-08 10:39:25 +03:00
  • 1b2073ffd1 Add forms module to package.json David Francis 2016-07-07 22:01:59 -04:00
  • 07a3081be8 Merge branch 'dev-tree-view' of https://github.com/Tibing/ng2-admin into Tibing-dev-tree-view nixa 2016-07-07 18:19:00 +03:00
  • 6dfa95eefa Merge branch 'Tibing-dev-rating' nixa 2016-07-07 18:09:20 +03:00
  • 27e0eedb1c Merge branch 'dev-rating' of https://github.com/Tibing/ng2-admin into Tibing-dev-rating nixa 2016-07-07 18:06:07 +03:00
  • 2a607f988e feat(inputs\rating): add rating component tibing 2016-07-05 12:30:03 +03:00
  • 54f5f9a041 fix(router): redirect not found routes to dashboard nixa 2016-07-07 16:56:07 +03:00
  • 24de0070fa refactor(router): code style changes nixa 2016-07-07 16:30:00 +03:00
  • 32b1128f22 Merge 22ebf94c7b into f3f3f43805 Tibing 2016-07-07 13:25:08 +00:00
  • 22ebf94c7b feat(ba-checkbox): create checkbox component tibing 2016-07-07 15:25:08 +03:00
  • f24546639c Fixed problems with the sidebar service. Switched to use "path" concept instead of component Ronny Roos 2016-07-06 21:26:34 +02:00
  • 31efdaa1f1 Added RC4 and beta router Merge branch 'master' of https://github.com/akveo/ng2-admin Ronny Roos 2016-07-05 19:57:31 +02:00
  • e48da7d4a4 Fixed problems with the sidebar service. Switched to use "path" concept instead of component Ronny Roos 2016-07-06 21:26:34 +02:00
  • 1b2d068d46 Added RC4 and beta router Merge branch 'master' of https://github.com/akveo/ng2-admin Ronny Roos 2016-07-05 19:57:31 +02:00
  • 869863919d feat(assets\glyphicons): add glyphicons tibing 2016-07-05 14:44:31 +03:00
  • 5d66c7987f Merge 1a7efe3213 into f3f3f43805 Vadim Gorbachev 2016-07-05 10:50:37 +00:00
  • 1a7efe3213 new feature: remote data table Vadim Gorbachev 2016-07-05 13:46:32 +03:00
  • a676557c21 Merge remote-tracking branch 'origin/master' nixa 2016-07-05 10:05:56 +03:00
  • f3f3f43805 Merge pull request #57 from Tibing/dev-editors Dmitry 2016-07-04 18:44:39 +03:00
  • 3770257c1b fix(bower.json): remove tailing comma Dmitry 2016-07-04 18:44:26 +03:00
  • 466ccc1330 fix(bower.js): delete excess comma tibing 2016-07-04 18:34:16 +03:00
  • 9d539d93f8 Merge remote-tracking branch 'origin/master' nixa 2016-07-04 18:06:34 +03:00
  • 8a07c9b4f9 Merge pull request #56 from Tibing/dev-editors Dmitry 2016-07-04 18:04:45 +03:00
  • d799adeee4 fix(ckeditor): fix Cannot read property exception tibing 2016-07-04 18:01:53 +03:00
  • 070cec726e feat(app\components): create tree view component tibing 2016-07-04 17:07:51 +03:00
  • 674bbeb3c7 fix(ckeditor): fix Cannot read property exception tibing 2016-07-04 12:36:49 +03:00
  • f211bb625e Make source map files generated correctly. Xing 2016-07-01 09:33:27 -07:00
  • e72467a00d Merge branch 'develop/uploader' nixa 2016-07-01 15:30:32 +03:00
  • eec3cc96f6 fix(uploader): fix card width nixa 2016-07-01 15:30:04 +03:00
  • e7d21b2239 Merge branch 'beta' of bitbucket.org:smartapant/angular2-admin into beta nixa 2016-07-01 15:10:08 +03:00
  • 5b02d1073b fix(app\pages\editors\ckeditor): property 'CKEDITOR_BASEPATH' does not exist tibing 2016-06-30 14:21:06 +03:00
  • fdf66c7049 feat(Components\tree view): add tree view component tibing 2016-06-30 18:08:26 +03:00
  • d27221c32a Merge pull request #47 from Tibing/dev-editors Dmitry 2016-07-01 12:54:42 +03:00
  • d730430884 feat(uploader): new picture uploader component nixa 2016-07-01 11:25:01 +03:00
  • dbbac18846 feat(app\pages): add editor page and ckeditor tibing 2016-06-30 14:21:06 +03:00
  • 8363102475 Merge branch 'master' of https://github.com/akveo/ng2-admin Ronny Roos 2016-06-29 22:25:14 +02:00
  • 9af0e22650 chore(version): update version to 0.3.0 nixa 2016-06-29 12:16:06 +03:00
  • 23bdbaf5e2 Merge pull request #35 from shootermv/master Dmitry 2016-06-29 12:12:41 +03:00
  • affc122a77 fix(baSidebar): fix current selected menu nixa 2016-06-29 12:01:38 +03:00
  • 9312084fa4 chore(angular): update angular to rc3 nixa 2016-06-29 11:54:16 +03:00
  • b3b1ec3d9c Merge 831f40fcf3 into 0236ea72e9 Ronny Roos 2016-06-23 16:07:43 +00:00
  • 831f40fcf3 Bugfix for marking current route in menu Ronny Roos 2016-06-23 18:07:32 +02:00
  • eb3127a4c0 Removed old leftovers from bower and ionicons. These caused problems. Also added support for local Dockerfile (for dev) Ronny Roos 2016-06-22 21:25:54 +02:00
  • 0236ea72e9 fix(docs): fix changelog typos Dmitry 2016-06-21 13:06:08 +03:00
  • b3e55bcc33 chore(version): update version to 0.2.1 nixa 2016-06-21 13:03:45 +03:00
  • 80c6230c57 docs(changelog): missed changes nixa 2016-06-21 13:02:58 +03:00
  • 8935cfeca7 chore(version): update version to 0.2.0 nixa 2016-06-21 12:31:26 +03:00
  • 1c433586b0 docs(changelog): version changelog nixa 2016-06-21 12:31:07 +03:00
  • 2b7d7ef3e6 chore(dept): update dependencies, angular to rc2 nixa 2016-06-21 12:24:19 +03:00
  • 70f3dc8dbf fix(register): typo fix nixa 2016-06-16 16:33:57 +03:00
  • f9d511bde7 fix(menu): change to relative links to pages nixa 2016-06-16 16:24:46 +03:00
  • b4b22de324 fix(login): fix navigation error nixa 2016-06-16 16:15:19 +03:00
  • 3ec1fc3304 fix(login): fix styles issues nixa 2016-06-16 15:49:06 +03:00
  • f6f843f1e9 Merge branch 'develop/login' nixa 2016-06-16 15:11:48 +03:00
  • 751c8d9981 feat(register): add pages to menu nixa 2016-06-16 15:10:49 +03:00