Merge branch 'release/0.3'

massiveart · May 7, 2014 · 40bcdfb · 40bcdfb
2 parents f9e41da + c94bf49
commit 40bcdfb
Show file tree

Hide file tree

Showing 143 changed files with 41,035 additions and 18,010 deletions.
diff --git a/.grunt/husky.json b/.grunt/husky.json
@@ -26,23 +26,19 @@
             "__component__$header@husky": "husky_components/header/main",
             "__component__$button@husky": "husky_components/button/main",
             "__component__$datagrid@husky": "husky_components/datagrid/main",
-            "__component__$dialog@husky": "husky_components/dialog/main",
             "__component__$dropdown@husky": "husky_components/dropdown/main",
             "__component__$matrix@husky": "husky_components/matrix/main",
             "__component__$select@husky": "husky_components/select/main",
             "__component__$dependent-select@husky": "husky_components/dependent-select/main",
             "__component__$search@husky": "husky_components/search/main",
             "__component__$tabs@husky": "husky_components/tabs/main",
-            "__component__$toolbar@husky": "husky_components/toolbar/main",
             "__component__$auto-complete@husky": "husky_components/auto-complete/main",
             "__component__$auto-complete-list@husky": "husky_components/auto-complete-list/main",
             "__component__$password-fields@husky": "husky_components/password-fields/main",
             "__component__$column-navigation@husky": "husky_components/column-navigation/main",
             "__component__$loader@husky": "husky_components/loader/main",
-            "__component__$edit-toolbar@husky": "husky_components/edit-toolbar/main",
-            "__component__$page-functions@husky": "husky_components/page-functions/main",
+            "__component__$toolbar@husky": "husky_components/toolbar/main",
             "__component__$ckeditor@husky": "husky_components/ckeditor/main",
-            "__component__$top-toolbar@husky": "husky_components/top-toolbar/main",
             "__component__$smart-content@husky": "husky_components/smart-content/main",
             "__component__$overlay@husky": "husky_components/overlay/main",
             "__component__$label@husky": "husky_components/label/main",
@@ -83,24 +79,19 @@
             "__component__$button@husky",
             "__component__$column-options@husky",
             "__component__$datagrid@husky",
-            "__component__$dialog@husky",
             "__component__$dropdown@husky",
             "__component__$matrix@husky",
             "__component__$search@husky",
             "__component__$tabs@husky",
             "__component__$toolbar@husky",
-            "__component__$edit-toolbar@husky",
             "__component__$auto-complete@husky",
             "__component__$auto-complete-list@husky",
             "__component__$dependent-select@husky",
             "__component__$select@husky",
             "__component__$password-fields@husky",
             "__component__$column-navigation@husky",
             "__component__$loader@husky",
-            "__component__$edit-toolbar@husky",
-            "__component__$page-functions@husky",
             "__component__$ckeditor@husky",
-            "__component__$top-toolbar@husky",
             "__component__$smart-content@husky",
             "__component__$overlay@husky",
             "__component__$label@husky",